[embedlite] Implement RequestFlingSnap. Fixes JB#44042

The layout.css.scroll-snap.enabled is enabled by default.
sailfishos · Apr 5, 2019 · edf708d · edf708d
1 parent 5a21922
commit edf708d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/embedding/embedlite/PEmbedLiteView.ipdl b/embedding/embedlite/PEmbedLiteView.ipdl
@@ -53,6 +53,7 @@ child:
     HandleSingleTap(CSSPoint aPoint, Modifiers aModifiers, ScrollableLayerGuid aGuid);
     HandleLongTap(CSSPoint aPoint, ScrollableLayerGuid aGuid, uint64_t aInputBlockId);
     AcknowledgeScrollUpdate(ViewID aScrollId, uint32_t aScrollGeneration);
+    RequestFlingSnap(ViewID aScrollId, CSSPoint aDestination);
     HandleTextEvent(nsString commit, nsString preEdit);
     HandleKeyPressEvent(int domKeyCode, int gmodifiers, int charCode);
     HandleKeyReleaseEvent(int domKeyCode, int gmodifiers, int charCode);

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
@@ -846,6 +846,15 @@ EmbedLiteViewBaseChild::RecvAcknowledgeScrollUpdate(const FrameMetrics::ViewID&
   return true;
 }
 
+bool
+EmbedLiteViewBaseChild::RecvRequestFlingSnap(const FrameMetrics::ViewID& aScrollId,
+                                             const CSSPoint& aDestination)
+{
+  LOGT("thread id: %ld", syscall(SYS_gettid));
+  APZCCallbackHelper::RequestFlingSnap(aScrollId, aDestination);
+  return true;
+}
+
 void
 EmbedLiteViewBaseChild::InitEvent(WidgetGUIEvent& event, nsIntPoint* aPoint)
 {

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.h b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.h
@@ -165,6 +165,7 @@ class EmbedLiteViewBaseChild : public PEmbedLiteViewChild,
                                  const mozilla::layers::ScrollableLayerGuid& aGuid,
                                  const uint64_t& aInputBlockId) override;
   virtual bool RecvAcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId, const uint32_t& aScrollGeneration) override;
+  virtual bool RecvRequestFlingSnap(const FrameMetrics::ViewID& aScrollId, const CSSPoint& aDestination) override;
   virtual bool RecvMouseEvent(const nsString& aType,
                               const float& aX,
                               const float& aY,

diff --git a/embedding/embedlite/embedthread/EmbedContentController.cpp b/embedding/embedlite/embedthread/EmbedContentController.cpp
@@ -41,6 +41,9 @@ void EmbedContentController::RequestContentRepaint(const FrameMetrics& aFrameMet
 void EmbedContentController::RequestFlingSnap(const FrameMetrics::ViewID &aScrollId, const mozilla::CSSPoint &aDestination)
 {
   LOGT();
+  mUILoop->PostTask(
+              FROM_HERE,
+              NewRunnableMethod(this, &EmbedContentController::DoRequestFlingSnap, aScrollId, aDestination));
 }
 
 void EmbedContentController::HandleDoubleTap(const CSSPoint& aPoint,
@@ -127,6 +130,13 @@ void EmbedContentController::DoSendScrollEvent(const FrameMetrics &aFrameMetrics
   }
 }
 
+void EmbedContentController::DoRequestFlingSnap(const FrameMetrics::ViewID &aScrollId, const mozilla::CSSPoint &aDestination)
+{
+  if (mRenderFrame) {
+    Unused << mRenderFrame->SendRequestFlingSnap(aScrollId, aDestination);
+  }
+}
+
 void EmbedContentController::DoNotifyAPZStateChange(const mozilla::layers::ScrollableLayerGuid &aGuid, APZStateChange aChange, int aArg)
 {
   if (mRenderFrame) {

diff --git a/embedding/embedlite/embedthread/EmbedContentController.h b/embedding/embedlite/embedthread/EmbedContentController.h
@@ -48,6 +48,7 @@ class EmbedContentController : public mozilla::layers::GeckoContentController
   EmbedLiteViewListener* const GetListener() const;
   void DoRequestContentRepaint(const FrameMetrics& aFrameMetrics);
   void DoSendScrollEvent(const FrameMetrics& aFrameMetrics);
+  void DoRequestFlingSnap(const FrameMetrics::ViewID &aScrollId, const mozilla::CSSPoint &aDestination);
   void DoNotifyAPZStateChange(const mozilla::layers::ScrollableLayerGuid &aGuid, APZStateChange aChange, int aArg);
   void DoNotifyFlushComplete();