Title: [139642] trunk/Source/WebCore
- Revision
- 139642
- Author
- [email protected]
- Date
- 2013-01-14 12:35:36 -0800 (Mon, 14 Jan 2013)
Log Message
Use correct size for DrawingBuffer readback
https://bugs.webkit.org/show_bug.cgi?id=106744
Patch by John Bauman <[email protected]> on 2013-01-14
Reviewed by Kenneth Russell.
The value getInternalFramebufferSize is bogus if there's a
DrawingBuffer, so use size() instead.
* platform/graphics/chromium/DrawingBufferChromium.cpp:
(WebCore::DrawingBuffer::paintCompositedResultsToCanvas):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139641 => 139642)
--- trunk/Source/WebCore/ChangeLog 2013-01-14 20:25:26 UTC (rev 139641)
+++ trunk/Source/WebCore/ChangeLog 2013-01-14 20:35:36 UTC (rev 139642)
@@ -1,3 +1,16 @@
+2013-01-14 John Bauman <[email protected]>
+
+ Use correct size for DrawingBuffer readback
+ https://bugs.webkit.org/show_bug.cgi?id=106744
+
+ Reviewed by Kenneth Russell.
+
+ The value getInternalFramebufferSize is bogus if there's a
+ DrawingBuffer, so use size() instead.
+
+ * platform/graphics/chromium/DrawingBufferChromium.cpp:
+ (WebCore::DrawingBuffer::paintCompositedResultsToCanvas):
+
2013-01-14 Joshua Bell <[email protected]>
Bindings: Remove special cases for DOMString[]
Modified: trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (139641 => 139642)
--- trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2013-01-14 20:25:26 UTC (rev 139641)
+++ trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2013-01-14 20:35:36 UTC (rev 139642)
@@ -234,8 +234,6 @@
if (!m_context->makeContextCurrent() || m_context->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR)
return;
- IntSize framebufferSize = m_context->getInternalFramebufferSize();
-
// Since we're using the same context as WebGL, we have to restore any state we change (in this case, just the framebuffer binding).
// FIXME: The WebGLRenderingContext tracks the current framebuffer binding, it would be slightly more efficient to use this value
// rather than querying it off of the context.
@@ -247,7 +245,7 @@
m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, frontColorBuffer(), 0);
Extensions3DChromium* extensions = static_cast<Extensions3DChromium*>(m_context->getExtensions());
- extensions->paintFramebufferToCanvas(framebuffer, framebufferSize.width(), framebufferSize.height(), !m_context->getContextAttributes().premultipliedAlpha, imageBuffer);
+ extensions->paintFramebufferToCanvas(framebuffer, size().width(), size().height(), !m_context->getContextAttributes().premultipliedAlpha, imageBuffer);
m_context->deleteFramebuffer(framebuffer);
m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, previousFramebuffer);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
