Title: [90670] trunk/Source/WebCore
- Revision
- 90670
- Author
- [email protected]
- Date
- 2011-07-08 15:32:31 -0700 (Fri, 08 Jul 2011)
Log Message
Make GL context current before updating layer texture using skia-gpu
https://bugs.webkit.org/show_bug.cgi?id=64206
Patch by Brian Salomon <[email protected]> on 2011-07-08
Reviewed by James Robinson.
Covered by existing tests (when accelerated drawing and compositing are on).
* platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
(WebCore::LayerTextureUpdaterSkPicture::updateTextureRect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90669 => 90670)
--- trunk/Source/WebCore/ChangeLog 2011-07-08 22:25:28 UTC (rev 90669)
+++ trunk/Source/WebCore/ChangeLog 2011-07-08 22:32:31 UTC (rev 90670)
@@ -1,3 +1,15 @@
+2011-07-08 Brian Salomon <[email protected]>
+
+ Make GL context current before updating layer texture using skia-gpu
+ https://bugs.webkit.org/show_bug.cgi?id=64206
+
+ Reviewed by James Robinson.
+
+ Covered by existing tests (when accelerated drawing and compositing are on).
+
+ * platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
+ (WebCore::LayerTextureUpdaterSkPicture::updateTextureRect):
+
2011-07-08 Tony Chang <[email protected]>
Refactor override size to be a size rather than just an int
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp (90669 => 90670)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp 2011-07-08 22:25:28 UTC (rev 90669)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp 2011-07-08 22:32:31 UTC (rev 90670)
@@ -160,6 +160,9 @@
texture->framebufferTexture2D();
ASSERT(context()->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) == GraphicsContext3D::FRAMEBUFFER_COMPLETE);
+ // Make sure SKIA uses the correct GL context.
+ context()->makeContextCurrent();
+
// Notify SKIA to sync its internal GL state.
m_skiaContext->resetContext();
m_canvas->save();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
