Title: [136046] trunk/Source/WebCore
- Revision
- 136046
- Author
- [email protected]
- Date
- 2012-11-28 12:59:10 -0800 (Wed, 28 Nov 2012)
Log Message
cleanup: Change some code to be cleaner, more readable and style conforming
https://bugs.webkit.org/show_bug.cgi?id=103543
Patch by Sadrul Habib Chowdhury <[email protected]> on 2012-11-28
Reviewed by Antonio Gomes.
Use more appropriate function name and more meaningful variable names to make the code cleaner.
This is covered by existing tests. This does not make any behavioural changes, so no new tests.
* page/EventHandler.cpp:
(WebCore::closestScrollableNodeInDocumentIfPossible):
(WebCore::EventHandler::handleWheelEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136045 => 136046)
--- trunk/Source/WebCore/ChangeLog 2012-11-28 20:39:52 UTC (rev 136045)
+++ trunk/Source/WebCore/ChangeLog 2012-11-28 20:59:10 UTC (rev 136046)
@@ -1,3 +1,17 @@
+2012-11-28 Sadrul Habib Chowdhury <[email protected]>
+
+ cleanup: Change some code to be cleaner, more readable and style conforming
+ https://bugs.webkit.org/show_bug.cgi?id=103543
+
+ Reviewed by Antonio Gomes.
+
+ Use more appropriate function name and more meaningful variable names to make the code cleaner.
+ This is covered by existing tests. This does not make any behavioural changes, so no new tests.
+
+ * page/EventHandler.cpp:
+ (WebCore::closestScrollableNodeInDocumentIfPossible):
+ (WebCore::EventHandler::handleWheelEvent):
+
2012-11-28 Alexandru Chiculita <[email protected]>
[CSS Regions] Crash when using hover and first-letter inside a flow-thread
Modified: trunk/Source/WebCore/page/EventHandler.cpp (136045 => 136046)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-11-28 20:39:52 UTC (rev 136045)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-11-28 20:59:10 UTC (rev 136046)
@@ -279,18 +279,16 @@
return enclosingBox->scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopNode);
}
-static Node* getClosestScrollableNodeInDocumentIfPossible(Node* node)
+static Node* closestScrollableNodeInDocumentIfPossible(Node* node)
{
- Node* firstNode = node;
- while (node) {
- if (node->isDocumentNode())
- return firstNode;
- RenderObject* renderer = node->renderer();
+ for (Node* scrollableNode = node; scrollableNode; scrollableNode = scrollableNode->parentNode()) {
+ if (scrollableNode->isDocumentNode())
+ break;
+ RenderObject* renderer = scrollableNode->renderer();
if (renderer && renderer->isBox() && toRenderBox(renderer)->canBeScrolledAndHasScrollableArea())
- return node;
- node = node->parentNode();
+ return scrollableNode;
}
- return firstNode;
+ return node;
}
#if ENABLE(GESTURE_EVENTS)
@@ -2447,7 +2445,7 @@
if (useLatchedWheelEventNode) {
if (!m_latchedWheelEventNode) {
- m_latchedWheelEventNode = getClosestScrollableNodeInDocumentIfPossible(result.innerNode());
+ m_latchedWheelEventNode = closestScrollableNodeInDocumentIfPossible(result.innerNode());
m_widgetIsLatched = result.isOverWidget();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
