Turn on Display Locking when --enable-experimental-web-platform-apis

is on.

Bug: 954331
Change-Id: Id6a87efe8a8027b4636a6bfeaab3c9b6f578ba5b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1709158Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: vmpstr <vmpstr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#679862}

content/child/runtime_features.cc

@@ -522,7 +522,8 @@ void SetIndividualRuntimeFeatures(
     WebRuntimeFeatures::EnableSmsReceiver(false);
 
   WebRuntimeFeatures::EnableDisplayLocking(
-      base::FeatureList::IsEnabled(blink::features::kDisplayLocking));
+      base::FeatureList::IsEnabled(blink::features::kDisplayLocking) ||
+      enable_experimental_web_platform_features);
 
   WebRuntimeFeatures::EnableFormControlsRefresh(
       features::IsFormControlsRefreshEnabled());

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -485,6 +485,7 @@
     },
     {
       name: "DisplayLocking",
+      status: "experimental",
     },
     {
       name: "DocumentCookie",

third_party/blink/web_tests/TestExpectations

@@ -234,21 +234,19 @@ crbug.com/907601 external/wpt/dom/events/scrolling/scrollend-event-fired-after-s
 
 crbug.com/980969 [ Mac ] http/tests/input/discard-events-to-unstable-iframe.html [ Pass Failure ]
 
-# Display locking, currently only available via a virtual test.
-crbug.com/882663 wpt_internal/display-lock [ Skip ]
-
 # Display locking, run highlight-display-locked.js only with display locking.
 crbug.com/882663 http/tests/devtools/elements/highlight/highlight-display-locked.js [ Skip ]
-crbug.com/882663 virtual/display-lock/http/tests/devtools/elements/highlight [ Skip ]
-Bug(none) virtual/display-lock/http/tests/devtools/elements/highlight/highlight-display-locked.js [ Pass ]
+crbug.com/882663 http/tests/devtools/elements/highlight [ Skip ]
 
 # Display locking, run css-get-platform-fonts-display-locked.js only with display locking.
 crbug.com/882663 inspector-protocol/css/css-get-platform-fonts-display-locked.js [ Skip ]
-crbug.com/882663 virtual/display-lock/inspector-protocol/css [ Skip ]
-Bug(none) virtual/display-lock/inspector-protocol/css/css-get-platform-fonts-display-locked.js [ Pass ]
+crbug.com/882663 inspector-protocol/css [ Skip ]
 
 # Display locking failures
-crbug.com/955533 virtual/display-lock/wpt_internal/display-lock/sizing/overflow-auto-with-overflow.html [ Failure ]
+crbug.com/955533 wpt_internal/display-lock/sizing/overflow-auto-with-overflow.html [ Failure ]
+
+# virtual-scroller failures
+crbug.com/986574 wpt_internal/virtual-scroller/ [ Failure ]
 
 # Sheriff 2018/05/25
 crbug.com/846747 http/tests/navigation/navigation-interrupted-by-fragment.html  [ Pass Timeout ]

third_party/blink/web_tests/VirtualTestSuites

@@ -774,21 +774,6 @@
     "args": ["--enable-blink-features=LazyFrameLoading,AutomaticLazyFrameLoading,LazyImageLoading,AutomaticLazyImageLoading",
              "--disable-blink-features=RestrictAutomaticLazyFrameLoadingToDataSaver,RestrictAutomaticLazyImageLoadingToDataSaver"]
   },
