Title: [100339] branches/safari-534.53-branch/Source/WebCore
- Revision
- 100339
- Author
- lforsch...@apple.com
- Date
- 2011-11-15 15:07:28 -0800 (Tue, 15 Nov 2011)
Log Message
Merged r91140.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (100338 => 100339)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-11-15 23:05:28 UTC (rev 100338)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-11-15 23:07:28 UTC (rev 100339)
@@ -1,5 +1,16 @@
2011-11-15 Lucas Forschler <lforsch...@apple.com>
+ Merge 91140
+
+ 2011-07-15 Simon Fraser <simon.fra...@apple.com>
+
+ Another Windows build fix; make this method non-pure virtual.
+
+ * platform/graphics/GraphicsLayerClient.h:
+ (WebCore::GraphicsLayerClient::didCommitChangesForLayer):
+
+2011-11-15 Lucas Forschler <lforsch...@apple.com>
+
Merge 91138
2011-07-15 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h (100338 => 100339)
--- branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2011-11-15 23:05:28 UTC (rev 100338)
+++ branches/safari-534.53-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2011-11-15 23:07:28 UTC (rev 100339)
@@ -62,7 +62,7 @@
virtual void notifySyncRequired(const GraphicsLayer*) = 0;
virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) = 0;
- virtual void didCommitChangesForLayer(const GraphicsLayer*) const = 0;
+ virtual void didCommitChangesForLayer(const GraphicsLayer*) const { }
// Multiplier for backing store size, related to high DPI.
virtual float backingScaleFactor() const = 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
