Title: [118072] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (118071 => 118072)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 22:47:12 UTC (rev 118071)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 22:48:35 UTC (rev 118072)
@@ -1,3 +1,14 @@
+2012-05-22 Lucas Forschler <[email protected]>
+
+ Merge 116492
+
+ 2012-05-08 Jon Lee <[email protected]>
+
+ Unreviewed build fix.
+
+ * WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h:
+ (LayerTreeHostCAWin):
+
2012-05-21 Lucas Forschler <[email protected]>
Merge 117634
Modified: branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h (118071 => 118072)
--- branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h 2012-05-22 22:47:12 UTC (rev 118071)
+++ branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h 2012-05-22 22:48:35 UTC (rev 118072)
@@ -64,7 +64,7 @@
virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
// LayerTreeHostCA
- virtual void platformInitialize(LayerTreeContext&);
+ virtual void platformInitialize();
virtual void setRootCompositingLayer(WebCore::GraphicsLayer*);
// AbstractCACFLayerTreeHost
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
