Title: [132986] trunk/Source/WebCore
- Revision
- 132986
- Author
- [email protected]
- Date
- 2012-10-30 22:58:02 -0700 (Tue, 30 Oct 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=100813
ScrollingCoordinatorMac::stateNodeForID() should return a
ScrollingStateNode* instead of a ScrollingStateScrollingNode*
Reviewed by Sam Weinig.
ScrollingCoordinatorMac::stateNodeForID() should return a
ScrollingStateNode* instead of a ScrollingStateScrollingNode* so that
it can be used for other types of nodes once we add them.
* page/scrolling/mac/ScrollingCoordinatorMac.h:
(ScrollingCoordinatorMac):
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::frameViewLayoutUpdated):
(WebCore::ScrollingCoordinatorMac::recomputeWheelEventHandlerCountForFrameView):
(WebCore::ScrollingCoordinatorMac::requestScrollPositionUpdate):
(WebCore::ScrollingCoordinatorMac::stateNodeForID):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132985 => 132986)
--- trunk/Source/WebCore/ChangeLog 2012-10-31 05:49:30 UTC (rev 132985)
+++ trunk/Source/WebCore/ChangeLog 2012-10-31 05:58:02 UTC (rev 132986)
@@ -1,3 +1,22 @@
+2012-10-30 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=100813
+ ScrollingCoordinatorMac::stateNodeForID() should return a
+ ScrollingStateNode* instead of a ScrollingStateScrollingNode*
+
+ Reviewed by Sam Weinig.
+
+ ScrollingCoordinatorMac::stateNodeForID() should return a
+ ScrollingStateNode* instead of a ScrollingStateScrollingNode* so that
+ it can be used for other types of nodes once we add them.
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ (ScrollingCoordinatorMac):
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::frameViewLayoutUpdated):
+ (WebCore::ScrollingCoordinatorMac::recomputeWheelEventHandlerCountForFrameView):
+ (WebCore::ScrollingCoordinatorMac::requestScrollPositionUpdate):
+ (WebCore::ScrollingCoordinatorMac::stateNodeForID):
+
2012-10-30 Keishi Hattori <[email protected]>
F4 inside <input type=time> should not open calendar picker
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (132985 => 132986)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2012-10-31 05:49:30 UTC (rev 132985)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2012-10-31 05:58:02 UTC (rev 132986)
@@ -77,7 +77,7 @@
virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);
void ensureRootStateNodeForFrameView(FrameView*);
- ScrollingStateScrollingNode* stateNodeForID(ScrollingNodeID);
+ ScrollingStateNode* stateNodeForID(ScrollingNodeID);
struct ScrollParameters {
ScrollElasticity horizontalScrollElasticity;
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (132985 => 132986)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2012-10-31 05:49:30 UTC (rev 132985)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2012-10-31 05:58:02 UTC (rev 132986)
@@ -109,7 +109,7 @@
if (!coordinatesScrollingForFrameView(frameView))
return;
- ScrollingStateScrollingNode* node = stateNodeForID(frameView->scrollLayerID());
+ ScrollingStateScrollingNode* node = toScrollingStateScrollingNode(stateNodeForID(frameView->scrollLayerID()));
if (!node)
return;
@@ -130,7 +130,7 @@
void ScrollingCoordinatorMac::recomputeWheelEventHandlerCountForFrameView(FrameView* frameView)
{
- ScrollingStateScrollingNode* node = stateNodeForID(frameView->scrollLayerID());
+ ScrollingStateScrollingNode* node = toScrollingStateScrollingNode(stateNodeForID(frameView->scrollLayerID()));
if (!node)
return;
setWheelEventHandlerCountForNode(computeCurrentWheelEventHandlerCount(), node);
@@ -191,7 +191,7 @@
if (frameView->frame()->document()->inPageCache())
return true;
- ScrollingStateScrollingNode* stateNode = stateNodeForID(frameView->scrollLayerID());
+ ScrollingStateScrollingNode* stateNode = toScrollingStateScrollingNode(stateNodeForID(frameView->scrollLayerID()));
if (!stateNode)
return false;
@@ -294,7 +294,7 @@
m_scrollingStateTree->removeNode(m_scrollingStateTree->rootStateNode());
}
-ScrollingStateScrollingNode* ScrollingCoordinatorMac::stateNodeForID(ScrollingNodeID scrollLayerID)
+ScrollingStateNode* ScrollingCoordinatorMac::stateNodeForID(ScrollingNodeID scrollLayerID)
{
if (!scrollLayerID)
return 0;
@@ -303,8 +303,7 @@
if (it == m_stateNodeMap.end())
return 0;
- ScrollingStateNode* node = it->value;
- return toScrollingStateScrollingNode(node);
+ return it->value;
}
void ScrollingCoordinatorMac::ensureRootStateNodeForFrameView(FrameView* frameView)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
