1 files changed, 37 insertions, 35 deletions
diff --git a/chromium/third_party/blink/renderer/core/display_lock/display_lock_context_test.cc b/chromium/third_party/blink/renderer/core/display_lock/display_lock_context_test.cc
index b85e1d236d8..093845b458f 100644
--- a/chromium/third_party/blink/renderer/core/display_lock/display_lock_context_test.cc
+++ b/chromium/third_party/blink/renderer/core/display_lock/display_lock_context_test.cc
@@ -899,10 +899,10 @@ TEST_F(DisplayLockContextTest, DisplayLockPreventsActivation) {
   auto* host = GetDocument().getElementById("shadowHost");
   auto* slotted = GetDocument().getElementById("slotted");
 
-  ASSERT_FALSE(
-      host->DisplayLockPreventsActivation(DisplayLockActivationReason::kAny));
-  ASSERT_FALSE(slotted->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *host, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *slotted, DisplayLockActivationReason::kAny));
 
   ShadowRoot& shadow_root =
       host->AttachShadowRootInternal(ShadowRootType::kOpen);
@@ -912,12 +912,12 @@ TEST_F(DisplayLockContextTest, DisplayLockPreventsActivation) {
   UpdateAllLifecyclePhasesForTest();
 
   auto* container = shadow_root.getElementById("container");
-  EXPECT_FALSE(
-      host->DisplayLockPreventsActivation(DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(container->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(slotted->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *host, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *container, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *slotted, DisplayLockActivationReason::kAny));
 
   LockElement(*container, false);
 
@@ -927,12 +927,13 @@ TEST_F(DisplayLockContextTest, DisplayLockPreventsActivation) {
                 .GetDisplayLockDocumentState()
                 .DisplayLockBlockingAllActivationCount(),
             1);
-  EXPECT_FALSE(
-      host->DisplayLockPreventsActivation(DisplayLockActivationReason::kAny));
-  EXPECT_TRUE(container->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
-  EXPECT_TRUE(slotted->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *host, DisplayLockActivationReason::kAny));
+  // The container itself is locked but that doesn't mean it should be ignored.
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *container, DisplayLockActivationReason::kAny));
+  ASSERT_TRUE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *slotted, DisplayLockActivationReason::kAny));
 
   // Ensure that we resolve the acquire callback, thus finishing the acquire
   // step.
@@ -946,12 +947,12 @@ TEST_F(DisplayLockContextTest, DisplayLockPreventsActivation) {
                 .GetDisplayLockDocumentState()
                 .DisplayLockBlockingAllActivationCount(),
             0);
-  EXPECT_FALSE(
-      host->DisplayLockPreventsActivation(DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(container->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(slotted->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *host, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *container, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *slotted, DisplayLockActivationReason::kAny));
 
   UpdateAllLifecyclePhasesForTest();
 
@@ -961,20 +962,21 @@ TEST_F(DisplayLockContextTest, DisplayLockPreventsActivation) {
                 .GetDisplayLockDocumentState()
                 .DisplayLockBlockingAllActivationCount(),
             0);
-  EXPECT_FALSE(
-      host->DisplayLockPreventsActivation(DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(container->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(slotted->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *host, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *container, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *slotted, DisplayLockActivationReason::kAny));
 
   SetHtmlInnerHTML(R"HTML(
     <body>
     <div id="nonviewport" style="content-visibility: hidden-matchable">
+      <div id="nonviewport-child"></div>
     </div>
     </body>
   )HTML");
-  auto* non_viewport = GetDocument().getElementById("nonviewport");
+  auto* non_viewport = GetDocument().getElementById("nonviewport-child");
 
   EXPECT_EQ(
       GetDocument().GetDisplayLockDocumentState().LockedDisplayLockCount(), 1);
@@ -983,12 +985,12 @@ TEST_F(DisplayLockContextTest, DisplayLockPreventsActivation) {
                 .DisplayLockBlockingAllActivationCount(),
             0);
 
-  EXPECT_FALSE(non_viewport->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kAny));
-  EXPECT_FALSE(non_viewport->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kFindInPage));
-  EXPECT_TRUE(non_viewport->DisplayLockPreventsActivation(
-      DisplayLockActivationReason::kUserFocus));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *non_viewport, DisplayLockActivationReason::kAny));
+  ASSERT_FALSE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *non_viewport, DisplayLockActivationReason::kFindInPage));
+  ASSERT_TRUE(DisplayLockUtilities::ShouldIgnoreNodeDueToDisplayLock(
+      *non_viewport, DisplayLockActivationReason::kUserFocus));
 }
 
 TEST_F(DisplayLockContextTest,