SubtreeVisibility: clear activation when going from auto to hidden.

When we are activated by viewport (auto case), we need to ensure that
we clear activation if we're switching to a non-activatable state
(hidden).

R=chrishtr@chromium.org

Fixed: 1059340
Change-Id: I0e9ef5a9f22c1cf479536d378e37fe60f70d47aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090035
Commit-Queue: vmpstr <vmpstr@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747887}

third_party/blink/renderer/core/display_lock/display_lock_context.cc

@@ -180,6 +180,12 @@ void DisplayLockContext::SetActivatable(uint16_t activatable_mask) {
   }
   activatable_mask_ = activatable_mask;
   UpdateActivationObservationIfNeeded();
+
+  // If we're no longer activatable, make sure we clear any existing activation.
+  // TODO(vmpstr): Figure out if we should clear activation on any activation
+  // changes not just "something" -> "nothing".
+  if (!IsActivatable(DisplayLockActivationReason::kAny))
+    ClearActivated();
 }
 
 void DisplayLockContext::StartAcquire() {

third_party/blink/web_tests/TestExpectations

@@ -181,9 +181,6 @@ crbug.com/986110 external/wpt/css/css-transforms/perspective-transforms-equivale
 
 crbug.com/807395 fast/multicol/mixed-opacity-test.html [ Failure ]
 
-########## display-lock failures ##########
-wpt_internal/display-lock/css-subtree-visibility/subtree-visibility-047.html [ Failure ]
-
 ########## Ref tests can't be rebaselined ##########
 crbug.com/504613 crbug.com/524248 [ Mac ] paint/images/image-backgrounds-not-antialiased.html [ Failure ]
 
@@ -3172,7 +3169,6 @@ crbug.com/626703 [ Win ] external/wpt/webvtt/rendering/cues-with-video/processin
 crbug.com/626703 [ Linux ] external/wpt/shadow-dom/directionality-002.tentative.html [ Failure ]
 crbug.com/626703 [ Mac ] external/wpt/shadow-dom/directionality-002.tentative.html [ Failure ]
 crbug.com/626703 [ Win ] external/wpt/shadow-dom/directionality-002.tentative.html [ Failure ]
-crbug.com/626703 [ Mac10.13 ] wpt_internal/display-lock/rendersubtree/activation/selection.html [ Timeout ]
 crbug.com/626703 [ Linux ] external/wpt/css/css-lists/li-value-reversed-005.html [ Failure ]
 crbug.com/626703 [ Mac ] external/wpt/css/css-lists/li-value-reversed-005.html [ Failure ]
 crbug.com/626703 [ Win ] external/wpt/css/css-lists/li-value-reversed-005.html [ Failure ]