Title: [135715] trunk/Source/WebCore
- Revision
- 135715
- Author
- [email protected]
- Date
- 2012-11-26 06:36:05 -0800 (Mon, 26 Nov 2012)
Log Message
[Qt][Win] buildfix after r135706.
https://bugs.webkit.org/show_bug.cgi?id=103249
The Windows implementation of GraphicsSurface cannot use
m_size anymore, as this member has been removed.
Further it needs to implement a platformSize() function.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp:
(WebCore::GraphicsSurfacePrivate::size):
(WebCore::GraphicsSurface::platformPaintToTextureMapper):
(WebCore::GraphicsSurface::platformSize):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135714 => 135715)
--- trunk/Source/WebCore/ChangeLog 2012-11-26 14:10:41 UTC (rev 135714)
+++ trunk/Source/WebCore/ChangeLog 2012-11-26 14:36:05 UTC (rev 135715)
@@ -1,3 +1,20 @@
+2012-11-26 Zeno Albisser <[email protected]>
+
+ [Qt][Win] buildfix after r135706.
+ https://bugs.webkit.org/show_bug.cgi?id=103249
+
+ The Windows implementation of GraphicsSurface cannot use
+ m_size anymore, as this member has been removed.
+ Further it needs to implement a platformSize() function.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp:
+ (WebCore::GraphicsSurfacePrivate::size):
+ (WebCore::GraphicsSurface::platformPaintToTextureMapper):
+ (WebCore::GraphicsSurface::platformSize):
+ (WebCore):
+
2012-11-26 Yury Semikhatsky <[email protected]>
Web Inspector: unify agents handling in Page and Worker inspector controllers
Modified: trunk/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp (135714 => 135715)
--- trunk/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp 2012-11-26 14:10:41 UTC (rev 135714)
+++ trunk/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp 2012-11-26 14:36:05 UTC (rev 135715)
@@ -246,6 +246,10 @@
m_eglFrontBufferSurface = 0;
}
+ IntSize size() const
+ {
+ return m_size;
+ }
protected:
void initializeShaderProgram()
@@ -422,8 +426,8 @@
GLuint frontBufferTexture = platformGetTextureID();
TransformationMatrix adjustedTransform = transform;
- adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_size), targetRect));
- static_cast<TextureMapperGL*>(textureMapper)->drawTexture(frontBufferTexture, 0, m_size, targetRect, adjustedTransform, opacity, mask);
+ adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_private->size()), targetRect));
+ static_cast<TextureMapperGL*>(textureMapper)->drawTexture(frontBufferTexture, 0, m_private->size(), targetRect, adjustedTransform, opacity, mask);
}
uint32_t GraphicsSurface::platformFrontBuffer() const
@@ -441,6 +445,11 @@
return platformFrontBuffer();
}
+IntSize GraphicsSurface::platformSize() const
+{
+ return m_private->size();
+}
+
PassRefPtr<GraphicsSurface> GraphicsSurface::platformCreate(const IntSize& size, Flags flags, const PlatformGraphicsContext3D shareContext)
{
// Single buffered GraphicsSurface is currently not supported.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
