Title: [127465] trunk/Source/WebCore
- Revision
- 127465
- Author
- [email protected]
- Date
- 2012-09-04 06:34:10 -0700 (Tue, 04 Sep 2012)
Log Message
[Cairo] [TextureMapper] Assertion failure in TextureMapperGL
https://bugs.webkit.org/show_bug.cgi?id=95713
Patch by Martin Robinson <[email protected]> on 2012-09-04
Reviewed by Noam Rosenthal.
Fix an assertion failure by returning a valid context always for GraphicsContext3D::platformContext.
This is important because TextureMapperGL uses the platform context to perform hashing.
No new tests. This is covered by existing accelerated compositing tests.
* platform/graphics/cairo/GraphicsContext3DPrivate.cpp:
(WebCore::GraphicsContext3DPrivate::platformContext): Return the current GLContext
when getting the platform context for private GraphicsContext3DPrivates that render
to the currently active context.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (127464 => 127465)
--- trunk/Source/WebCore/ChangeLog 2012-09-04 13:32:29 UTC (rev 127464)
+++ trunk/Source/WebCore/ChangeLog 2012-09-04 13:34:10 UTC (rev 127465)
@@ -1,3 +1,20 @@
+2012-09-04 Martin Robinson <[email protected]>
+
+ [Cairo] [TextureMapper] Assertion failure in TextureMapperGL
+ https://bugs.webkit.org/show_bug.cgi?id=95713
+
+ Reviewed by Noam Rosenthal.
+
+ Fix an assertion failure by returning a valid context always for GraphicsContext3D::platformContext.
+ This is important because TextureMapperGL uses the platform context to perform hashing.
+
+ No new tests. This is covered by existing accelerated compositing tests.
+
+ * platform/graphics/cairo/GraphicsContext3DPrivate.cpp:
+ (WebCore::GraphicsContext3DPrivate::platformContext): Return the current GLContext
+ when getting the platform context for private GraphicsContext3DPrivates that render
+ to the currently active context.
+
2012-09-04 Alexander Shalamov <[email protected]>
[EFL] Check if ecore_x is initialised before calling ecore_x_bell to avoid crash
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp (127464 => 127465)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp 2012-09-04 13:32:29 UTC (rev 127464)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp 2012-09-04 13:34:10 UTC (rev 127465)
@@ -68,7 +68,7 @@
PlatformGraphicsContext3D GraphicsContext3DPrivate::platformContext()
{
- return m_glContext ? m_glContext->platformContext() : 0;
+ return m_glContext ? m_glContext->platformContext() : GLContext::getCurrent()->platformContext();
}
#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
