Title: [87974] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87973 => 87974)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-03 00:46:03 UTC (rev 87973)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-03 00:48:16 UTC (rev 87974)
@@ -1,5 +1,17 @@
2011-06-02 Lucas Forschler <[email protected]>
+ Merged 87804.
+
+2011-06-01 Adam Roben <[email protected]>
+
+ Windows build fix after r87755
+
+ * WebProcess/WebPage/ca/win/LayerTreeHostCAWin.cpp:
+ (WebKit::LayerTreeHostCAWin::setLayerFlushSchedulingEnabled): Fixed
+ typo.
+
+2011-06-02 Lucas Forschler <[email protected]>
+
Merged 87755.
2011-05-31 Dan Bernstein <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.cpp (87973 => 87974)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.cpp 2011-06-03 00:46:03 UTC (rev 87973)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/ca/win/LayerTreeHostCAWin.cpp 2011-06-03 00:48:16 UTC (rev 87974)
@@ -152,7 +152,7 @@
if (m_layerFlushSchedulingEnabled)
return;
- LayerChangesFlusher::shared().cancelPendingFlush(thus);
+ LayerChangesFlusher::shared().cancelPendingFlush(this);
}
bool LayerTreeHostCAWin::participatesInDisplay()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
