Changeset 271433 in webkit

Timestamp:

Jan 12, 2021, 11:24:08 PM (6 years ago)

Author:

cathiechen

Message:

The rootBounds of IntersectionObserverEntry is not correct when {root:document}
​https://bugs.webkit.org/show_bug.cgi?id=219495

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

• web-platform-tests/intersection-observer/same-document-with-document-root-expected.txt:

Source/WebCore:

When {root:document}, rootBounds should be the root intersection rectangle which is the document's viewport,
per [1]. The coordinator of rootBounds should be layoutViewportRect, for root intersection rectangle is not affected by pinch zoom [2].

[1] ​https://www.w3.org/TR/intersection-observer/#dom-intersectionobserverentry-rootbounds
[2] ​https://w3c.github.io/IntersectionObserver/#intersectionobserver-root-intersection-rectangle

• dom/Document.cpp:

(WebCore::computeIntersectionState):
(WebCore::Document::updateIntersectionObservations):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/intersection-observer/same-document-with-document-root-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-01-12  Cathie Chen  <cathiechen@igalia.com>
+
+        The rootBounds of IntersectionObserverEntry is not correct when {root:document}
+        https://bugs.webkit.org/show_bug.cgi?id=219495
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/intersection-observer/same-document-with-document-root-expected.txt:
+
 2021-01-12  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/same-document-with-document-root-expected.txt

@@ -2 +2 @@
 PASS IntersectionObserver in a single document using document as root.
 PASS First rAF.
-FAIL document.scrollingElement.scrollTop = 300 assert_equals: entries.length expected 2 but got 1
+PASS document.scrollingElement.scrollTop = 300
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-12  Cathie Chen  <cathiechen@igalia.com>
+
+        The rootBounds of IntersectionObserverEntry is not correct when {root:document}
+        https://bugs.webkit.org/show_bug.cgi?id=219495
+
+        Reviewed by Darin Adler.
+
+        When {root:document}, rootBounds should be the root intersection rectangle which is the document's viewport,
+        per [1]. The coordinator of rootBounds should be layoutViewportRect, for root intersection rectangle is not affected by pinch zoom [2].
+
+        [1] https://www.w3.org/TR/intersection-observer/#dom-intersectionobserverentry-rootbounds
+        [2] https://w3c.github.io/IntersectionObserver/#intersectionobserver-root-intersection-rectangle
+
+        * dom/Document.cpp:
+        (WebCore::computeIntersectionState):
+        (WebCore::Document::updateIntersectionObservations):
+
 2021-01-12  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -7723 +7723 @@
             return WTF::nullopt;
 
-        if (rootRenderer->hasOverflowClip())
+        if (observer.root() == &target.document())
+            localRootBounds = frameView.layoutViewportRect();
+        else if (rootRenderer->hasOverflowClip())
             localRootBounds = rootRenderer->contentBoxRect();
         else
@@ -7832 +7834 @@
                     auto* targetFrameView = target->document().view();
                     targetBoundingClientRect = targetFrameView->absoluteToClientRect(intersectionState->absoluteTargetRect, target->renderer()->style().effectiveZoom());
-                    auto* rootRenderer = observer->root() ? observer->root()->renderer() : frameView->renderView();
-                    clientRootBounds = frameView->absoluteToClientRect(intersectionState->absoluteRootBounds, rootRenderer->style().effectiveZoom());
+                    clientRootBounds = frameView->absoluteToLayoutViewportRect(intersectionState->absoluteRootBounds);
                     if (intersectionState->isIntersecting)
                         clientIntersectionRect = targetFrameView->absoluteToClientRect(intersectionState->absoluteIntersectionRect, target->renderer()->style().effectiveZoom());