Changeset 139447 in webkit

Timestamp:

Jan 11, 2013 8:34:52 AM (11 years ago)

Author:

rjkroege@chromium.org

Message:

Merge 139339

Manually revert ​http://trac.webkit.org/changeset/136012
​https://bugs.webkit.org/show_bug.cgi?id=106580

Reviewed by Dimitri Glazkov.

Source/WebCore:

136012 broke touch-scrolling of an overflow div in an iframe. Revert manually
to work around conflicts.

• page/EventHandler.cpp:

(WebCore::EventHandler::handleWheelEvent):

LayoutTests:

• fast/events/touch/gesture/touch-gesture-scroll-remove-node-expected.txt: Removed.
• fast/events/touch/gesture/touch-gesture-scroll-remove-node.html: Removed.

TBR=​rjkroege@chromium.org

Location:

branches/chromium/1364

Files:

• LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-remove-node-expected.txt (deleted)
• LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-remove-node.html (deleted)
• Source/WebCore/page/EventHandler.cpp (modified) (2 diffs)

branches/chromium/1364/Source/WebCore/page/EventHandler.cpp

@@ -275 +275 @@
     float absDelta = delta > 0 ? delta : -delta;
     return enclosingBox->scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopNode);
-}
-
-static Node* closestScrollableNodeInDocumentIfPossible(Node* node)
-{
-    for (Node* scrollableNode = node; scrollableNode; scrollableNode = scrollableNode->parentNode()) {
-        if (scrollableNode->isDocumentNode())
-            break;
-        RenderObject* renderer = scrollableNode->renderer();
-        if (renderer && renderer->isBox() && toRenderBox(renderer)->canBeScrolledAndHasScrollableArea())
-            return scrollableNode;
-    }
-    return node;
 }
 
@@ -2307 +2295 @@
     if (useLatchedWheelEventNode) {
         if (!m_latchedWheelEventNode) {
-            m_latchedWheelEventNode = closestScrollableNodeInDocumentIfPossible(result.innerNode());
+            m_latchedWheelEventNode = result.innerNode();
             m_widgetIsLatched = result.isOverWidget();
         }