Attachment 370420 Details for Bug 198009 – Patch for landing

[patch] Patch for landing

bug-198009-20190522135004.patch (text/plain), 7.38 KB, created by Ali Juma on 2019-05-22 10:50:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ali Juma

Created: 2019-05-22 10:50:05 PDT

Size: 7.38 KB

patch

obsolete

>Subversion Revision: 245569
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 48edb2b1c23095081c423b679d51a45fb19f1dc9..7d0c01f3b61df3ebe1b8f06127c92437e08a2d40 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-05-22  Ali Juma  <ajuma@chromium.org>
>+
>+        Intersection Observer: bounding client rect is wrong for an inline element
>+        https://bugs.webkit.org/show_bug.cgi?id=198009
>+
>+        Reviewed by Simon Fraser.
>+
>+        Make target rect computation for inline elements share logic with the computation
>+        of bounding client rects.
>+
>+        Test: imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html
>+
>+        * dom/Document.cpp:
>+        (WebCore::computeIntersectionState):
>+        * dom/Element.cpp:
>+        (WebCore::Element::boundingAbsoluteRectWithoutLayout):
>+        (WebCore::Element::boundingClientRect):
>+        * dom/Element.h:
>+
> 2019-05-21  Antti Koivisto  <antti@apple.com>
> 
>         RTL/overflow scroll tests fail with async overflow enabled
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 92605852d261272f53fbd52638f111cabd9c64c6..d6d35291cb96434425b0baae7449a06aa180d136 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -7349,9 +7349,13 @@ static Optional<IntersectionObservationState> computeIntersectionState(FrameView
>     LayoutRect localTargetBounds;
>     if (is<RenderBox>(*targetRenderer))
>         localTargetBounds = downcast<RenderBox>(targetRenderer)->borderBoundingBox();
>-    else if (is<RenderInline>(targetRenderer))
>-        localTargetBounds = downcast<RenderInline>(targetRenderer)->linesBoundingBox();
>-    else if (is<RenderLineBreak>(targetRenderer))
>+    else if (is<RenderInline>(targetRenderer)) {
>+        auto pair = target.boundingAbsoluteRectWithoutLayout();
>+        if (pair) {
>+            FloatRect absoluteTargetBounds = pair->second;
>+            localTargetBounds = enclosingLayoutRect(targetRenderer->absoluteToLocalQuad(absoluteTargetBounds).boundingBox());
>+        }
>+    } else if (is<RenderLineBreak>(targetRenderer))
>         localTargetBounds = downcast<RenderLineBreak>(targetRenderer)->linesBoundingBox();
> 
>     Optional<LayoutRect> rootLocalTargetRect;
>diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
>index c4913bebf58c05ef9ff2c594e684514f943f490e..29790336fd557ea85365a9f9f78133e9dea74fd4 100644
>--- a/Source/WebCore/dom/Element.cpp
>+++ b/Source/WebCore/dom/Element.cpp
>@@ -1414,10 +1414,8 @@ Ref<DOMRectList> Element::getClientRects()
>     return DOMRectList::create(quads);
> }
> 
>-FloatRect Element::boundingClientRect()
>+Optional<std::pair<RenderObject*, FloatRect>> Element::boundingAbsoluteRectWithoutLayout()
> {
>-    document().updateLayoutIgnorePendingStylesheets();
>-
>     RenderObject* renderer = this->renderer();
>     Vector<FloatQuad> quads;
>     if (isSVGElement() && renderer && !renderer->isSVGRoot()) {
>@@ -1433,12 +1431,23 @@ FloatRect Element::boundingClientRect()
>         renderBoxModelObject->absoluteQuads(quads);
> 
>     if (quads.isEmpty())
>-        return { };
>+        return WTF::nullopt;
> 
>     FloatRect result = quads[0].boundingBox();
>     for (size_t i = 1; i < quads.size(); ++i)
>         result.unite(quads[i].boundingBox());
> 
>+    return std::make_pair(renderer, result);
>+}
>+
>+FloatRect Element::boundingClientRect()
>+{
>+    document().updateLayoutIgnorePendingStylesheets();
>+    auto pair = boundingAbsoluteRectWithoutLayout();
>+    if (!pair)
>+        return { };
>+    RenderObject* renderer = pair->first;
>+    FloatRect result = pair->second;
>     document().convertAbsoluteToClientRect(result, renderer->style());
>     return result;
> }
>diff --git a/Source/WebCore/dom/Element.h b/Source/WebCore/dom/Element.h
>index 5f3f876268ca5687677a6710e3dce03554270fc2..c6016e0e91beb0eec87630567d486a66120a2dfc 100644
>--- a/Source/WebCore/dom/Element.h
>+++ b/Source/WebCore/dom/Element.h
>@@ -189,6 +189,8 @@ public:
> 
>     WEBCORE_EXPORT IntRect boundsInRootViewSpace();
> 
>+    Optional<std::pair<RenderObject*, FloatRect>> boundingAbsoluteRectWithoutLayout();
>+
>     WEBCORE_EXPORT FloatRect boundingClientRect();
> 
>     WEBCORE_EXPORT Ref<DOMRectList> getClientRects();
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index b9152e70ec7431af4639ac248704d180f93bffd1..d6532132dca7ad481203b3e07ee88862058f1b94 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-22  Ali Juma  <ajuma@chromium.org>
>+
>+        Intersection Observer: bounding client rect is wrong for an inline element
>+        https://bugs.webkit.org/show_bug.cgi?id=198009
>+
>+        Reviewed by Simon Fraser.
>+
>+        Import test added upstream in
>+        https://github.com/web-platform-tests/wpt/commit/cf40205c68f739ae23429439de13d125e3df9f7a
>+
>+        * web-platform-tests/intersection-observer/inline-with-block-child-client-rect-expected.txt: Added.
>+        * web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html: Added.
>+
> 2019-05-17  Rob Buis  <rbuis@igalia.com>
> 
>         Implement imagesrcset and imagesizes attributes on link rel=preload
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..17c97453febc411ce1962d5f27cabc551c21a6ca
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect-expected.txt
>@@ -0,0 +1,5 @@
>+ 
>+
>+PASS Inline target containing a block child 
>+PASS First rAF 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html b/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..81a8fd125691bbfca73ff73e861e80ecf69818f8
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html
>@@ -0,0 +1,46 @@
>+<!DOCTYPE html>
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+<script src="./resources/intersection-observer-test-utils.js"></script>
>+
>+<style>
>+pre, #log {
>+  position: absolute;
>+  top: 120px;
>+  left: 0;
>+}
>+#target {
>+  display: inline;
>+}
>+</style>
>+
>+<div id="target">
>+  <div>
>+    <img width=100 height=100 />
>+  </div>
>+</div>
>+
>+<script>
>+var vw = document.documentElement.clientWidth;
>+var vh = document.documentElement.clientHeight;
>+var entries = [];
>+var target;
>+
>+runTestCycle(function() {
>+  target = document.getElementById("target");
>+  assert_true(!!target, "target exists");
>+  var observer = new IntersectionObserver(function(changes) {
>+    entries = entries.concat(changes)
>+  });
>+  observer.observe(target);
>+  entries = entries.concat(observer.takeRecords());
>+  assert_equals(entries.length, 0, "No initial notifications.");
>+  runTestCycle(step0, "First rAF");
>+}, "Inline target containing a block child");
>+
>+function step0() {
>+  assert_equals(entries.length, 1);
>+  checkRect(entries[0].boundingClientRect, clientBounds(target),
>+            "entry.boundingClientRect == target.getBoundingClientRect()");
>+}
>+</script>

Actions: View | Formatted Diff | Diff

Attachments on bug 198009: 370170 | 370337 | 370396 | 370402 | 370403 | 370405 | 370411 | 370413 | 370420