Title: [163676] trunk/Source/WebKit2
Revision
163676
Author
simon.fra...@apple.com
Date
2014-02-07 18:19:39 -0800 (Fri, 07 Feb 2014)

Log Message

Add typesafe casts for DrawingAreaProxy classes
https://bugs.webkit.org/show_bug.cgi?id=128419

Reviewed by Andreas Kling.

Add typesafe casts, and use one in RemoteScrollingCoordinatorProxy::layerTreeHost().

* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::layerTreeHost):
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::contentsSizeChanged):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (163675 => 163676)


--- trunk/Source/WebKit2/ChangeLog	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-08 02:19:39 UTC (rev 163676)
@@ -1,3 +1,20 @@
+2014-02-07  Simon Fraser  <simon.fra...@apple.com>
+
+        Add typesafe casts for DrawingAreaProxy classes
+        https://bugs.webkit.org/show_bug.cgi?id=128419
+
+        Reviewed by Andreas Kling.
+        
+        Add typesafe casts, and use one in RemoteScrollingCoordinatorProxy::layerTreeHost().
+
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+        (WebKit::RemoteScrollingCoordinatorProxy::layerTreeHost):
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::contentsSizeChanged):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+
 2014-02-06  Filip Pizlo  <fpi...@apple.com>
 
         More FTL build scaffolding

Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (163675 => 163676)


--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h	2014-02-08 02:19:39 UTC (rev 163676)
@@ -114,6 +114,9 @@
 #endif
 };
 
+#define DRAWING_AREA_PROXY_TYPE_CASTS(ToValueTypeName, predicate) \
+    TYPE_CASTS_BASE(ToValueTypeName, DrawingAreaProxy, value, value->predicate, value.predicate)
+
 } // namespace WebKit
 
 #endif // DrawingAreaProxy_h

Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (163675 => 163676)


--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp	2014-02-08 02:19:39 UTC (rev 163676)
@@ -71,7 +71,7 @@
         return nullptr;
     }
 
-    RemoteLayerTreeDrawingAreaProxy* remoteDrawingArea = static_cast<RemoteLayerTreeDrawingAreaProxy*>(drawingArea);
+    RemoteLayerTreeDrawingAreaProxy* remoteDrawingArea = toRemoteLayerTreeDrawingAreaProxy(drawingArea);
     return &remoteDrawingArea->remoteLayerTreeHost();
 }
 

Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (163675 => 163676)


--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h	2014-02-08 02:19:39 UTC (rev 163676)
@@ -63,6 +63,8 @@
     WebCore::IntSize m_lastSentLayerPosition;
 };
 
+DRAWING_AREA_PROXY_TYPE_CASTS(RemoteLayerTreeDrawingAreaProxy, type() == DrawingAreaTypeRemoteLayerTree);
+
 } // namespace WebKit
 
 #endif // RemoteLayerTreeDrawingAreaProxy_h

Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (163675 => 163676)


--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h	2014-02-08 02:19:39 UTC (rev 163676)
@@ -69,6 +69,8 @@
     WebCore::IntSize m_lastSentMinimumLayoutSize;
 };
 
+DRAWING_AREA_PROXY_TYPE_CASTS(TiledCoreAnimationDrawingAreaProxy, type() == DrawingAreaTypeTiledCoreAnimation);
+
 } // namespace WebKit
 
 #endif // !PLATFORM(IOS)

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (163675 => 163676)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp	2014-02-08 02:19:39 UTC (rev 163676)
@@ -506,7 +506,6 @@
     m_page->send(Messages::WebPageProxy::DidChangeContentSize(size));
 #endif
 
-
     m_page->drawingArea()->mainFrameContentSizeChanged(size);
 
     FrameView* frameView = frame->view();

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (163675 => 163676)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h	2014-02-08 02:12:43 UTC (rev 163675)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h	2014-02-08 02:19:39 UTC (rev 163676)
@@ -155,6 +155,8 @@
     WebCore::FloatPoint m_transientZoomOrigin;
 };
 
+DRAWING_AREA_TYPE_CASTS(TiledCoreAnimationDrawingArea, type() == DrawingAreaTypeTiledCoreAnimation);
+
 } // namespace WebKit
 
 #endif // !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to