Merge pull request #87 from rojkov/embedlite_38_setdpi

Add API for setting APZC's DPI
sailfishos · Oct 20, 2015 · 701484b · 701484b
2 parents bcb282f + e3a03fd
commit 701484b
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 0 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.cpp b/embedding/embedlite/EmbedLiteView.cpp
@@ -211,6 +211,13 @@ EmbedLiteView::SetMargins(int top, int right, int bottom, int left)
     unused << mViewParent->SendSetMargins(top, right, bottom, left);
 }
 
+void
+EmbedLiteView::SetDPI(const float& dpi)
+{
+  NS_ENSURE_TRUE(mViewImpl, );
+  mViewImpl->SetDPI(dpi);
+}
+
 void
 EmbedLiteView::ReceiveInputEvent(const InputData& aEvent)
 {

diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -99,6 +99,9 @@ class EmbedLiteView
 
   virtual void SetMargins(int top, int right, int bottom, int left);
 
+  // Set DPI for the view (views placed on different screens may get different DPI).
+  virtual void SetDPI(const float& dpi);
+
   // Scripting Interface, allow to extend embedding API by creating
   // child js scripts and messaging interface.
   // and do communication between UI and Content child via json messages.

diff --git a/embedding/embedlite/PEmbedLiteView.ipdl b/embedding/embedlite/PEmbedLiteView.ipdl
@@ -101,6 +101,11 @@ parent:
     SetBackgroundColor(nscolor color);
     ContentReceivedInputBlock(ScrollableLayerGuid aGuid, uint64_t aInputBlockId, bool aPreventDefault);
 
+    /*
+     * Gets the DPI of the screen corresponding to this view.
+     */
+    sync GetDPI() returns (float value);
+
     sync SyncMessage(nsString aMessage, nsString aJSON)
       returns (nsString[] retval);
 

diff --git a/embedding/embedlite/embedding.js b/embedding/embedlite/embedding.js
@@ -75,6 +75,7 @@ pref("apz.fling_curve_function_y2", "1.0");
 pref("apz.fling_curve_threshold_inches_per_ms", "0.03");
 pref("apz.fling_friction", "0.003");
 pref("apz.max_velocity_inches_per_ms", "0.07");
+pref("apz.touch_start_tolerance", "0.027777f");
 
 // Tweak default displayport values to reduce the risk of running out of
 // memory when zooming in

diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
@@ -91,6 +91,7 @@ EmbedLitePuppetWidget::EmbedLitePuppetWidget(EmbedLiteWindowBaseChild* window,
   , mParent(nullptr)
   , mRotation(ROTATION_0)
   , mMargins(0, 0, 0, 0)
+  , mDPI(-1.0)
 {
   MOZ_COUNT_CTOR(EmbedLitePuppetWidget);
   LOGT("this:%p", this);
@@ -643,6 +644,21 @@ EmbedLitePuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
   return mLayerManager;
 }
 
+float
+EmbedLitePuppetWidget::GetDPI()
+{
+  if (mDPI < 0) {
+    if (mView) {
+      mView->GetDPI(&mDPI);
+    } else {
+      mDPI = nsBaseWidget::GetDPI();
+    }
+  }
+
+  return mDPI;
+}
+
+
 CompositorParent*
 EmbedLitePuppetWidget::NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight)
 {

diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.h b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.h
@@ -152,6 +152,8 @@ class EmbedLitePuppetWidget : public nsBaseWidget
   virtual void CreateCompositor() override;
   virtual void CreateCompositor(int aWidth, int aHeight) override;
 
+  virtual float GetDPI() override;
+
   /**
    * Called before the LayerManager draws the layer tree.
    *
@@ -216,6 +218,7 @@ class EmbedLitePuppetWidget : public nsBaseWidget
   nsIntRect mNaturalBounds;
   nsIntMargin mMargins;
   ObserverArray mObservers;
+  float mDPI;
 };
 
 }  // namespace widget

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
@@ -349,6 +349,12 @@ EmbedLiteViewBaseChild::ZoomToRect(const uint32_t& aPresShellId,
   return SendZoomToRect(aPresShellId, aViewId, aRect);
 }
 
+bool
+EmbedLiteViewBaseChild::GetDPI(float* aDPI)
+{
+  return SendGetDPI(aDPI);
+}
+
 bool
 EmbedLiteViewBaseChild::UpdateZoomConstraints(const uint32_t& aPresShellId,
                                               const ViewID& aViewId,

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.h b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.h
@@ -66,6 +66,7 @@ class EmbedLiteViewBaseChild : public PEmbedLiteViewChild,
 
   virtual nsIWebNavigation* WebNavigation() override;
   virtual nsIWidget* WebWidget() override;
+  virtual bool GetDPI(float* aDPI) override;
 
 /*---------TabChildIface---------------*/
 

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp
@@ -25,6 +25,7 @@ EmbedLiteViewBaseParent::EmbedLiteViewBaseParent(const uint32_t& windowId, const
   , mViewAPIDestroyed(false)
   , mWindow(*EmbedLiteWindowBaseParent::From(windowId))
   , mCompositor(nullptr)
+  , mDPI(-1.0)
   , mUILoop(MessageLoop::current())
   , mLastIMEState(0)
   , mUploadTexture(0)
@@ -73,6 +74,9 @@ EmbedLiteViewBaseParent::UpdateScrollController()
   if (mCompositor) {
     mRootLayerTreeId = mCompositor->RootLayerTreeId();
     mController->SetManagerByRootLayerTreeId(mRootLayerTreeId);
+    if (mDPI > 0) {
+      mController->GetManager()->SetDPI(mDPI);
+    }
     CompositorParent::SetControllerForLayerTree(mRootLayerTreeId, mController);
   }
 }
@@ -344,6 +348,28 @@ EmbedLiteViewBaseParent::RecvRpcMessage(const nsString& aMessage,
   return RecvSyncMessage(aMessage, aJSON, aJSONRetVal);
 }
 
+
+NS_IMETHODIMP
+EmbedLiteViewBaseParent::SetDPI(float dpi)
+{
+  mDPI = dpi;
+
+  if (mController->GetManager()) {
+    mController->GetManager()->SetDPI(mDPI);
+  }
+
+  return NS_OK;
+}
+
+bool
+EmbedLiteViewBaseParent::RecvGetDPI(float* aValue)
+{
+  NS_ENSURE_TRUE((mDPI > 0), false);
+
+  *aValue = mDPI;
+  return true;
+}
+
 void
 EmbedLiteViewBaseParent::CompositorCreated()
 {

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.h b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.h
@@ -118,6 +118,8 @@ class EmbedLiteViewBaseParent : public PEmbedLiteViewParent,
   // EmbedLiteWindowParentObserver:
   void CompositorCreated() override;
 
+  virtual bool RecvGetDPI(float* aValue) override;
+
 private:
   friend class EmbedContentController;
   friend class EmbedLiteCompositorParent;
@@ -133,6 +135,8 @@ class EmbedLiteViewBaseParent : public PEmbedLiteViewParent,
   EmbedLiteWindowBaseParent& mWindow;
   RefPtr<EmbedLiteCompositorParent> mCompositor;
 
+  float mDPI;
+
   MessageLoop* mUILoop;
   int mLastIMEState;
 

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewChildIface.h b/embedding/embedlite/embedshared/EmbedLiteViewChildIface.h
@@ -52,6 +52,7 @@ class EmbedLiteViewChildIface
   virtual bool DoCallRpcMessage(const char16_t* aMessageName,
                                 const char16_t* aMessage,
                                 InfallibleTArray<nsString>* aJSONRetVal) = 0;
+  virtual bool GetDPI(float* aDPI) = 0;
 
   /**
    * Relay given frame metrics to listeners subscribed via EmbedLiteAppService

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewIface.idl b/embedding/embedlite/embedshared/EmbedLiteViewIface.idl
@@ -31,6 +31,7 @@ class nsString;
 [scriptable, uuid(6d7750f8-e028-4445-a0cb-d9ce28fb03dd)]
 interface EmbedLiteViewIface
 {
+    void SetDPI(in float dpi);
     void ReceiveInputEvent([const] in InputData aEvent);
     void TextEvent(in string aComposite, in string aPreEdit);
     void SendKeyPress(in int32_t aDomKeyCode, in int32_t aModifiers, in int32_t aCharCode);