<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174340] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174340">174340</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-05 22:14:36 -0700 (Sun, 05 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses
https://bugs.webkit.org/show_bug.cgi?id=137440
Reviewed by Ryosuke Niwa.
Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses.
Source/WebCore:
No new tests, no behavior change.
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
(WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
(WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate):
(WebCore::AsyncScrollingCoordinator::updateFrameScrollingNode):
(WebCore::AsyncScrollingCoordinator::updateOverflowScrollingNode):
(WebCore::AsyncScrollingCoordinator::updateViewportConstrainedNode):
(WebCore::AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView):
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ScrollingCoordinator.h:
* page/scrolling/ScrollingStateFixedNode.h:
* page/scrolling/ScrollingStateFrameScrollingNode.h:
* page/scrolling/ScrollingStateNode.h:
* page/scrolling/ScrollingStateOverflowScrollingNode.h:
* page/scrolling/ScrollingStateScrollingNode.h:
* page/scrolling/ScrollingStateStickyNode.h:
* page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
(WebCore::ScrollingTreeFrameScrollingNode::updateBeforeChildren):
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
(WebCore::ScrollingTreeScrollingNode::updateAfterChildren):
* page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
(WebCore::ScrollingCoordinatorCoordinatedGraphics::updateViewportConstrainedNode):
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren):
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren):
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::updateBeforeChildren):
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren):
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateAfterChildren):
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::updateBeforeChildren):
Source/WebKit2:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::encodeNodeAndDescendants):
(WebKit::RemoteScrollingCoordinatorTransaction::decode):
(WebKit::RemoteScrollingTreeTextStream::dump):
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren):
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren):
* UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm:
(WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
* WebProcess/Scrolling/RemoteScrollingCoordinator.h:
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::addScrollingTreeForPage):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::flushLayers):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFixedNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateOverflowScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateStickyNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp">trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm">trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosRemoteScrollingCoordinatorProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatorh">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/ChangeLog 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2014-10-05 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137440
+
+ Reviewed by Ryosuke Niwa.
+
+ Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses.
+
+ No new tests, no behavior change.
+
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
+ (WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
+ (WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate):
+ (WebCore::AsyncScrollingCoordinator::updateFrameScrollingNode):
+ (WebCore::AsyncScrollingCoordinator::updateOverflowScrollingNode):
+ (WebCore::AsyncScrollingCoordinator::updateViewportConstrainedNode):
+ (WebCore::AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView):
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ * page/scrolling/ScrollingCoordinator.h:
+ * page/scrolling/ScrollingStateFixedNode.h:
+ * page/scrolling/ScrollingStateFrameScrollingNode.h:
+ * page/scrolling/ScrollingStateNode.h:
+ * page/scrolling/ScrollingStateOverflowScrollingNode.h:
+ * page/scrolling/ScrollingStateScrollingNode.h:
+ * page/scrolling/ScrollingStateStickyNode.h:
+ * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+ (WebCore::ScrollingTreeFrameScrollingNode::updateBeforeChildren):
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
+ (WebCore::ScrollingTreeScrollingNode::updateAfterChildren):
+ * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::updateViewportConstrainedNode):
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren):
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::updateBeforeChildren):
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateAfterChildren):
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::updateBeforeChildren):
+
+2014-10-05 Christophe Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for CachedRawResource
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137439
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ScrollingStateFrameScrollingNode* node = toScrollingStateFrameScrollingNode(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</ins><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingCoordinator::frameViewRootLayerDidChange(frameView);
</span><span class="cx">
</span><del>- ScrollingStateFrameScrollingNode* node = toScrollingStateFrameScrollingNode(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</ins><span class="cx"> node->setLayer(scrollLayerForFrameView(frameView));
</span><span class="cx"> node->setScrolledContentsLayer(rootContentLayerForFrameView(frameView));
</span><span class="cx"> node->setCounterScrollingLayer(counterScrollingLayerForFrameView(frameView));
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> if (frameView->frame().document()->inPageCache())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- ScrollingStateScrollingNode* stateNode = toScrollingStateScrollingNode(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateScrollingNode* stateNode = downcast<ScrollingStateScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</ins><span class="cx"> if (!stateNode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx">
</span><span class="cx"> void AsyncScrollingCoordinator::updateFrameScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, GraphicsLayer* insetClipLayer, const ScrollingGeometry* scrollingGeometry)
</span><span class="cx"> {
</span><del>- ScrollingStateFrameScrollingNode* node = toScrollingStateFrameScrollingNode(m_scrollingStateTree->stateNodeForID(nodeID));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(nodeID));
</ins><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx">
</span><span class="cx"> void AsyncScrollingCoordinator::updateOverflowScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, const ScrollingGeometry* scrollingGeometry)
</span><span class="cx"> {
</span><del>- ScrollingStateOverflowScrollingNode* node = toScrollingStateOverflowScrollingNode(m_scrollingStateTree->stateNodeForID(nodeID));
</del><ins>+ ScrollingStateOverflowScrollingNode* node = downcast<ScrollingStateOverflowScrollingNode>(m_scrollingStateTree->stateNodeForID(nodeID));
</ins><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="lines">@@ -439,15 +439,15 @@
</span><span class="cx">
</span><span class="cx"> switch (constraints.constraintType()) {
</span><span class="cx"> case ViewportConstraints::FixedPositionConstraint: {
</span><del>- ScrollingStateFixedNode* fixedNode = toScrollingStateFixedNode(node);
- fixedNode->setLayer(graphicsLayer);
- fixedNode->updateConstraints((const FixedPositionViewportConstraints&)constraints);
</del><ins>+ ScrollingStateFixedNode& fixedNode = downcast<ScrollingStateFixedNode>(*node);
+ fixedNode.setLayer(graphicsLayer);
+ fixedNode.updateConstraints((const FixedPositionViewportConstraints&)constraints);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ViewportConstraints::StickyPositionConstraint: {
</span><del>- ScrollingStateStickyNode* stickyNode = toScrollingStateStickyNode(node);
- stickyNode->setLayer(graphicsLayer);
- stickyNode->updateConstraints((const StickyPositionViewportConstraints&)constraints);
</del><ins>+ ScrollingStateStickyNode& stickyNode = downcast<ScrollingStateStickyNode>(*node);
+ stickyNode.setLayer(graphicsLayer);
+ stickyNode.updateConstraints((const StickyPositionViewportConstraints&)constraints);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx">
</span><span class="cx"> void AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView(FrameView* frameView)
</span><span class="cx"> {
</span><del>- ScrollingStateFrameScrollingNode* node = toScrollingStateFrameScrollingNode(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</ins><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx"> node->setWheelEventHandlerCount(computeCurrentWheelEventHandlerCount());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -144,10 +144,10 @@
</span><span class="cx"> RefPtr<ScrollingTree> m_scrollingTree;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_COORDINATOR_TYPE_CASTS(AsyncScrollingCoordinator, isAsyncScrollingCoordinator());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_COORDINATOR(WebCore::AsyncScrollingCoordinator, isAsyncScrollingCoordinator());
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx">
</span><span class="cx"> #endif // AsyncScrollingCoordinator_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -232,9 +233,11 @@
</span><span class="cx"> bool m_forceSynchronousScrollLayerPositionUpdates;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define SCROLLING_COORDINATOR_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, WebCore::ScrollingCoordinator, value, value->predicate, value.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_SCROLLING_COORDINATOR(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \
+ static bool isType(const WebCore::ScrollingCoordinator& value) { return value.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // ScrollingCoordinator_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> FixedPositionViewportConstraints m_constraints;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateFixedNode, isFixedNode());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateFixedNode, isFixedNode())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingStateFixedNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -149,10 +149,10 @@
</span><span class="cx"> float m_topContentInset;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateFrameScrollingNode, isFrameScrollingNode());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateFrameScrollingNode, isFrameScrollingNode())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingStateFrameScrollingNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -254,11 +255,13 @@
</span><span class="cx"> LayerRepresentation m_layer;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define SCROLLING_STATE_NODE_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, ScrollingStateNode, value, value->predicate, value.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
+ static bool isType(const WebCore::ScrollingStateNode& node) { return node.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingStateNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateOverflowScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx"> LayerRepresentation m_scrolledContentsLayer;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateOverflowScrollingNode, isOverflowScrollingNode());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateOverflowScrollingNode, isOverflowScrollingNode())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingStateScrollingNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -105,10 +105,10 @@
</span><span class="cx"> bool m_requestedScrollPositionRepresentsProgrammaticScroll;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateScrollingNode, isScrollingNode());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateScrollingNode, isScrollingNode())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingStateScrollingNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> StickyPositionViewportConstraints m_constraints;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateStickyNode, isStickyNode());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateStickyNode, isStickyNode())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingStateStickyNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollingTreeScrollingNode::updateBeforeChildren(stateNode);
</span><span class="cx">
</span><del>- const ScrollingStateFrameScrollingNode& state = toScrollingStateFrameScrollingNode(stateNode);
</del><ins>+ const ScrollingStateFrameScrollingNode& state = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (state.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
</span><span class="cx"> m_frameScaleFactor = state.frameScaleFactor();
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeScrollingNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</span><span class="cx"> {
</span><del>- const ScrollingStateScrollingNode& state = toScrollingStateScrollingNode(stateNode);
</del><ins>+ const ScrollingStateScrollingNode& state = downcast<ScrollingStateScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrollableAreaSize))
</span><span class="cx"> m_scrollableAreaSize = state.scrollableAreaSize();
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeScrollingNode::updateAfterChildren(const ScrollingStateNode& stateNode)
</span><span class="cx"> {
</span><del>- const ScrollingStateScrollingNode& scrollingStateNode = toScrollingStateScrollingNode(stateNode);
</del><ins>+ const ScrollingStateScrollingNode& scrollingStateNode = downcast<ScrollingStateScrollingNode>(stateNode);
</ins><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
</span><span class="cx"> scrollingTree().scrollingTreeNodeRequestsScroll(scrollingNodeID(), scrollingStateNode.requestedScrollPosition(), scrollingStateNode.requestedScrollPositionRepresentsProgrammaticScroll());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -84,8 +84,7 @@
</span><span class="cx"> switch (constraints.constraintType()) {
</span><span class="cx"> case ViewportConstraints::FixedPositionConstraint: {
</span><span class="cx"> toCoordinatedGraphicsLayer(graphicsLayer)->setFixedToViewport(true); // FIXME : Use constraints!
</span><del>- ScrollingStateFixedNode* fixedNode = toScrollingStateFixedNode(node);
- fixedNode->setLayer(graphicsLayer);
</del><ins>+ downcast<ScrollingStateFixedNode>(*node).setLayer(graphicsLayer);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ViewportConstraints::StickyPositionConstraint:
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollingTreeFrameScrollingNode::updateBeforeChildren(stateNode);
</span><span class="cx">
</span><del>- const auto& scrollingStateNode = toScrollingStateFrameScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="cx"> m_scrollLayer = scrollingStateNode.layer();
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollingTreeFrameScrollingNode::updateAfterChildren(stateNode);
</span><span class="cx">
</span><del>- const auto& scrollingStateNode = toScrollingStateFrameScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> // Update the scroll position after child nodes have been updated, because they need to have updated their constraints before any scrolling happens.
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeFixedNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</span><span class="cx"> {
</span><del>- const ScrollingStateFixedNode& fixedStateNode = toScrollingStateFixedNode(stateNode);
</del><ins>+ const ScrollingStateFixedNode& fixedStateNode = downcast<ScrollingStateFixedNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (fixedStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="cx"> m_layer = fixedStateNode.layer();
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren(const ScrollingStateNode& stateNode)
</span><span class="cx"> {
</span><span class="cx"> ScrollingTreeFrameScrollingNode::updateBeforeChildren(stateNode);
</span><del>- const auto& scrollingStateNode = toScrollingStateFrameScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="cx"> m_scrollLayer = scrollingStateNode.layer();
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollingTreeFrameScrollingNode::updateAfterChildren(stateNode);
</span><span class="cx">
</span><del>- const auto& scrollingStateNode = toScrollingStateScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = downcast<ScrollingStateScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> // Update the scroll position after child nodes have been updated, because they need to have updated their constraints before any scrolling happens.
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeStickyNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</span><span class="cx"> {
</span><del>- const ScrollingStateStickyNode& stickyStateNode = toScrollingStateStickyNode(stateNode);
</del><ins>+ const ScrollingStateStickyNode& stickyStateNode = downcast<ScrollingStateStickyNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (stickyStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="cx"> m_layer = stickyStateNode.layer();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-10-05 Christophe Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137440
+
+ Reviewed by Ryosuke Niwa.
+
+ Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::encodeNodeAndDescendants):
+ (WebKit::RemoteScrollingCoordinatorTransaction::decode):
+ (WebKit::RemoteScrollingTreeTextStream::dump):
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren):
+ * UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm:
+ (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.h:
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::addScrollingTreeForPage):
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updatePreferences):
+
</ins><span class="cx"> 2014-10-05 Ryuan Choi <ryuan.choi@gmail.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Introduce EWebKit_Extension
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -333,16 +333,16 @@
</span><span class="cx">
</span><span class="cx"> switch (stateNode.nodeType()) {
</span><span class="cx"> case FrameScrollingNode:
</span><del>- encoder << toScrollingStateFrameScrollingNode(stateNode);
</del><ins>+ encoder << downcast<ScrollingStateFrameScrollingNode>(stateNode);
</ins><span class="cx"> break;
</span><span class="cx"> case OverflowScrollingNode:
</span><del>- encoder << toScrollingStateOverflowScrollingNode(stateNode);
</del><ins>+ encoder << downcast<ScrollingStateOverflowScrollingNode>(stateNode);
</ins><span class="cx"> break;
</span><span class="cx"> case FixedNode:
</span><del>- encoder << toScrollingStateFixedNode(stateNode);
</del><ins>+ encoder << downcast<ScrollingStateFixedNode>(stateNode);
</ins><span class="cx"> break;
</span><span class="cx"> case StickyNode:
</span><del>- encoder << toScrollingStateStickyNode(stateNode);
</del><ins>+ encoder << downcast<ScrollingStateStickyNode>(stateNode);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -417,19 +417,19 @@
</span><span class="cx">
</span><span class="cx"> switch (nodeType) {
</span><span class="cx"> case FrameScrollingNode:
</span><del>- if (!decoder.decode(*toScrollingStateFrameScrollingNode(newNode)))
</del><ins>+ if (!decoder.decode(downcast<ScrollingStateFrameScrollingNode>(*newNode)))
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> case OverflowScrollingNode:
</span><del>- if (!decoder.decode(*toScrollingStateOverflowScrollingNode(newNode)))
</del><ins>+ if (!decoder.decode(downcast<ScrollingStateOverflowScrollingNode>(*newNode)))
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> case FixedNode:
</span><del>- if (!decoder.decode(*toScrollingStateFixedNode(newNode)))
</del><ins>+ if (!decoder.decode(downcast<ScrollingStateFixedNode>(*newNode)))
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> case StickyNode:
</span><del>- if (!decoder.decode(*toScrollingStateStickyNode(newNode)))
</del><ins>+ if (!decoder.decode(downcast<ScrollingStateStickyNode>(*newNode)))
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -556,16 +556,16 @@
</span><span class="cx">
</span><span class="cx"> switch (node.nodeType()) {
</span><span class="cx"> case FrameScrollingNode:
</span><del>- dump(toScrollingStateFrameScrollingNode(node), changedPropertiesOnly);
</del><ins>+ dump(downcast<ScrollingStateFrameScrollingNode>(node), changedPropertiesOnly);
</ins><span class="cx"> break;
</span><span class="cx"> case OverflowScrollingNode:
</span><del>- dump(toScrollingStateOverflowScrollingNode(node), changedPropertiesOnly);
</del><ins>+ dump(downcast<ScrollingStateOverflowScrollingNode>(node), changedPropertiesOnly);
</ins><span class="cx"> break;
</span><span class="cx"> case FixedNode:
</span><del>- dump(toScrollingStateFixedNode(node), changedPropertiesOnly);
</del><ins>+ dump(downcast<ScrollingStateFixedNode>(node), changedPropertiesOnly);
</ins><span class="cx"> break;
</span><span class="cx"> case StickyNode:
</span><del>- dump(toScrollingStateStickyNode(node), changedPropertiesOnly);
</del><ins>+ dump(downcast<ScrollingStateStickyNode>(node), changedPropertiesOnly);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -105,33 +105,33 @@
</span><span class="cx">
</span><span class="cx"> switch (currNode->nodeType()) {
</span><span class="cx"> case FrameScrollingNode: {
</span><del>- ScrollingStateFrameScrollingNode* scrollingStateNode = toScrollingStateFrameScrollingNode(currNode);
</del><ins>+ ScrollingStateFrameScrollingNode& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(*currNode);
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::ScrolledContentsLayer))
- scrollingStateNode->setScrolledContentsLayer(layerTreeHost.getLayer(scrollingStateNode->scrolledContentsLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrolledContentsLayer))
+ scrollingStateNode.setScrolledContentsLayer(layerTreeHost.getLayer(scrollingStateNode.scrolledContentsLayer()));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
- scrollingStateNode->setCounterScrollingLayer(layerTreeHost.getLayer(scrollingStateNode->counterScrollingLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
+ scrollingStateNode.setCounterScrollingLayer(layerTreeHost.getLayer(scrollingStateNode.counterScrollingLayer()));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
- scrollingStateNode->setInsetClipLayer(layerTreeHost.getLayer(scrollingStateNode->insetClipLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
+ scrollingStateNode.setInsetClipLayer(layerTreeHost.getLayer(scrollingStateNode.insetClipLayer()));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
- scrollingStateNode->setContentShadowLayer(layerTreeHost.getLayer(scrollingStateNode->contentShadowLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
+ scrollingStateNode.setContentShadowLayer(layerTreeHost.getLayer(scrollingStateNode.contentShadowLayer()));
</ins><span class="cx">
</span><span class="cx"> // FIXME: we should never have header and footer layers coming from the WebProcess.
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::HeaderLayer))
- scrollingStateNode->setHeaderLayer(layerTreeHost.getLayer(scrollingStateNode->headerLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HeaderLayer))
+ scrollingStateNode.setHeaderLayer(layerTreeHost.getLayer(scrollingStateNode.headerLayer()));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::FooterLayer))
- scrollingStateNode->setFooterLayer(layerTreeHost.getLayer(scrollingStateNode->footerLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::FooterLayer))
+ scrollingStateNode.setFooterLayer(layerTreeHost.getLayer(scrollingStateNode.footerLayer()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case OverflowScrollingNode: {
</span><del>- ScrollingStateOverflowScrollingNode* scrollingStateNode = toScrollingStateOverflowScrollingNode(currNode);
</del><ins>+ ScrollingStateOverflowScrollingNode& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(*currNode);
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateOverflowScrollingNode::ScrolledContentsLayer))
- scrollingStateNode->setScrolledContentsLayer(layerTreeHost.getLayer(scrollingStateNode->scrolledContentsLayer()));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateOverflowScrollingNode::ScrolledContentsLayer))
+ scrollingStateNode.setScrolledContentsLayer(layerTreeHost.getLayer(scrollingStateNode.scrolledContentsLayer()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FixedNode:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingTreeOverflowScrollingNode::updateBeforeChildren(stateNode);
</span><span class="cx">
</span><del>- const auto& scrollingStateNode = toScrollingStateOverflowScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(stateNode);
</ins><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="cx"> m_scrollLayer = scrollingStateNode.layer();
</span><span class="cx">
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> TemporaryChange<bool> updatingChange(m_updatingFromStateNode, true);
</span><span class="cx">
</span><del>- const auto& scrollingStateNode = toScrollingStateOverflowScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(stateNode);
</ins><span class="cx">
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollLayer)
</span><span class="cx"> || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosRemoteScrollingCoordinatorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -57,30 +57,30 @@
</span><span class="cx"> for (auto& currNode : stateTree.nodeMap().values()) {
</span><span class="cx"> switch (currNode->nodeType()) {
</span><span class="cx"> case OverflowScrollingNode: {
</span><del>- ScrollingStateOverflowScrollingNode* scrollingStateNode = toScrollingStateOverflowScrollingNode(currNode);
</del><ins>+ ScrollingStateOverflowScrollingNode& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(*currNode);
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateNode::ScrollLayer))
- scrollingStateNode->setLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode->layer())));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
+ scrollingStateNode.setLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode.layer())));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateOverflowScrollingNode::ScrolledContentsLayer))
- scrollingStateNode->setScrolledContentsLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode->scrolledContentsLayer())));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateOverflowScrollingNode::ScrolledContentsLayer))
+ scrollingStateNode.setScrolledContentsLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode.scrolledContentsLayer())));
</ins><span class="cx"> break;
</span><span class="cx"> };
</span><span class="cx"> case FrameScrollingNode: {
</span><del>- ScrollingStateFrameScrollingNode* scrollingStateNode = toScrollingStateFrameScrollingNode(currNode);
</del><ins>+ ScrollingStateFrameScrollingNode& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(*currNode);
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateNode::ScrollLayer))
- scrollingStateNode->setLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode->layer())));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
+ scrollingStateNode.setLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode.layer())));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
- scrollingStateNode->setCounterScrollingLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode->counterScrollingLayer())));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
+ scrollingStateNode.setCounterScrollingLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode.counterScrollingLayer())));
</ins><span class="cx">
</span><span class="cx"> // FIXME: we should never have header and footer layers coming from the WebProcess.
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::HeaderLayer))
- scrollingStateNode->setHeaderLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode->headerLayer())));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HeaderLayer))
+ scrollingStateNode.setHeaderLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode.headerLayer())));
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateFrameScrollingNode::FooterLayer))
- scrollingStateNode->setFooterLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode->footerLayer())));
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::FooterLayer))
+ scrollingStateNode.setFooterLayer(layerRepresentationFromLayerOrView(layerTreeHost.getLayer(scrollingStateNode.footerLayer())));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FixedNode:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx"> WebPage* m_webPage;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_COORDINATOR_TYPE_CASTS(RemoteScrollingCoordinator, isRemoteScrollingCoordinator());
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_COORDINATOR(WebKit::RemoteScrollingCoordinator, isRemoteScrollingCoordinator());
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx">
</span><span class="cx"> #endif // RemoteScrollingCoordinator_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> ASSERT(webPage->corePage()->scrollingCoordinator());
</span><span class="cx"> ASSERT(!m_scrollingTrees.contains(webPage->pageID()));
</span><span class="cx">
</span><del>- AsyncScrollingCoordinator* scrollingCoordinator = toAsyncScrollingCoordinator(webPage->corePage()->scrollingCoordinator());
- m_scrollingTrees.set(webPage->pageID(), toThreadedScrollingTree(scrollingCoordinator->scrollingTree()));
</del><ins>+ AsyncScrollingCoordinator& scrollingCoordinator = downcast<AsyncScrollingCoordinator>(*webPage->corePage()->scrollingCoordinator());
+ m_scrollingTrees.set(webPage->pageID(), toThreadedScrollingTree(scrollingCoordinator.scrollingTree()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventDispatcher::removeScrollingTreeForPage(WebPage* webPage)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> RemoteScrollingCoordinatorTransaction scrollingTransaction;
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> if (m_webPage.scrollingCoordinator())
</span><del>- toRemoteScrollingCoordinator(m_webPage.scrollingCoordinator())->buildTransaction(scrollingTransaction);
</del><ins>+ downcast<RemoteScrollingCoordinator>(*m_webPage.scrollingCoordinator()).buildTransaction(scrollingTransaction);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_waitingForBackingStoreSwap = true;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (174339 => 174340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-10-06 05:13:09 UTC (rev 174339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-10-06 05:14:36 UTC (rev 174340)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> Settings& settings = m_webPage.corePage()->settings();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><del>- if (AsyncScrollingCoordinator* scrollingCoordinator = toAsyncScrollingCoordinator(m_webPage.corePage()->scrollingCoordinator())) {
</del><ins>+ if (AsyncScrollingCoordinator* scrollingCoordinator = downcast<AsyncScrollingCoordinator>(m_webPage.corePage()->scrollingCoordinator())) {
</ins><span class="cx"> bool scrollingPerformanceLoggingEnabled = m_webPage.scrollingPerformanceLoggingEnabled();
</span><span class="cx"> ScrollingThread::dispatch(bind(&ScrollingTree::setScrollingPerformanceLoggingEnabled, scrollingCoordinator->scrollingTree(), scrollingPerformanceLoggingEnabled));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>