Diff
Modified: trunk/Source/WebCore/ChangeLog (174350 => 174351)
--- 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)
@@ -1,3 +1,21 @@
+2014-10-06 Christophe Dumez <[email protected]>
+
+ Use is<>() / downcast<>() for ScrollingTree subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137449
+
+ Reviewed by Ryosuke Niwa.
+
+ Use is<>() / downcast<>() 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):
+
2014-10-06 Brent Fulgham <[email protected]>
[Win] Build fix aftr r174347.
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (174350 => 174351)
--- 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)
@@ -36,6 +36,7 @@
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/ThreadSafeRefCounted.h>
+#include <wtf/TypeCasts.h>
namespace WebCore {
@@ -178,11 +179,12 @@
unsigned m_fixedOrStickyNodeCount;
};
-#define SCROLLING_TREE_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, WebCore::ScrollingTree, value, value->predicate, value.predicate)
-
} // namespace WebCore
+#define SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \
+ static bool isType(const WebCore::ScrollingTree& tree) { return tree.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
#endif // ENABLE(ASYNC_SCROLLING)
#endif // ScrollingTree_h
Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (174350 => 174351)
--- 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)
@@ -70,10 +70,10 @@
RefPtr<AsyncScrollingCoordinator> m_scrollingCoordinator;
};
-SCROLLING_TREE_TYPE_CASTS(ThreadedScrollingTree, isThreadedScrollingTree());
-
} // namespace WebCore
+SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(WebCore::ThreadedScrollingTree, isThreadedScrollingTree())
+
#endif // ENABLE(ASYNC_SCROLLING)
#endif // ThreadedScrollingTree_h
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (174350 => 174351)
--- 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)
@@ -63,10 +63,10 @@
RefPtr<AsyncScrollingCoordinator> m_scrollingCoordinator;
};
-SCROLLING_TREE_TYPE_CASTS(ScrollingTreeIOS, isScrollingTreeIOS());
-
} // namespace WebCore
+SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(WebCore::ScrollingTreeIOS, isScrollingTreeIOS())
+
#endif // ENABLE(ASYNC_SCROLLING)
#endif // ScrollingTreeIOS_h
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (174350 => 174351)
--- 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)
@@ -92,7 +92,7 @@
if (scrollingTree()->willWheelEventStartSwipeGesture(wheelEvent))
return false;
- ScrollingThread::dispatch(bind(&ThreadedScrollingTree::handleWheelEvent, toThreadedScrollingTree(scrollingTree()), wheelEvent));
+ ScrollingThread::dispatch(bind(&ThreadedScrollingTree::handleWheelEvent, downcast<ThreadedScrollingTree>(scrollingTree()), wheelEvent));
return true;
}
@@ -116,7 +116,7 @@
ASSERT(scrollingStateTree()->hasChangedProperties());
OwnPtr<ScrollingStateTree> treeState = scrollingStateTree()->commit(LayerRepresentation::PlatformLayerRepresentation);
- ScrollingThread::dispatch(bind(&ThreadedScrollingTree::commitNewTreeState, toThreadedScrollingTree(scrollingTree()), treeState.release()));
+ ScrollingThread::dispatch(bind(&ThreadedScrollingTree::commitNewTreeState, downcast<ThreadedScrollingTree>(scrollingTree()), treeState.release()));
updateTiledScrollingIndicator();
}
Modified: trunk/Source/WebKit2/ChangeLog (174350 => 174351)
--- 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)
@@ -1,3 +1,16 @@
+2014-10-06 Christophe Dumez <[email protected]>
+
+ Use is<>() / downcast<>() for ScrollingTree subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137449
+
+ Reviewed by Ryosuke Niwa.
+
+ Use is<>() / downcast<>() for ScrollingTree subclasses.
+
+ * UIProcess/Scrolling/RemoteScrollingTree.h:
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::addScrollingTreeForPage):
+
2014-10-05 Christophe Dumez <[email protected]>
Use is<>() / downcast<>() for ScrollingCoordinator / ScrollingStateNode subclasses
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (174350 => 174351)
--- 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)
@@ -68,10 +68,10 @@
RemoteScrollingCoordinatorProxy& m_scrollingCoordinatorProxy;
};
-SCROLLING_TREE_TYPE_CASTS(RemoteScrollingTree, isRemoteScrollingTree());
-
} // namespace WebKit
+SPECIALIZE_TYPE_TRAITS_SCROLLING_TREE(WebKit::RemoteScrollingTree, isRemoteScrollingTree());
+
#endif // ENABLE(ASYNC_SCROLLING)
#endif // RemoteScrollingTree_h
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (174350 => 174351)
--- 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)
@@ -73,7 +73,7 @@
ASSERT(!m_scrollingTrees.contains(webPage->pageID()));
AsyncScrollingCoordinator& scrollingCoordinator = downcast<AsyncScrollingCoordinator>(*webPage->corePage()->scrollingCoordinator());
- m_scrollingTrees.set(webPage->pageID(), toThreadedScrollingTree(scrollingCoordinator.scrollingTree()));
+ m_scrollingTrees.set(webPage->pageID(), downcast<ThreadedScrollingTree>(scrollingCoordinator.scrollingTree()));
}
void EventDispatcher::removeScrollingTreeForPage(WebPage* webPage)
