Changeset 246432 in webkit

Timestamp:

Jun 14, 2019 6:05:13 AM (5 years ago)

Author:

ajuma@chromium.org

Message:

IntersectionObserver rootMargin detection fails when root is an element
​https://bugs.webkit.org/show_bug.cgi?id=198784

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

Import ​https://github.com/web-platform-tests/wpt/pull/17323.

• web-platform-tests/intersection-observer/root-margin-root-element-expected.txt: Added.
• web-platform-tests/intersection-observer/root-margin-root-element.html: Added.

Source/WebCore:

When computing a target's bounds in root space, we were applying the root's
clip rect (if any), and then intersecting with the root rect expanded by the
root margin. This meant that if a target did not intersect the non-expanded root
rect, we would get an empty intersection even if the target did intersect the
expanded root rect. Fix this by not applying the root's clip rect when computing
a target's bounds in root space. Add a new VisibleRectContextOption::ApplyContainerClip
that determines whether RenderObject::computeVisibleRectInContainer should apply
the container's clip.

Test: imported/w3c/web-platform-tests/intersection-observer/root-margin-root-element.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::applyCachedClipAndScrollPosition const):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::visibleRectContextForRepaint):

• rendering/RenderObject.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/intersection-observer/root-margin-root-element-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/intersection-observer/root-margin-root-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2019-06-14  Ali Juma  <ajuma@chromium.org>
+
+        IntersectionObserver rootMargin detection fails when `root` is an element
+        https://bugs.webkit.org/show_bug.cgi?id=198784
+
+        Reviewed by Simon Fraser.
+
+        Import https://github.com/web-platform-tests/wpt/pull/17323.
+
+        * web-platform-tests/intersection-observer/root-margin-root-element-expected.txt: Added.
+        * web-platform-tests/intersection-observer/root-margin-root-element.html: Added.
+
 2019-06-13  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-14  Ali Juma  <ajuma@chromium.org>
+
+        IntersectionObserver rootMargin detection fails when `root` is an element
+        https://bugs.webkit.org/show_bug.cgi?id=198784
+
+        Reviewed by Simon Fraser.
+
+        When computing a target's bounds in root space, we were applying the root's
+        clip rect (if any), and then intersecting with the root rect expanded by the
+        root margin. This meant that if a target did not intersect the non-expanded root
+        rect, we would get an empty intersection even if the target did intersect the
+        expanded root rect. Fix this by not applying the root's clip rect when computing
+        a target's bounds in root space. Add a new VisibleRectContextOption::ApplyContainerClip
+        that determines whether RenderObject::computeVisibleRectInContainer should apply
+        the container's clip.
+
+        Test: imported/w3c/web-platform-tests/intersection-observer/root-margin-root-element.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::applyCachedClipAndScrollPosition const):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::visibleRectContextForRepaint):
+        * rendering/RenderObject.h:
+
 2019-06-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -994 +994 @@
 
     // Do not clip scroll layer contents to reduce the number of repaints while scrolling.
-    if (!context.m_options.contains(VisibleRectContextOption::ApplyCompositedClips) && usesCompositedScrolling()) {
+    if ((!context.m_options.contains(VisibleRectContextOption::ApplyCompositedClips) && usesCompositedScrolling())
+        || (!context.m_options.contains(VisibleRectContextOption::ApplyContainerClip) && this == container)) {
         flipForWritingMode(rect);
         return true;

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -987 +987 @@
 RenderObject::VisibleRectContext RenderObject::visibleRectContextForRepaint()
 {
-    VisibleRectContext context;
+    VisibleRectContext context(false, false, { VisibleRectContextOption::ApplyContainerClip });
     if (shouldApplyCompositedContainerScrollsForRepaint())
         context.m_options.add(VisibleRectContextOption::ApplyCompositedContainerScrolls);

trunk/Source/WebCore/rendering/RenderObject.h

@@ -669 +669 @@
         ApplyCompositedClips = 1 << 1,
         ApplyCompositedContainerScrolls  = 1 << 2,
+        ApplyContainerClip = 1 << 3,
     };
     struct VisibleRectContext {