Changeset 181522 in webkit

Timestamp:

Mar 15, 2015 10:34:27 PM (9 years ago)

Author:

Brent Fulgham

Message:

Scroll snap points are not supported on iframe content
​https://bugs.webkit.org/show_bug.cgi?id=142582
<rdar://problem/20121319>

Source/WebCore:

Tested by css3/scroll-snap/scroll-snap-iframe.html

Reviewed by Simon Fraser.

The scroll snap points were not being applied to the iframe contents because the code
that sets up the scroll snap point content is not called for iframes.

To correct this, we need to make sure the snap offsets are set during post-frame layout
for iframes. We also need to make sure (on Mac) that the scroll animator and timers are updated.

• page/FrameView.cpp:

(WebCore::FrameView::performPostLayoutTasks): Call 'updateSnapOffsets' if the frame is not a
MainFrame. Also notify scroll animators they need to update their snap point settings.

LayoutTests:

Reviewed by Simon Fraser.

• css3/scroll-snap/resources: Added.
• css3/scroll-snap/resources/iframe-content.html: Added.
• css3/scroll-snap/scroll-snap-iframe-expected.txt: Added.
• css3/scroll-snap/scroll-snap-iframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/scroll-snap/resources (added)
• LayoutTests/css3/scroll-snap/resources/iframe-content.html (added)
• LayoutTests/css3/scroll-snap/scroll-snap-iframe-expected.txt (added)
• LayoutTests/css3/scroll-snap/scroll-snap-iframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-15  Brent Fulgham  <bfulgham@apple.com>
+
+        Scroll snap points are not supported on iframe content
+        https://bugs.webkit.org/show_bug.cgi?id=142582
+        <rdar://problem/20121319>
+
+        Reviewed by Simon Fraser.
+
+        * css3/scroll-snap/resources: Added.
+        * css3/scroll-snap/resources/iframe-content.html: Added.
+        * css3/scroll-snap/scroll-snap-iframe-expected.txt: Added.
+        * css3/scroll-snap/scroll-snap-iframe.html: Added.
+
 2015-03-15  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-15  Brent Fulgham  <bfulgham@apple.com>
+
+        Scroll snap points are not supported on iframe content
+        https://bugs.webkit.org/show_bug.cgi?id=142582
+        <rdar://problem/20121319>
+
+        Tested by css3/scroll-snap/scroll-snap-iframe.html
+
+        Reviewed by Simon Fraser.
+
+        The scroll snap points were not being applied to the iframe contents because the code
+        that sets up the scroll snap point content is not called for iframes.
+
+        To correct this, we need to make sure the snap offsets are set during post-frame layout
+        for iframes. We also need to make sure (on Mac) that the scroll animator and timers are updated.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performPostLayoutTasks): Call 'updateSnapOffsets' if the frame is not a
+        MainFrame. Also notify scroll animators they need to update their snap point settings.
+
 2015-03-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2977 +2977 @@
     sendResizeEventIfNeeded();
     viewportContentsChanged();
+
+#if ENABLE(CSS_SCROLL_SNAP)
+    if (!frame().isMainFrame()) {
+        updateSnapOffsets();
+        if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+            return scrollAnimator->updateScrollAnimatorsAndTimers();
+    }
+#endif
 }