<!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>[174351] 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/174351">174351</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-06 11:08:42 -0700 (Mon, 06 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingTree subclasses
https://bugs.webkit.org/show_bug.cgi?id=137449

Reviewed by Ryosuke Niwa.

Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingTree subclasses.

Source/WebCore:

No new tests, no behavior change.

* page/scrolling/ScrollingTree.h:
* page/scrolling/ThreadedScrollingTree.h:
* page/scrolling/ios/ScrollingTreeIOS.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::handleWheelEvent):
(WebCore::ScrollingCoordinatorMac::commitTreeState):

Source/WebKit2:

* UIProcess/Scrolling/RemoteScrollingTree.h:
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::addScrollingTreeForPage):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreeh">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebCore/ChangeLog        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-06  Christophe Dumez  &lt;cdumez@apple.com&gt;
+
+        Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingTree subclasses
+        https://bugs.webkit.org/show_bug.cgi?id=137449
+
+        Reviewed by Ryosuke Niwa.
+
+        Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingTree subclasses.
+
+        No new tests, no behavior change.
+
+        * page/scrolling/ScrollingTree.h:
+        * page/scrolling/ThreadedScrollingTree.h:
+        * page/scrolling/ios/ScrollingTreeIOS.h:
+        * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+        (WebCore::ScrollingCoordinatorMac::handleWheelEvent):
+        (WebCore::ScrollingCoordinatorMac::commitTreeState):
+
</ins><span class="cx"> 2014-10-06  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] Build fix aftr r174347.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include &lt;wtf/OwnPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/PassOwnPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/ThreadSafeRefCounted.h&gt;
</span><ins>+#include &lt;wtf/TypeCasts.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -178,11 +179,12 @@
</span><span class="cx">     unsigned m_fixedOrStickyNodeCount;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#define SCROLLING_TREE_TYPE_CASTS(ToValueTypeName, predicate) \
-    TYPE_CASTS_BASE(ToValueTypeName, WebCore::ScrollingTree, value, value-&gt;predicate, value.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \
+    static bool isType(const WebCore::ScrollingTree&amp; tree) { return tree.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> 
</span><span class="cx"> #endif // ScrollingTree_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx">     RefPtr&lt;AsyncScrollingCoordinator&gt; m_scrollingCoordinator;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-SCROLLING_TREE_TYPE_CASTS(ThreadedScrollingTree, isThreadedScrollingTree());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(WebCore::ThreadedScrollingTree, isThreadedScrollingTree())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> 
</span><span class="cx"> #endif // ThreadedScrollingTree_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx">     RefPtr&lt;AsyncScrollingCoordinator&gt; m_scrollingCoordinator;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-SCROLLING_TREE_TYPE_CASTS(ScrollingTreeIOS, isScrollingTreeIOS());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(WebCore::ScrollingTreeIOS, isScrollingTreeIOS())
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> 
</span><span class="cx"> #endif // ScrollingTreeIOS_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">     if (scrollingTree()-&gt;willWheelEventStartSwipeGesture(wheelEvent))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    ScrollingThread::dispatch(bind(&amp;ThreadedScrollingTree::handleWheelEvent, toThreadedScrollingTree(scrollingTree()), wheelEvent));
</del><ins>+    ScrollingThread::dispatch(bind(&amp;ThreadedScrollingTree::handleWheelEvent, downcast&lt;ThreadedScrollingTree&gt;(scrollingTree()), wheelEvent));
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">     ASSERT(scrollingStateTree()-&gt;hasChangedProperties());
</span><span class="cx"> 
</span><span class="cx">     OwnPtr&lt;ScrollingStateTree&gt; treeState = scrollingStateTree()-&gt;commit(LayerRepresentation::PlatformLayerRepresentation);
</span><del>-    ScrollingThread::dispatch(bind(&amp;ThreadedScrollingTree::commitNewTreeState, toThreadedScrollingTree(scrollingTree()), treeState.release()));
</del><ins>+    ScrollingThread::dispatch(bind(&amp;ThreadedScrollingTree::commitNewTreeState, downcast&lt;ThreadedScrollingTree&gt;(scrollingTree()), treeState.release()));
</ins><span class="cx"> 
</span><span class="cx">     updateTiledScrollingIndicator();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebKit2/ChangeLog        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-06  Christophe Dumez  &lt;cdumez@apple.com&gt;
+
+        Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingTree subclasses
+        https://bugs.webkit.org/show_bug.cgi?id=137449
+
+        Reviewed by Ryosuke Niwa.
+
+        Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingTree subclasses.
+
+        * UIProcess/Scrolling/RemoteScrollingTree.h:
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::addScrollingTreeForPage):
+
</ins><span class="cx"> 2014-10-05  Christophe Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Use is&lt;&gt;() / downcast&lt;&gt;() for ScrollingCoordinator / ScrollingStateNode subclasses
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx">     RemoteScrollingCoordinatorProxy&amp; m_scrollingCoordinatorProxy;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-SCROLLING_TREE_TYPE_CASTS(RemoteScrollingTree, isRemoteScrollingTree());
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><ins>+SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(WebKit::RemoteScrollingTree, isRemoteScrollingTree());
+
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> 
</span><span class="cx"> #endif // RemoteScrollingTree_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (174350 => 174351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp        2014-10-06 18:01:20 UTC (rev 174350)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp        2014-10-06 18:08:42 UTC (rev 174351)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">     ASSERT(!m_scrollingTrees.contains(webPage-&gt;pageID()));
</span><span class="cx"> 
</span><span class="cx">     AsyncScrollingCoordinator&amp; scrollingCoordinator = downcast&lt;AsyncScrollingCoordinator&gt;(*webPage-&gt;corePage()-&gt;scrollingCoordinator());
</span><del>-    m_scrollingTrees.set(webPage-&gt;pageID(), toThreadedScrollingTree(scrollingCoordinator.scrollingTree()));
</del><ins>+    m_scrollingTrees.set(webPage-&gt;pageID(), downcast&lt;ThreadedScrollingTree&gt;(scrollingCoordinator.scrollingTree()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EventDispatcher::removeScrollingTreeForPage(WebPage* webPage)
</span></span></pre>
</div>
</div>

</body>
</html>