Changeset 52012 in webkit

Timestamp:

Dec 11, 2009 11:59:11 AM (14 years ago)

Author:

bweinstein@apple.com

Message:

Fixes <​http://webkit.org/b/32399>.
Pan Scrolling Jumps out of frames if the initial location is in a frame that can't be scrolled.

Reviewed by Darin Adler.

WebCore:

When we initially figure out the layer that we should begin scrolling, don't try to jump out
of frames/iFrames to look at the owner document. We don't want to jump out of frames, so we
don't need that logic anymore.

Added a test to make sure that we don't pan scroll if we start to scroll in an empty
iFrame that has a scrollable owner document.

Test: platform/win/fast/events/panScroll-no-iframe-jump.html

• dom/Node.cpp:

(WebCore::Node::defaultEventHandler):

LayoutTests:

Added a test to make sure that we don't pan scroll if we start to scroll in an empty
iFrame that has a scrollable owner document.

• platform/win/fast/events/panScroll-no-iframe-jump-expected.txt: Added.
• platform/win/fast/events/panScroll-no-iframe-jump.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump-expected.txt (added)
• LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Node.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-11  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fixes <http://webkit.org/b/32399>.
+        Pan Scrolling Jumps out of frames if the initial location is in a frame that can't be scrolled.
+        
+        Added a test to make sure that we don't pan scroll if we start to scroll in an empty
+        iFrame that has a scrollable owner document.
+
+        * platform/win/fast/events/panScroll-no-iframe-jump-expected.txt: Added.
+        * platform/win/fast/events/panScroll-no-iframe-jump.html: Added.
+
 2009-12-11  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-11  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fixes <http://webkit.org/b/32399>.
+        Pan Scrolling Jumps out of frames if the initial location is in a frame that can't be scrolled.
+        
+        When we initially figure out the layer that we should begin scrolling, don't try to jump out
+        of frames/iFrames to look at the owner document. We don't want to jump out of frames, so we
+        don't need that logic anymore.
+        
+        Added a test to make sure that we don't pan scroll if we start to scroll in an empty
+        iFrame that has a scrollable owner document.
+
+        Test: platform/win/fast/events/panScroll-no-iframe-jump.html
+
+        * dom/Node.cpp:
+        (WebCore::Node::defaultEventHandler):
+
 2009-12-11  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebCore/dom/Node.cpp

@@ -2834 +2834 @@
             RenderObject* renderer = this->renderer();
 
-            while (renderer && (!renderer->isBox() || !toRenderBox(renderer)->canBeScrolledAndHasScrollableArea())) {
-                // FIXME: If we start in a frame that can't scroll, we don't want to jump out of it to start scrolling:
-                // <https://bugs.webkit.org/show_bug.cgi?id=32399>.
-                if (!renderer->parent() && renderer->node() == renderer->document() && renderer->document()->ownerElement())
-                    renderer = renderer->document()->ownerElement()->renderer();
-                else
-                    renderer = renderer->parent();
-            }
+            while (renderer && (!renderer->isBox() || !toRenderBox(renderer)->canBeScrolledAndHasScrollableArea()))
+                renderer = renderer->parent();
 
             if (renderer) {
-                if (Frame* frame = renderer->document()->frame())
+                if (Frame* frame = document()->frame())
                     frame->eventHandler()->startPanScrolling(renderer);
             }