Title: [92973] trunk/Source/WebCore
- Revision
- 92973
- Author
- [email protected]
- Date
- 2011-08-12 10:36:18 -0700 (Fri, 12 Aug 2011)
Log Message
[Qt][REGRESSION] composited content doesn't render since r92651
https://bugs.webkit.org/show_bug.cgi?id=66108
Reviewed by Benjamin Poulain.
Changed the signature for GraphicsLayerTextureMapper::syncCompositingState to match
the new signature in GraphicsLayer.h.
No new tests. This is a regression that's covered by existing pixel tests.
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::syncCompositingState):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92972 => 92973)
--- trunk/Source/WebCore/ChangeLog 2011-08-12 17:34:12 UTC (rev 92972)
+++ trunk/Source/WebCore/ChangeLog 2011-08-12 17:36:18 UTC (rev 92973)
@@ -1,3 +1,19 @@
+2011-08-12 No'am Rosenthal <[email protected]>
+
+ [Qt][REGRESSION] composited content doesn't render since r92651
+ https://bugs.webkit.org/show_bug.cgi?id=66108
+
+ Reviewed by Benjamin Poulain.
+
+ Changed the signature for GraphicsLayerTextureMapper::syncCompositingState to match
+ the new signature in GraphicsLayer.h.
+
+ No new tests. This is a regression that's covered by existing pixel tests.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::syncCompositingState):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+
2011-08-12 Alexandru Chiculita <[email protected]>
Original patch by Mihnea Ovidenie <[email protected]>.
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp (92972 => 92973)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp 2011-08-12 17:34:12 UTC (rev 92972)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp 2011-08-12 17:36:18 UTC (rev 92973)
@@ -1288,7 +1288,7 @@
/* \reimp (GraphicsLayer.h)
*/
-void GraphicsLayerQt::syncCompositingState()
+void GraphicsLayerQt::syncCompositingState(const FloatRect&)
{
m_impl->flushChanges();
GraphicsLayer::syncCompositingState();
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h (92972 => 92973)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h 2011-08-12 17:34:12 UTC (rev 92972)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h 2011-08-12 17:36:18 UTC (rev 92973)
@@ -80,7 +80,7 @@
virtual void setContentsOrientation(CompositingCoordinatesOrientation orientation);
virtual void distributeOpacity(float);
virtual float accumulatedOpacity() const;
- virtual void syncCompositingState();
+ virtual void syncCompositingState(const FloatRect&);
virtual void syncCompositingStateForThisLayerOnly();
private:
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (92972 => 92973)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2011-08-12 17:34:12 UTC (rev 92972)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2011-08-12 17:36:18 UTC (rev 92973)
@@ -337,7 +337,7 @@
/* \reimp (GraphicsLayer.h)
*/
-void GraphicsLayerTextureMapper::syncCompositingState()
+void GraphicsLayerTextureMapper::syncCompositingState(const FloatRect&)
{
m_node->syncCompositingState(this, TextureMapperNode::TraverseDescendants);
}
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (92972 => 92973)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2011-08-12 17:34:12 UTC (rev 92972)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2011-08-12 17:36:18 UTC (rev 92973)
@@ -74,7 +74,7 @@
virtual void setContentsToImage(Image*);
virtual void setContentsToMedia(PlatformLayer*);
virtual void setContentsToCanvas(PlatformLayer* canvas) { setContentsToMedia(canvas); }
- virtual void syncCompositingState();
+ virtual void syncCompositingState(const FloatRect&);
virtual void syncCompositingStateForThisLayerOnly();
virtual void setName(const String& name);
virtual PlatformLayer* platformLayer() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
