[webkit-changes] [118048] tags/Safari-536.12.1/Source/WebKit2

Tue, 22 May 2012 13:55:04 -0700

Title: [118048] tags/Safari-536.12.1/Source/WebKit2
Revision
118048
Author
[email protected]
Date
2012-05-22 13:55:37 -0700 (Tue, 22 May 2012)

Log Message

Merged r116492.


Modified Paths

Diff

Modified: tags/Safari-536.12.1/Source/WebKit2/ChangeLog (118047 => 118048)


--- tags/Safari-536.12.1/Source/WebKit2/ChangeLog	2012-05-22 20:54:04 UTC (rev 118047)
+++ tags/Safari-536.12.1/Source/WebKit2/ChangeLog	2012-05-22 20:55:37 UTC (rev 118048)
@@ -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-16  Lucas Forschler  <[email protected]>
 
     Merge 117129

Modified: tags/Safari-536.12.1/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h (118047 => 118048)


--- tags/Safari-536.12.1/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h	2012-05-22 20:54:04 UTC (rev 118047)
+++ tags/Safari-536.12.1/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.h	2012-05-22 20:55:37 UTC (rev 118048)
@@ -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

Reply via email to