Attachment 349548 Details for Bug 189525 – Patch for landing

[patch] Patch for landing

bug-189525-20180912112636.patch (text/plain), 6.35 KB, created by Ali Juma on 2018-09-12 08:26:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ali Juma

Created: 2018-09-12 08:26:36 PDT

Size: 6.35 KB

patch

obsolete

>Subversion Revision: 235894
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e3cf292aeb808cce101e61da495200573c73ce3f..597608c7267ce1de01c755d33d10c0965c0e9c4f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-09-12  Ali Juma  <ajuma@chromium.org>
>+
>+        [IntersectionObserver] Implement rootMargin expansion
>+        https://bugs.webkit.org/show_bug.cgi?id=189525
>+
>+        Reviewed by Simon Fraser.
>+
>+        Expand the root intersection rectangle by the observer's rootMargin when computing
>+        intersections.
>+
>+        Test: imported/w3c/web-platform-tests/intersection-observer/root-margin.html
>+
>+        * dom/Document.cpp:
>+        (WebCore::expandRootBoundsWithRootMargin):
>+        (WebCore::computeIntersectionRects):
>+        * page/IntersectionObserver.h:
>+        (WebCore::IntersectionObserver::rootMarginBox const):
>+        * platform/graphics/FloatRect.h:
>+        (WebCore::FloatRect::expand):
>+
> 2018-09-11  Frederic Wang  <fwang@igalia.com>
> 
>         Refactor filter list checking code
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index fb7fc59535a555d1c6c01e6812c80357aca4cea5..51f660e21666cb72cb9914aad9385da2d9afbc61 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -7485,6 +7485,18 @@ void Document::removeIntersectionObserver(IntersectionObserver& observer)
>     m_intersectionObservers.removeFirst(&observer);
> }
> 
>+static void expandRootBoundsWithRootMargin(FloatRect& localRootBounds, const LengthBox& rootMargin)
>+{
>+    FloatBoxExtent rootMarginFloatBox(
>+        floatValueForLength(rootMargin.top(), localRootBounds.height()),
>+        floatValueForLength(rootMargin.right(), localRootBounds.width()),
>+        floatValueForLength(rootMargin.bottom(), localRootBounds.height()),
>+        floatValueForLength(rootMargin.left(), localRootBounds.width())
>+    );
>+
>+    localRootBounds.expand(rootMarginFloatBox);
>+}
>+
> static void computeIntersectionRects(FrameView& frameView, IntersectionObserver& observer, Element& target, FloatRect& absTargetRect, FloatRect& absIntersectionRect, FloatRect& absRootBounds)
> {
>     // FIXME: Implement intersection computation for the cross-document case.
>@@ -7495,7 +7507,6 @@ static void computeIntersectionRects(FrameView& frameView, IntersectionObserver&
>     if (!targetRenderer)
>         return;
> 
>-    // FIXME: Expand localRootBounds using the observer's rootMargin.
>     FloatRect localRootBounds;
>     RenderBlock* rootRenderer;
>     if (observer.root()) {
>@@ -7516,6 +7527,8 @@ static void computeIntersectionRects(FrameView& frameView, IntersectionObserver&
>         localRootBounds = frameView.layoutViewportRect();
>     }
> 
>+    expandRootBoundsWithRootMargin(localRootBounds, observer.rootMarginBox());
>+
>     LayoutRect localTargetBounds;
>     if (is<RenderBox>(*targetRenderer))
>         localTargetBounds = downcast<RenderBox>(targetRenderer)->borderBoundingBox();
>diff --git a/Source/WebCore/page/IntersectionObserver.h b/Source/WebCore/page/IntersectionObserver.h
>index f5089e04fe92fda42a72a1fcbc41adbc823b1ea4..092c4e1f500b49124c6924ee4958e116ddcfdc61 100644
>--- a/Source/WebCore/page/IntersectionObserver.h
>+++ b/Source/WebCore/page/IntersectionObserver.h
>@@ -72,6 +72,7 @@ public:
> 
>     Element* root() const { return m_root; }
>     String rootMargin() const;
>+    const LengthBox& rootMarginBox() const { return m_rootMargin; }
>     const Vector<double>& thresholds() const { return m_thresholds; }
>     const Vector<Element*> observationTargets() const { return m_observationTargets; }
> 
>diff --git a/Source/WebCore/platform/graphics/FloatRect.h b/Source/WebCore/platform/graphics/FloatRect.h
>index a6dd2106fe3c6f366c3af4e8080163ec062dfd35..93acad536185a6c89e0a3e88858ae69e582cd3e3 100644
>--- a/Source/WebCore/platform/graphics/FloatRect.h
>+++ b/Source/WebCore/platform/graphics/FloatRect.h
>@@ -27,6 +27,7 @@
> #pragma once
> 
> #include "FloatPoint.h"
>+#include "LengthBox.h"
> 
> #if USE(CG)
> typedef struct CGRect CGRect;
>@@ -108,6 +109,11 @@ public:
>     void move(float dx, float dy) { m_location.move(dx, dy); }
> 
>     void expand(const FloatSize& size) { m_size += size; }
>+    void expand(const FloatBoxExtent& box)
>+    {
>+        m_location.move(-box.left(), -box.top());
>+        m_size.expand(box.left() + box.right(), box.top() + box.bottom());
>+    }
>     void expand(float dw, float dh) { m_size.expand(dw, dh); }
>     void contract(const FloatSize& size) { m_size -= size; }
>     void contract(float dw, float dh) { m_size.expand(-dw, -dh); }
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index e60abee4189f1442afc52c598099305a20175ed1..5713a2b8413ce68c6daf7fe94c6ea27649979bf7 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1 +1,12 @@
>+2018-09-12  Ali Juma  <ajuma@chromium.org>
>+
>+        [IntersectionObserver] Implement rootMargin expansion
>+        https://bugs.webkit.org/show_bug.cgi?id=189525
>+
>+        Reviewed by Simon Fraser.
>+
>+        Rebasline expectation for test that now passes.
>+
>+        * web-platform-tests/intersection-observer/root-margin-expected.txt:
>+
> == Rolled over to ChangeLog-2018-09-11 ==
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/root-margin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/root-margin-expected.txt
>index 3c36690d0b3d12166156a24876b6c496cdf9e83d..9d9ab2aba1f7d866476f73c35fb183807ba6039a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/root-margin-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/intersection-observer/root-margin-expected.txt
>@@ -1,8 +1,8 @@
>   
> 
> PASS Root margin tests 
>-FAIL First rAF. assert_equals: entries[0].rootBounds.left expected -30 but got 0
>-FAIL document.scrollingElement.scrollLeft = 100 assert_equals: entries.length expected 2 but got 1
>-FAIL document.scrollingElement.scrollTop = document.documentElement.clientHeight + 200 assert_equals: entries.length expected 2 but got 1
>-FAIL document.scrollingElement.scrollTop = document.documentElement.clientHeight + 300 assert_equals: entries.length expected 3 but got 1
>+PASS First rAF. 
>+PASS document.scrollingElement.scrollLeft = 100 
>+PASS document.scrollingElement.scrollTop = document.documentElement.clientHeight + 200 
>+PASS document.scrollingElement.scrollTop = document.documentElement.clientHeight + 300 
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189525: 349467 | 349548