Changeset 130226 in webkit

Timestamp:

Oct 2, 2012, 4:14:56 PM (14 years ago)

Author:

Nate Chapin

Message:

Source/WebCore: iframes with scrolling=no can't scroll to anchors
​https://bugs.webkit.org/show_bug.cgi?id=96539

Reviewed by Antonio Gomes.

This appears to have regressed in r106730. This patch matches Firefox's behavior.

Test: fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe.html

• page/EventHandler.h:
• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::scrollRectToVisible): Currently scrolls are always forbidden

if scrollbars are explicitly disabled. This adds an exception for scrolls that
are not user-initiated and are not autoscrolls.

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=96539.

Reviewed by Antonio Gomes.

• fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-expected.txt: Added.
• fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe.html: Added.
• fast/dom/HTMLAnchorElement/resources: Added.
• fast/dom/HTMLAnchorElement/resources/iframe-with-anchor.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-expected.txt (added)
• LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe.html (added)
• LayoutTests/fast/dom/HTMLAnchorElement/resources (added)
• LayoutTests/fast/dom/HTMLAnchorElement/resources/iframe-with-anchor.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.h (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-02  Nate Chapin  <japhet@chromium.org>
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=96539.
+
+        Reviewed by Antonio Gomes.
+
+        * fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-expected.txt: Added.
+        * fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe.html: Added.
+        * fast/dom/HTMLAnchorElement/resources: Added.
+        * fast/dom/HTMLAnchorElement/resources/iframe-with-anchor.html: Added.
+
 2012-10-02  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-02  Nate Chapin  <japhet@chromium.org>
+
+        iframes with scrolling=no can't scroll to anchors
+        https://bugs.webkit.org/show_bug.cgi?id=96539
+
+        Reviewed by Antonio Gomes.
+
+        This appears to have regressed in r106730. This patch matches Firefox's behavior.
+
+        Test: fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe.html
+
+        * page/EventHandler.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollRectToVisible): Currently scrolls are always forbidden
+           if scrollbars are explicitly disabled. This adds an exception for scrolls that
+           are not user-initiated and are not autoscrolls.
+
 2012-10-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/EventHandler.h

@@ -112 +112 @@
     RenderObject* autoscrollRenderer() const;
     void updateAutoscrollRenderer();
+    bool autoscrollInProgress() const { return m_autoscrollInProgress; }
 
     void dispatchFakeMouseMoveEventSoon();

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1807 +1807 @@
                     frameElement = static_cast<HTMLFrameElement*>(ownerElement);
 
-                if (frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff) {
+                if ((frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff)
+                    || (!frameView->frame()->eventHandler()->autoscrollInProgress() && !frameView->wasScrolledByUser())) {
                     LayoutRect viewRect = frameView->visibleContentRect();
                     LayoutRect exposeRect = getRectToExpose(viewRect, rect, alignX, alignY);