Bug 1421384 - Inherit touch-action flags down in the compositor hit-t…

…est infos. r=miko Per the touch-action spec, the effective touch-action on an element includes touch-action restrictions from ancestor elements up to and including the element that has the "default action". This patch implements that behaviour so that WebRender gets correct touch-action values on its display items. MozReview-Commit-ID: Cw5uqAsE9qm UltraBlame original commit: 6659f392f4af0cef3cb4a5e19eef7e0e1b045f37
marco-c · Oct 3, 2019 · 9d38877 · 9d38877
1 parent 4e3b1fa
commit 9d38877
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/gfx/layers/apz/test/mochitest/mochitest.ini b/gfx/layers/apz/test/mochitest/mochitest.ini
@@ -69,7 +69,7 @@
 [test_group_pointerevents.html]
   skip-if = os == 'win' && os_version == '10.0' # Bug 1404836
 [test_group_touchevents.html]
-  skip-if = webrender || (verify && debug && (os == 'win')) # bug 1424752
+  skip-if = (verify && debug && (os == 'win'))
 [test_group_wheelevents.html]
   skip-if = (toolkit == 'android') # wheel events not supported on mobile
 [test_group_zoom.html]

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
@@ -11263,10 +11263,31 @@ nsIFrame::GetCompositorHitTestInfo(nsDisplayListBuilder* aBuilder)
     }
   }
 
+
+
+
+
+
+  CompositorHitTestInfo inheritedTouchAction = CompositorHitTestInfo::eInvisibleToHitTest;
+  if (nsDisplayCompositorHitTestInfo* parentInfo = aBuilder->GetCompositorHitTestInfo()) {
+    inheritedTouchAction = (parentInfo->HitTestInfo() & CompositorHitTestInfo::eTouchActionMask);
+  }
+
   nsIFrame* touchActionFrame = this;
   if (nsIScrollableFrame* scrollFrame = nsLayoutUtils::GetScrollableFrameFor(this)) {
     touchActionFrame = do_QueryFrame(scrollFrame);
+
+
+
+
+
+    CompositorHitTestInfo panMask = CompositorHitTestInfo::eTouchActionPanXDisabled
+                                  | CompositorHitTestInfo::eTouchActionPanYDisabled;
+    inheritedTouchAction &= ~panMask;
   }
+
+  result |= inheritedTouchAction;
+
   const uint32_t touchAction = nsLayoutUtils::GetTouchActionFromFrame(touchActionFrame);
 
 

diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
@@ -734,6 +734,10 @@ class nsDisplayListBuilder {
   {
     mCompositorHitTestInfo = aHitTestInfo;
   }
+  nsDisplayCompositorHitTestInfo* GetCompositorHitTestInfo() const
+  {
+    return mCompositorHitTestInfo;
+  }
-Original file line number
+Diff line change
@@ Expand Up / @@ -734,6 +734,10 @@ class nsDisplayListBuilder { @@
       {
         mCompositorHitTestInfo = aHitTestInfo;
       }
+      nsDisplayCompositorHitTestInfo* GetCompositorHitTestInfo() const
+      {
+        return mCompositorHitTestInfo;
+      }
@@ Expand Down @@