-  {
-    "prefix": "display-lock",
-    "base": "wpt_internal/display-lock",
-    "args": ["--enable-blink-features=DisplayLocking"]
-  },
-  {
-    "prefix": "display-lock",
-    "base": "http/tests/devtools/elements/highlight",
-    "args": ["--enable-blink-features=DisplayLocking"]
-  },
-  {
-    "prefix": "display-lock",
-    "base": "inspector-protocol/css",
-    "args": ["--enable-blink-features=DisplayLocking"]
-  },
   {
     "prefix" : "autoupgrade-optionally-blockable-mixed-content",
     "base": "http/tests/mixed-autoupgrade/optionally",

third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-navigated-expected.txt

@@ -79,6 +79,7 @@ PASS oldChildWindow.onanimationiteration is newChildWindow.onanimationiteration
 PASS oldChildWindow.onanimationstart is newChildWindow.onanimationstart
 PASS oldChildWindow.onappinstalled is newChildWindow.onappinstalled
 PASS oldChildWindow.onauxclick is newChildWindow.onauxclick
+PASS oldChildWindow.onbeforeactivate is newChildWindow.onbeforeactivate
 PASS oldChildWindow.onbeforeinstallprompt is newChildWindow.onbeforeinstallprompt
 PASS oldChildWindow.onbeforeprint is newChildWindow.onbeforeprint
 PASS oldChildWindow.onbeforeunload is newChildWindow.onbeforeunload

third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-and-gced-expected.txt

@@ -41,6 +41,7 @@ PASS childWindow.onanimationiteration is null
 PASS childWindow.onanimationstart is null
 PASS childWindow.onappinstalled is null
 PASS childWindow.onauxclick is null
+PASS childWindow.onbeforeactivate is null
 PASS childWindow.onbeforeinstallprompt is null
 PASS childWindow.onbeforeprint is null
 PASS childWindow.onbeforeunload is null

third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt

@@ -41,6 +41,7 @@ PASS childWindow.onanimationiteration is null
 PASS childWindow.onanimationstart is null
 PASS childWindow.onappinstalled is null
 PASS childWindow.onauxclick is null
+PASS childWindow.onbeforeactivate is null
 PASS childWindow.onbeforeinstallprompt is null
 PASS childWindow.onbeforeprint is null
 PASS childWindow.onbeforeunload is null

third_party/blink/web_tests/webexposed/element-instance-property-listing-expected.txt

@@ -105,6 +105,7 @@ namespace http://www.w3.org/1999/xhtml
     property dataset
     property dir
     property dispatchEvent
+    property displayLock
     property draggable
     property enterKeyHint
     property firstChild
@@ -167,6 +168,7 @@ namespace http://www.w3.org/1999/xhtml
     property onabort
     property onactivateinvisible
     property onauxclick
+    property onbeforeactivate
     property onbeforecopy
     property onbeforecut
     property onbeforepaste
@@ -1291,6 +1293,7 @@ namespace http://www.w3.org/2000/svg
     property createShadowRoot
     property dataset
     property dispatchEvent
+    property displayLock
     property firstChild
     property firstElementChild
     property focus
@@ -1340,6 +1343,7 @@ namespace http://www.w3.org/2000/svg
     property onabort
     property onactivateinvisible
     property onauxclick
+    property onbeforeactivate
     property onbeforecopy
     property onbeforecut
     property onbeforepaste

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

@@ -503,6 +503,10 @@ interface BatteryManager : EventTarget
     setter onchargingtimechange
     setter ondischargingtimechange
     setter onlevelchange
+interface BeforeActivateEvent : Event
+    attribute @@toStringTag
+    getter activatedElement
+    method constructor
 interface BeforeInstallPromptEvent : Event
     attribute @@toStringTag
     getter platforms
@@ -1534,6 +1538,14 @@ interface DeviceOrientationEvent : Event
     getter beta
     getter gamma
     method constructor
+interface DisplayLockContext
+    attribute @@toStringTag
+    getter locked
+    method acquire
+    method commit
+    method constructor
+    method update
+    method updateAndCommit
 interface Document : Node
     attribute @@toStringTag
     attribute @@unscopables
@@ -1582,6 +1594,7 @@ interface Document : Node
     getter onabort
     getter onactivateinvisible
     getter onauxclick
+    getter onbeforeactivate
     getter onbeforecopy
     getter onbeforecut
     getter onbeforepaste
@@ -1772,6 +1785,7 @@ interface Document : Node
     setter onabort
     setter onactivateinvisible
     setter onauxclick
+    setter onbeforeactivate
     setter onbeforecopy
     setter onbeforecut
     setter onbeforepaste
@@ -1974,6 +1988,7 @@ interface Element : Node
     getter clientWidth
     getter computedName
     getter computedRole
+    getter displayLock
     getter firstElementChild
     getter id
     getter innerHTML
@@ -2740,6 +2755,7 @@ interface HTMLElement : Element
     getter onabort
     getter onactivateinvisible
     getter onauxclick
+    getter onbeforeactivate
     getter onblur
     getter oncancel
     getter oncanplay
@@ -2847,6 +2863,7 @@ interface HTMLElement : Element
     setter onabort
     setter onactivateinvisible
     setter onauxclick
+    setter onbeforeactivate
     setter onblur
     setter oncancel
     setter oncanplay
@@ -6323,6 +6340,7 @@ interface SVGElement : Element
     getter onabort
     getter onactivateinvisible
     getter onauxclick
+    getter onbeforeactivate
     getter onblur
     getter oncancel
     getter oncanplay
@@ -6415,6 +6433,7 @@ interface SVGElement : Element
     setter onabort
     setter onactivateinvisible
     setter onauxclick
+    setter onbeforeactivate
     setter onblur
     setter oncancel
     setter oncanplay
@@ -10998,6 +11017,7 @@ interface webkitURL
     getter onanimationstart
     getter onappinstalled
     getter onauxclick
+    getter onbeforeactivate
     getter onbeforeinstallprompt
     getter onbeforeprint
     getter onbeforeunload
@@ -11193,6 +11213,7 @@ interface webkitURL
     setter onanimationstart
     setter onappinstalled
     setter onauxclick
+    setter onbeforeactivate
     setter onbeforeinstallprompt
     setter onbeforeprint
     setter onbeforeunload