Add flags for blink-side movementX/Y calculation

This CL renames the movementX/Y blink flag to kConsolidatedMovementXY,
and also adds a content flag to control the blink flag.
The content feature flag is going to be used in the following CL to guard
the moving movementX/Y calculation to blink in locked states.

Bug: 802067
Change-Id: I0de3dd6a23ac8d2615981e9c1c4a2f2458a31cfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1618305
Commit-Queue: Ella Ge <eirage@chromium.org>
Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Mustaq Ahmed <mustaq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#669005}

content/child/runtime_features.cc

@@ -533,6 +533,9 @@ void SetIndividualRuntimeFeatures(
           features::kPauseExecutionContextOnBackgroundFreeze)) {
     WebRuntimeFeatures::EnablePauseExecutionContextOnBackgroundFreeze(false);
   }
+
+  WebRuntimeFeatures::EnableConsolidatedMovementXY(
+      base::FeatureList::IsEnabled(features::kConsolidatedMovementXY));
 }
 
 }  // namespace

content/public/common/content_features.cc

@@ -129,6 +129,10 @@ const base::Feature kCompositeOpaqueFixedPosition{
 const base::Feature kCompositeOpaqueScrollers{"CompositeOpaqueScrollers",
                                               base::FEATURE_ENABLED_BY_DEFAULT};
 
+// When enabled, event.movement is calculated in blink instead of in browser.
+const base::Feature kConsolidatedMovementXY{"ConsolidatedMovementXY",
+                                            base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Show messages in the DevTools console about upcoming deprecations
 // that would affect sent/received cookies.
 const base::Feature kCookieDeprecationMessages{

content/public/common/content_features.h

@@ -37,6 +37,7 @@ CONTENT_EXPORT extern const base::Feature kCacheInlineScriptCode;
 CONTENT_EXPORT extern const base::Feature kCanvas2DImageChromium;
 CONTENT_EXPORT extern const base::Feature kCompositeOpaqueFixedPosition;
 CONTENT_EXPORT extern const base::Feature kCompositeOpaqueScrollers;
+CONTENT_EXPORT extern const base::Feature kConsolidatedMovementXY;
 CONTENT_EXPORT extern const base::Feature kCookieDeprecationMessages;
 CONTENT_EXPORT extern const base::Feature kCrashReporting;
 CONTENT_EXPORT extern const base::Feature kDataSaverHoldback;

third_party/blink/public/platform/web_runtime_features.h

@@ -245,6 +245,7 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableDisplayLocking(bool);
   BLINK_PLATFORM_EXPORT static void
   EnablePauseExecutionContextOnBackgroundFreeze(bool);
+  BLINK_PLATFORM_EXPORT static void EnableConsolidatedMovementXY(bool);
 
  private:
   WebRuntimeFeatures();

third_party/blink/renderer/core/events/mouse_event.cc

@@ -245,10 +245,10 @@ void MouseEvent::SetCoordinatesFromWebPointerProperties(
   initializer->setClientX(client_point.X());
   initializer->setClientY(client_point.Y());
 
-  // TODO(nzolghadr): We need to scale movement attrinutes as well. But if we
-  // do that here and round it to the int again it causes inconsistencies
-  // between screenX/Y and cumulative movementX/Y.
-  if (!RuntimeEnabledFeatures::MovementXYInBlinkEnabled()) {
+  if (!RuntimeEnabledFeatures::ConsolidatedMovementXYEnabled()) {
+    // TODO(nzolghadr): We need to scale movement attrinutes as well. But if we
+    // do that here and round it to the int again it causes inconsistencies
+    // between screenX/Y and cumulative movementX/Y.
     initializer->setMovementX(web_pointer_properties.movement_x);
     initializer->setMovementY(web_pointer_properties.movement_y);
   }

third_party/blink/renderer/core/events/pointer_event_factory.cc

@@ -94,7 +94,7 @@ void UpdateCommonPointerEventInit(const WebPointerEvent& web_pointer_event,
 
   MouseEvent::SetCoordinatesFromWebPointerProperties(
       web_pointer_event_in_root_frame, dom_window, pointer_event_init);
-  if (RuntimeEnabledFeatures::MovementXYInBlinkEnabled() &&
+  if (RuntimeEnabledFeatures::ConsolidatedMovementXYEnabled() &&
       web_pointer_event.GetType() == WebInputEvent::kPointerMove) {
     // TODO(eirage): pointerrawupdate event's movements are not calculated.
     pointer_event_init->setMovementX(web_pointer_event.PositionInScreen().x -

third_party/blink/renderer/core/input/mouse_event_manager.cc

@@ -64,7 +64,7 @@ String CanvasRegionId(Node* node, const WebMouseEvent& mouse_event) {
 void UpdateMouseMovementXY(const WebMouseEvent& mouse_event,
                            const FloatPoint* last_position,
                            MouseEventInit* initializer) {
-  if (RuntimeEnabledFeatures::MovementXYInBlinkEnabled() &&
+  if (RuntimeEnabledFeatures::ConsolidatedMovementXYEnabled() &&
       mouse_event.GetType() == WebInputEvent::kMouseMove && last_position) {
     if (RuntimeEnabledFeatures::FractionalMouseEventEnabled()) {
       initializer->setMovementX(mouse_event.PositionInScreen().x -

third_party/blink/renderer/core/input/pointer_event_manager_test.cc

@@ -248,7 +248,7 @@ TEST_F(PointerEventManagerTest, PointerEventMovements) {
 
   {
     // Turn on the flag for test.
-    ScopedMovementXYInBlinkForTest scoped_feature(true);
+    ScopedConsolidatedMovementXYForTest scoped_feature(true);
 
     WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
         CreateTestPointerEvent(WebInputEvent::kPointerMove,
@@ -290,7 +290,7 @@ TEST_F(PointerEventManagerTest, PointerEventMovements) {
 
   {
     // When flag is off, movementX/Y follows the value in WebPointerProperties.
-    ScopedMovementXYInBlinkForTest scoped_feature(false);
+    ScopedConsolidatedMovementXYForTest scoped_feature(false);
 
     WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
         CreateTestPointerEvent(WebInputEvent::kPointerMove,

third_party/blink/renderer/platform/exported/web_runtime_features.cc

@@ -695,4 +695,8 @@ void WebRuntimeFeatures::EnablePauseExecutionContextOnBackgroundFreeze(
       enable);
 }
 
+void WebRuntimeFeatures::EnableConsolidatedMovementXY(bool enable) {
+  RuntimeEnabledFeatures::SetConsolidatedMovementXYEnabled(enable);
+}
+
 }  // namespace blink

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -290,6 +290,9 @@
       name: "ComputedAccessibilityInfo",
       status: "experimental",
     },
+    {
+      name: "ConsolidatedMovementXY",
+    },
     {
       name: "ContactsManager",
       origin_trial_feature_name: "ContactsManager",
@@ -943,9 +946,6 @@
       name: "MojoJSTest",
       status: "test",
     },
-    {
-      name: "MovementXYInBlink",
-    },
     {
       name: "MuteButton",
       depends_on: ["PictureInPictureAPI"],