Changeset 234732 in webkit

Timestamp:

Aug 9, 2018 12:36:38 PM (6 years ago)

Author:

ajuma@chromium.org

Message:

Update IDL for IntersectionObserverEntry and IntersectionObserverEntryInit
​https://bugs.webkit.org/show_bug.cgi?id=188445

Reviewed by Simon Fraser.

Source/WebCore:

Update IntersectionObserverEntry by making rootBounds nullable, and adding an
isIntersecting attribute. Make the same changes to IntersectionObserverEntryInit,
and also add an intersectionRatio attribute.

Tested by intersection-observer/intersection-observer-entry-interface.html

• page/IntersectionObserverEntry.cpp:

(WebCore::IntersectionObserverEntry::IntersectionObserverEntry):

• page/IntersectionObserverEntry.h:

(WebCore::IntersectionObserverEntry::isIntersecting const):

• page/IntersectionObserverEntry.idl:

LayoutTests:

• intersection-observer/intersection-observer-entry-interface-expected.txt:
• intersection-observer/intersection-observer-entry-interface.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/intersection-observer/intersection-observer-entry-interface-expected.txt (modified) (1 diff)
• LayoutTests/intersection-observer/intersection-observer-entry-interface.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/IntersectionObserverEntry.cpp (modified) (1 diff)
• Source/WebCore/page/IntersectionObserverEntry.h (modified) (3 diffs)
• Source/WebCore/page/IntersectionObserverEntry.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-09  Ali Juma  <ajuma@chromium.org>
+
+        Update IDL for IntersectionObserverEntry and IntersectionObserverEntryInit
+        https://bugs.webkit.org/show_bug.cgi?id=188445
+
+        Reviewed by Simon Fraser.
+
+        * intersection-observer/intersection-observer-entry-interface-expected.txt:
+        * intersection-observer/intersection-observer-entry-interface.html:
+
 2018-08-08  Keith Miller  <keith_miller@apple.com>
 

trunk/LayoutTests/intersection-observer/intersection-observer-entry-interface-expected.txt

@@ -3 +3 @@
 PASS ConstructorTime 
 PASS ConstructorRootBounds 
+PASS ConstructorNullRootBounds 
 PASS ConstructorBoundingClientRect 
 PASS ConstructorIntersectionRect 
-PASS ConstructorTime 
+PASS ConstructorIsIntersecting 
+PASS ConstructorIntersectionRatio 
+PASS ConstructorTarget 
 

trunk/LayoutTests/intersection-observer/intersection-observer-entry-interface.html

@@ -16 +16 @@
         boundingClientRect: { x: 110, y: 112.7, width: 1130, height: 1140 },
         intersectionRect: { x: 210, y: 212, width: 2130, height: 2140 },
+        isIntersecting: true,
+        intersectionRatio: 0.35,
         target: document.body
     };
@@ -32 +34 @@
     },'ConstructorRootBounds');
     test(function() {
+        entryInit.rootBounds = null;
+        var entry = new IntersectionObserverEntry(entryInit);
+        assert_equals(entry.rootBounds, null);
+    },'ConstructorNullRootBounds');
+    test(function() {
         var entry = new IntersectionObserverEntry(entryInit);
         assert_class_string(entry.boundingClientRect, 'DOMRectReadOnly');
@@ -43 +50 @@
     test(function() {
         var entry = new IntersectionObserverEntry(entryInit);
+        assert_true(entry.isIntersecting);
+    },'ConstructorIsIntersecting');
+    test(function() {
+        var entry = new IntersectionObserverEntry(entryInit);
+        assert_equals(entry.intersectionRatio, 0.35);
+    },'ConstructorIntersectionRatio');
+    test(function() {
+        var entry = new IntersectionObserverEntry(entryInit);
         assert_equals(entry.target, document.body);
-    },'ConstructorTime');
+    },'ConstructorTarget');
 
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-09  Ali Juma  <ajuma@chromium.org>
+
+        Update IDL for IntersectionObserverEntry and IntersectionObserverEntryInit
+        https://bugs.webkit.org/show_bug.cgi?id=188445
+
+        Reviewed by Simon Fraser.
+
+        Update IntersectionObserverEntry by making rootBounds nullable, and adding an
+        isIntersecting attribute. Make the same changes to IntersectionObserverEntryInit,
+        and also add an intersectionRatio attribute.
+
+        Tested by intersection-observer/intersection-observer-entry-interface.html
+
+        * page/IntersectionObserverEntry.cpp:
+        (WebCore::IntersectionObserverEntry::IntersectionObserverEntry):
+        * page/IntersectionObserverEntry.h:
+        (WebCore::IntersectionObserverEntry::isIntersecting const):
+        * page/IntersectionObserverEntry.idl:
+
 2018-08-09  Charlie Turner  <cturner@igalia.com>
 

trunk/Source/WebCore/page/IntersectionObserverEntry.cpp

@@ -35 +35 @@
 IntersectionObserverEntry::IntersectionObserverEntry(const Init& init)
     : m_time(init.time)
-    , m_rootBounds(DOMRectReadOnly::fromRect(init.rootBounds))
     , m_boundingClientRect(DOMRectReadOnly::fromRect(init.boundingClientRect))
     , m_intersectionRect(DOMRectReadOnly::fromRect(init.intersectionRect))
+    , m_intersectionRatio(init.intersectionRatio)
     , m_target(init.target)
+    , m_isIntersecting(init.isIntersecting)
 {
+    if (init.rootBounds)
+        m_rootBounds = DOMRectReadOnly::fromRect(*init.rootBounds);
 }
-
 
 } // namespace WebCore

trunk/Source/WebCore/page/IntersectionObserverEntry.h

@@ -44 +44 @@
     struct Init {
         double time;
-        DOMRectInit rootBounds;
+        std::optional<DOMRectInit> rootBounds;
         DOMRectInit boundingClientRect;
         DOMRectInit intersectionRect;
+        double intersectionRatio;
         RefPtr<Element> target;
+        bool isIntersecting;
     };
 
@@ -61 +63 @@
     RefPtr<Element> target() const { return m_target; }
 
+    bool isIntersecting() const { return m_isIntersecting; }
     double intersectionRatio() const { return m_intersectionRatio; }
 
@@ -72 +75 @@
     double m_intersectionRatio { 0 };
     RefPtr<Element> m_target;
+    bool m_isIntersecting { false };
 };
 

trunk/Source/WebCore/page/IntersectionObserverEntry.idl

@@ -35 +35 @@
 ] interface IntersectionObserverEntry {
     readonly attribute DOMHighResTimeStamp time;
-    readonly attribute DOMRectReadOnly rootBounds;
+    readonly attribute DOMRectReadOnly? rootBounds;
     readonly attribute DOMRectReadOnly boundingClientRect;
     readonly attribute DOMRectReadOnly intersectionRect;
+    readonly attribute boolean isIntersecting;
     readonly attribute double intersectionRatio;
     readonly attribute Element target;
@@ -46 +47 @@
 ] dictionary IntersectionObserverEntryInit {
     required DOMHighResTimeStamp time;
-    required DOMRectInit rootBounds;
+    required DOMRectInit? rootBounds;
     required DOMRectInit boundingClientRect;
     required DOMRectInit intersectionRect;
+    required boolean isIntersecting;
+    required double intersectionRatio;
     required Element target;
 };