Align to upstream commit sha1 bd05613

sailfishos · Dec 19, 2016 · 96aac6e · 96aac6e
1 parent 5c3acc6
commit 96aac6e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 46 deletions.
diff --git a/embedding/embedlite/PEmbedLiteView.ipdl b/embedding/embedlite/PEmbedLiteView.ipdl
@@ -20,6 +20,7 @@ using class mozilla::WidgetMouseEvent from "ipc/nsGUIEventIPC.h";
 using MultiTouchInput from "InputData.h";
 using mozilla::CSSIntPoint from "Units.h";
 using struct mozilla::layers::ZoomConstraints from "FrameMetrics.h";
+using mozilla::layers::MaybeZoomConstraints from "FrameMetrics.h";
 using mozilla::CSSPoint from "Units.h";
 using mozilla::Modifiers from "mozilla/EventForwards.h";
 
@@ -92,7 +93,7 @@ parent:
      * have up-to-date zoom constraints.
      */
     UpdateZoomConstraints(uint32_t aPresShellId, ViewID aViewId, bool aIsRoot,
-                          ZoomConstraints aConstraints);
+                          MaybeZoomConstraints aConstraints);
 
     /**
      * Instructs the EmbedLiteViewThreadParent to forward a request to zoom to a rect given in

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
@@ -367,7 +367,7 @@ bool
 EmbedLiteViewBaseChild::UpdateZoomConstraints(const uint32_t& aPresShellId,
                                               const ViewID& aViewId,
                                               const bool& aIsRoot,
-                                              const ZoomConstraints& aConstraints)
+                                              const Maybe<ZoomConstraints> &aConstraints)
 {
   return SendUpdateZoomConstraints(aPresShellId,
                                    aViewId,

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.h b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.h
@@ -49,7 +49,7 @@ class EmbedLiteViewBaseChild : public PEmbedLiteViewChild,
   UpdateZoomConstraints(const uint32_t& aPresShellId,
                         const ViewID& aViewId,
                         const bool& aIsRoot,
-                        const ZoomConstraints& aConstraints) override;
+                        const Maybe<ZoomConstraints>& aConstraints) override;
 
   virtual bool HasMessageListener(const nsAString& aMessageName) override;
 

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp
@@ -259,14 +259,11 @@ bool
 EmbedLiteViewBaseParent::RecvUpdateZoomConstraints(const uint32_t& aPresShellId,
                                                      const ViewID& aViewId,
                                                      const bool& aIsRoot,
-                                                     const ZoomConstraints& aConstraints)
+                                                     const Maybe<ZoomConstraints>& aConstraints)
 {
-  if (aIsRoot) {
-    mController->SaveZoomConstraints(aConstraints);
-  }
-
   if (mController->GetManager()) {
-    mController->GetManager()->UpdateZoomConstraints(ScrollableLayerGuid(mRootLayerTreeId, aPresShellId, aViewId), aConstraints);
+    mController->GetManager()->UpdateZoomConstraints(ScrollableLayerGuid(mRootLayerTreeId, aPresShellId, aViewId),
+                                                    aConstraints);
   }
   return true;
 }

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.h b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.h
@@ -94,7 +94,7 @@ class EmbedLiteViewBaseParent : public PEmbedLiteViewParent,
   RecvUpdateZoomConstraints(const uint32_t& aPresShellId,
                             const ViewID& aViewId,
                             const bool& aIsRoot,
-                            const ZoomConstraints& aConstraints) override;
+                            const Maybe<ZoomConstraints> &aConstraints) override;
   virtual bool RecvZoomToRect(const uint32_t& aPresShellId,
                               const ViewID& aViewId,
                               const CSSRect& aRect) override;

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewChildIface.h b/embedding/embedlite/embedshared/EmbedLiteViewChildIface.h
@@ -41,7 +41,7 @@ class EmbedLiteViewChildIface
   UpdateZoomConstraints(const uint32_t& aPresShellId,
                         const mozilla::layers::FrameMetrics::ViewID& aViewId,
                         const bool& aIsRoot,
-                        const mozilla::layers::ZoomConstraints& aConstraints) = 0;
+                        const Maybe<mozilla::layers::ZoomConstraints>& aConstraints) = 0;
 
   virtual bool HasMessageListener(const nsAString& aMessageName) = 0;
 

diff --git a/embedding/embedlite/embedthread/EmbedContentController.cpp b/embedding/embedlite/embedthread/EmbedContentController.cpp
@@ -21,7 +21,6 @@ class FakeListener : public EmbedLiteViewListener {};
 EmbedContentController::EmbedContentController(EmbedLiteViewBaseParent* aRenderFrame, MessageLoop* aUILoop)
   : mUILoop(aUILoop)
   , mRenderFrame(aRenderFrame)
-  , mHaveZoomConstraints(false)
 {
 }
 
@@ -147,25 +146,6 @@ void EmbedContentController::ClearRenderFrame()
   mRenderFrame = nullptr;
 }
 
-bool EmbedContentController::GetRootZoomConstraints(ZoomConstraints* aOutConstraints)
-{
-  if (aOutConstraints) {
-    if (mHaveZoomConstraints) {
-      *aOutConstraints = mZoomConstraints;
-    } else {
-      NS_WARNING("Apply default zoom constraints");
-      // Until we support the meta-viewport tag properly allow zooming
-      // from 1/4 to 4x by default.
-      aOutConstraints->mAllowZoom = true;
-      aOutConstraints->mAllowDoubleTapZoom = false;
-      aOutConstraints->mMinZoom = CSSToParentLayerScale(0.25f);
-      aOutConstraints->mMaxZoom = CSSToParentLayerScale(4.0f);
-    }
-    return true;
-  }
-  return false;
-}
-
 /**
  * Schedules a runnable to run on the controller/UI thread at some time
  * in the future.
@@ -208,10 +188,3 @@ void EmbedContentController::NotifyFlushComplete()
 {
   printf("==================== notify flush complete\n");
 }
-
-void
-EmbedContentController::SaveZoomConstraints(const ZoomConstraints& aConstraints)
-{
-  mHaveZoomConstraints = true;
-  mZoomConstraints = aConstraints;
-}
diff --git a/embedding/embedlite/embedthread/EmbedContentController.h b/embedding/embedlite/embedthread/EmbedContentController.h
@@ -44,7 +44,6 @@ class EmbedContentController : public mozilla::layers::GeckoContentController
   virtual void AcknowledgeScrollUpdate(const FrameMetrics::ViewID&, const uint32_t&) override;
   void ClearRenderFrame();
   virtual void PostDelayedTask(Task* aTask, int aDelayMs) override;
-  virtual bool GetRootZoomConstraints(ZoomConstraints* aOutConstraints) override;
   bool HitTestAPZC(mozilla::ScreenIntPoint& aPoint);
   nsEventStatus ReceiveInputEvent(InputData& aEvent,
                                   mozilla::layers::ScrollableLayerGuid* aOutTargetGuid,
@@ -53,18 +52,13 @@ class EmbedContentController : public mozilla::layers::GeckoContentController
 
   mozilla::layers::APZCTreeManager* GetManager() { return mAPZC; }
 
-  // Methods used by EmbedLiteViewBaseParent to set fields stored here.
-
-  void SaveZoomConstraints(const ZoomConstraints& aConstraints);
-
 private:
   EmbedLiteViewListener* const GetListener() const;
   void DoRequestContentRepaint(const FrameMetrics& aFrameMetrics);
 
   MessageLoop* mUILoop;
   EmbedLiteViewBaseParent* mRenderFrame;
 
-  bool mHaveZoomConstraints;
   ZoomConstraints mZoomConstraints;
 
   // Extra

diff --git a/embedding/embedlite/utils/TabChildHelper.cpp b/embedding/embedlite/utils/TabChildHelper.cpp
@@ -457,7 +457,7 @@ bool
 TabChildHelper::DoUpdateZoomConstraints(const uint32_t& aPresShellId,
                                         const ViewID& aViewId,
                                         const bool& aIsRoot,
-                                        const ZoomConstraints& aConstraints)
+                                        const Maybe<mozilla::layers::ZoomConstraints> &aConstraints)
 {
   return mView->UpdateZoomConstraints(aPresShellId,
                                       aViewId,

diff --git a/embedding/embedlite/utils/TabChildHelper.h b/embedding/embedlite/utils/TabChildHelper.h
@@ -62,7 +62,7 @@ class TabChildHelper : public mozilla::dom::TabChildBase,
   virtual bool DoUpdateZoomConstraints(const uint32_t& aPresShellId,
                                        const mozilla::layers::FrameMetrics::ViewID& aViewId,
                                        const bool& aIsRoot,
-                                       const mozilla::layers::ZoomConstraints& aConstraints) override;
+                                       const Maybe<mozilla::layers::ZoomConstraints>& aConstraints) override;
   void ReportSizeUpdate(const gfxSize& aSize);
 
 protected: