Title: [174413] trunk/Source/WebKit2
- Revision
- 174413
- Author
- cdu...@apple.com
- Date
- 2014-10-07 17:41:42 -0700 (Tue, 07 Oct 2014)
Log Message
[WK2] Use is<>() / downcast<>() for DrawingArea subclasses
https://bugs.webkit.org/show_bug.cgi?id=137497
Reviewed by Benjamin Poulain.
Use is<>() / downcast<>() for DrawingArea subclasses.
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::synchronizeDynamicViewportUpdate):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (174412 => 174413)
--- trunk/Source/WebKit2/ChangeLog 2014-10-07 23:17:04 UTC (rev 174412)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-08 00:41:42 UTC (rev 174413)
@@ -1,3 +1,20 @@
+2014-10-07 Christophe Dumez <cdu...@apple.com>
+
+ [WK2] Use is<>() / downcast<>() for DrawingArea subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137497
+
+ Reviewed by Benjamin Poulain.
+
+ Use is<>() / downcast<>() for DrawingArea subclasses.
+
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::synchronizeDynamicViewportUpdate):
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+
2014-10-07 Simon Fraser <simon.fra...@apple.com>
Roll-over Changelogs.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (174412 => 174413)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-10-07 23:17:04 UTC (rev 174412)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-10-08 00:41:42 UTC (rev 174413)
@@ -37,6 +37,7 @@
#include <functional>
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
+#include <wtf/TypeCasts.h>
namespace IPC {
class Connection;
@@ -152,9 +153,11 @@
#endif
};
-#define DRAWING_AREA_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, DrawingArea, value, value->predicate, value.predicate)
-
} // namespace WebKit
+#define SPECIALIZE_TYPE_TRAITS_DRAWING_AREA(ToValueTypeName, AreaType) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebKit::ToValueTypeName) \
+ static bool isType(const WebKit::DrawingArea& area) { return area.type() == WebKit::AreaType; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
#endif // DrawingArea_h
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (174412 => 174413)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-07 23:17:04 UTC (rev 174412)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-08 00:41:42 UTC (rev 174413)
@@ -4455,7 +4455,7 @@
#if PLATFORM(IOS)
m_hasReceivedVisibleContentRectsAfterDidCommitLoad = false;
m_scaleWasSetByUIProcess = false;
- m_firstLayerTreeTransactionIDAfterDidCommitLoad = toRemoteLayerTreeDrawingArea(*m_drawingArea).nextTransactionID();
+ m_firstLayerTreeTransactionIDAfterDidCommitLoad = downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID();
m_userHasChangedPageScaleFactor = false;
m_estimatedLatency = std::chrono::milliseconds(1000 / 60);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (174412 => 174413)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-10-07 23:17:04 UTC (rev 174412)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-10-08 00:41:42 UTC (rev 174413)
@@ -2396,7 +2396,7 @@
{
newTargetScale = pageScaleFactor();
newScrollPosition = m_page->mainFrame().view()->scrollPosition();
- nextValidLayerTreeTransactionID = toRemoteLayerTreeDrawingArea(*m_drawingArea).nextTransactionID();
+ nextValidLayerTreeTransactionID = downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID();
}
void WebPage::resetViewportDefaultConfiguration(WebFrame* frame)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (174412 => 174413)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2014-10-07 23:17:04 UTC (rev 174412)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2014-10-08 00:41:42 UTC (rev 174413)
@@ -167,8 +167,8 @@
WebCore::GraphicsLayer* m_viewOverlayRootLayer;
};
-DRAWING_AREA_TYPE_CASTS(RemoteLayerTreeDrawingArea, type() == DrawingAreaTypeRemoteLayerTree);
-
} // namespace WebKit
+SPECIALIZE_TYPE_TRAITS_DRAWING_AREA(RemoteLayerTreeDrawingArea, DrawingAreaTypeRemoteLayerTree)
+
#endif // RemoteLayerTreeDrawingArea_h
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (174412 => 174413)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-10-07 23:17:04 UTC (rev 174412)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-10-08 00:41:42 UTC (rev 174413)
@@ -145,10 +145,10 @@
WebCore::GraphicsLayer* m_viewOverlayRootLayer;
};
-DRAWING_AREA_TYPE_CASTS(TiledCoreAnimationDrawingArea, type() == DrawingAreaTypeTiledCoreAnimation);
-
} // namespace WebKit
+SPECIALIZE_TYPE_TRAITS_DRAWING_AREA(TiledCoreAnimationDrawingArea, DrawingAreaTypeTiledCoreAnimation)
+
#endif // !PLATFORM(IOS)
#endif // TiledCoreAnimationDrawingArea_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
