Fix touch action rect computation for continuation

This CL fixes the touch action rects computation for continuation case. In this case, we need to mark white listed touch action changed for a object's continuation. The correctness can be verified by passing an existing test. Bug: 853912 Cq-Include-Trybots: luci.chromium.try:linux-blink-gen-property-trees;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I88a5bd5989d2dbf42c921fd71ca2ca5aa5f893c6 Reviewed-on: https://chromium-review.googlesource.com/1154888 Commit-Queue: Xida Chen <xidachen@chromium.org> Reviewed-by: Philip Rogers <pdr@chromium.org> Cr-Commit-Position: refs/heads/master@{#583727}

Fix touch action rect computation for continuation
This CL fixes the touch action rects computation for continuation case. In this case, we need to mark white listed touch action changed for a object's continuation. The correctness can be verified by passing an existing test. Bug: 853912 Cq-Include-Trybots: luci.chromium.try:linux-blink-gen-property-trees;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I88a5bd5989d2dbf42c921fd71ca2ca5aa5f893c6 Reviewed-on: https://chromium-review.googlesource.com/1154888 Commit-Queue: Xida Chen <xidachen@chromium.org> Reviewed-by: Philip Rogers <pdr@chromium.org> Cr-Commit-Position: refs/heads/master@{#583727}
a1c594c8 · Xida Chen · Commit Bot · 98acdea7 · a1c594c8 · a1c594c8
Commit a1c594c8 authored Aug 16, 2018 by Xida Chen Committed by Commit Bot Aug 16, 2018
5 changed files
--- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2
@@ -1396,3 +1396,5 @@ Bug(none) compositing/overflow/scrollbar-layer-placement-negative-z-index-child-

 Bug(none) fast/events/touch/compositor-touch-hit-rects-svg.html [ Failure ]
 Bug(none) virtual/paint-touchaction-rects/fast/events/touch/compositor-touch-hit-rects-svg.html [ Failure ]
+Bug(none) fast/events/touch/compositor-touch-hit-rects-continuation.html [ Failure ]
+Bug(none) virtual/paint-touchaction-rects/fast/events/touch/compositor-touch-hit-rects-continuation.html [ Failure ]
--- a/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-continuation-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-continuation-expected.txt
+This tests verifies the hit test regions given to the compositor specifically for continuation case. It can only be run in DumpRenderTree.
+
+continuation: #document scrolling (13, 79, 101, 11)
+continuation: #document scrolling (13, 90, 290, 12)
+continuation: #document scrolling (13, 102, 121, 11)
+
+
--- a/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-continuation.html
+++ b/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-continuation.html
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="resources/compositor-touch-hit-rects.css">
+</head>
+<body>
+<p id="description">
+This tests verifies the hit test regions given to the compositor specifically for
+continuation case. It can only be run in DumpRenderTree.</p>
+
+<div id="tests">
+  <div>
+    <b class="testcase" id="continuation">
+      This b tag
+      <div>causes a</div>
+      continuation
+    </b>
+  </div>
+</div>
+
+<div id="console"></div>
+<script src="resources/compositor-touch-hit-rects.js"></script>
+</body>
--- a/third_party/blink/renderer/core/frame/event_handler_registry.cc
+++ b/third_party/blink/renderer/core/frame/event_handler_registry.cc
@@ -292,8 +292,14 @@ void EventHandlerRegistry::NotifyHasHandlersChanged(
    if (handler_class == kTouchStartOrMoveEventBlocking ||
        handler_class == kTouchStartOrMoveEventBlockingLowLatency) {
      if (auto* node = target->ToNode()) {
-        if (auto* layout_object = node->GetLayoutObject())
+        if (auto* layout_object = node->GetLayoutObject()) {
          layout_object->MarkEffectiveWhitelistedTouchActionChanged();
+          auto* continuation = layout_object->VirtualContinuation();
+          while (continuation) {
+            continuation->MarkEffectiveWhitelistedTouchActionChanged();
+            continuation = continuation->VirtualContinuation();
+          }
+        }
      } else if (auto* dom_window = target->ToLocalDOMWindow()) {
        // This event handler is on a window. Ensure the layout view is
        // invalidated because the layout view tracks the window's blocking

--- a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc
+++ b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc
@@ -167,6 +167,12 @@ bool HasBlockingTouchEventHandler(const LayoutObject& object) {
  }

  auto* node = object.GetNode();
+  if (!node && object.IsLayoutBlockFlow() &&
+      ToLayoutBlockFlow(object).IsAnonymousBlockContinuation()) {
+    // An anonymous continuation does not have handlers so we need to check the
+    // DOM ancestor for handlers using |NodeForHitTest|.
+    node = object.NodeForHitTest();
+  }
  if (!node)
    return false;
  return HasBlockingTouchEventHandler(*object.GetFrame(), *node);