Changeset 156397 in webkit for trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

Timestamp:

Sep 25, 2013, 8:40:58 AM (12 years ago)

Author:

[email protected]

Message:

Move wheel event dispatch from Node to Element.
<​https://webkit.org/b/121908>

Reviewed by Anders Carlsson.

Wheel events are only ever dispatched on Elements, so move the logic out of Node.

Had to make RenderBox::scroll() and friends return a stopElement instead of a
stopNode (out argument) to make this work, though it was only ever returning
Elements there anyway.

File:

• trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -448 +448 @@
 }
 
-bool RenderTextControlSingleLine::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Node** stopNode)
+bool RenderTextControlSingleLine::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
 {
     RenderBox* renderer = innerTextElement()->renderBox();
@@ -456 +456 @@
     if (layer && layer->scroll(direction, granularity, multiplier))
         return true;
-    return RenderBlock::scroll(direction, granularity, multiplier, stopNode);
-}
-
-bool RenderTextControlSingleLine::logicalScroll(ScrollLogicalDirection direction, ScrollGranularity granularity, float multiplier, Node** stopNode)
+    return RenderBlock::scroll(direction, granularity, multiplier, stopElement);
+}
+
+bool RenderTextControlSingleLine::logicalScroll(ScrollLogicalDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
 {
     RenderLayer* layer = innerTextElement()->renderBox()->layer();
     if (layer && layer->scroll(logicalToPhysical(direction, style()->isHorizontalWritingMode(), style()->isFlippedBlocksWritingMode()), granularity, multiplier))
         return true;
-    return RenderBlock::logicalScroll(direction, granularity, multiplier, stopNode);
+    return RenderBlock::logicalScroll(direction, granularity, multiplier, stopElement);
 }