Pass TouchAction bits together with rect in SetTouchEventHandlerRegion

third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
index be89186618379733becce7107e6ef7f3e41ab966..a7f20bdebdeafac2ff43484764b08c5da4eebd00 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -786,10 +786,15 @@ void ScrollingCoordinator::SetTouchEventTargetRects(
 
   for (const auto& layer_rect : graphics_layer_rects) {
     const GraphicsLayer* graphics_layer = layer_rect.key;
-    WebVector<WebRect> web_rects(layer_rect.value.size());
-    for (size_t i = 0; i < layer_rect.value.size(); ++i)
-      web_rects[i] = EnclosingIntRect(layer_rect.value[i]);
-    graphics_layer->PlatformLayer()->SetTouchEventHandlerRegion(web_rects);
+    WebVector<WebTouchActionRect> web_touch_action_rect(

[wkorman, 2017/05/03 20:02:14]

I think I prefer WebTouchInfo for the class name, both because it's shorter, and
seems possible/likely it could grow add'l fields or field types could change
later.

I would also support just calling the local var here "touch" since it's shorter,
has no naming conflict, and the block of code is not long.

[xidachen, 2017/05/04 12:11:21]

Done.

+        layer_rect.value.size());
+    for (size_t i = 0; i < layer_rect.value.size(); ++i) {
+      web_touch_action_rect[i].rect = EnclosingIntRect(layer_rect.value[i]);
+      web_touch_action_rect[i].touch_action =

[wkorman, 2017/05/03 20:02:14]

Add TODO(wkorman) here noting that we should route the real value here.

[xidachen, 2017/05/04 12:11:21]

Done.

+          static_cast<int>(kTouchActionNone);
+    }
+    graphics_layer->PlatformLayer()->SetTouchEventHandlerRegion(
+        web_touch_action_rect);
   }
 }