Title: [131206] trunk/Source/WebCore
- Revision
- 131206
- Author
- [email protected]
- Date
- 2012-10-12 12:00:51 -0700 (Fri, 12 Oct 2012)
Log Message
Update method signature for platformCALayerShowRepaintCounter in MediaPlayerPlayerPrivateAVFoundationCF's LayerClient class.
https://bugs.webkit.org/show_bug.cgi?id=99190
Reviewed by Simon Fraser.
LayerClient's base class (PlatformCALayerClient) method signature for abstract method platformCALayerShowRepaintCounter
was updated in http://trac.webkit.org/changeset/130676 so it needs to be changed in LayerClient as well.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::LayerClient::platformCALayerShowRepaintCounter):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131205 => 131206)
--- trunk/Source/WebCore/ChangeLog 2012-10-12 18:46:25 UTC (rev 131205)
+++ trunk/Source/WebCore/ChangeLog 2012-10-12 19:00:51 UTC (rev 131206)
@@ -1,3 +1,16 @@
+2012-10-12 Roger Fong <[email protected]>
+
+ Update method signature for platformCALayerShowRepaintCounter in MediaPlayerPlayerPrivateAVFoundationCF's LayerClient class.
+ https://bugs.webkit.org/show_bug.cgi?id=99190
+
+ Reviewed by Simon Fraser.
+
+ LayerClient's base class (PlatformCALayerClient) method signature for abstract method platformCALayerShowRepaintCounter
+ was updated in http://trac.webkit.org/changeset/130676 so it needs to be changed in LayerClient as well.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::LayerClient::platformCALayerShowRepaintCounter):
+
2012-10-12 Scott Graham <[email protected]>
Local disable of stack corruption warning when compiling on VS2012
@@ -4937,6 +4950,7 @@
* platform/graphics/skia/SimpleFontDataSkia.cpp:
(WebCore::SimpleFontData::canRenderCombiningCharacterSequence):
+>>>>>>> .r131205
2012-10-09 Enrica Casucci <[email protected]>
Only measure text once instead of twice when performing line layout.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (131205 => 131206)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2012-10-12 18:46:25 UTC (rev 131205)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2012-10-12 19:00:51 UTC (rev 131206)
@@ -156,7 +156,7 @@
virtual GraphicsLayer::CompositingCoordinatesOrientation platformCALayerContentsOrientation() const { return GraphicsLayer::CompositingCoordinatesBottomUp; }
virtual void platformCALayerPaintContents(GraphicsContext&, const IntRect& inClip) { }
virtual bool platformCALayerShowDebugBorders() const { return false; }
- virtual bool platformCALayerShowRepaintCounter() const { return false; }
+ virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const { return false; }
virtual int platformCALayerIncrementRepaintCount() { return 0; }
virtual bool platformCALayerContentsOpaque() const { return false; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
