Title: [137020] trunk/Source/WebCore
- Revision
- 137020
- Author
- [email protected]
- Date
- 2012-12-08 00:36:58 -0800 (Sat, 08 Dec 2012)
Log Message
Assertion failed at WebCore::RedirectedXCompositeWindow::context()
https://bugs.webkit.org/show_bug.cgi?id=104349
Patch by ChangSeok Oh <[email protected]> on 2012-12-08
Reviewed by Martin Robinson.
We should return GLContext if m_needsContext is CreateGLContext. By the way
CreateGLContext is a enum value and its default value is 0. So checking
ASSERT(m_needsContext) causes a crash on debug build.
ASSERT(m_needsContext == CreateGLContext) is better here.
No new tests since we can verify this with already existing AC tests.
* platform/gtk/RedirectedXCompositeWindow.cpp:
(WebCore::RedirectedXCompositeWindow::context):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137019 => 137020)
--- trunk/Source/WebCore/ChangeLog 2012-12-08 06:51:30 UTC (rev 137019)
+++ trunk/Source/WebCore/ChangeLog 2012-12-08 08:36:58 UTC (rev 137020)
@@ -1,3 +1,20 @@
+2012-12-08 ChangSeok Oh <[email protected]>
+
+ Assertion failed at WebCore::RedirectedXCompositeWindow::context()
+ https://bugs.webkit.org/show_bug.cgi?id=104349
+
+ Reviewed by Martin Robinson.
+
+ We should return GLContext if m_needsContext is CreateGLContext. By the way
+ CreateGLContext is a enum value and its default value is 0. So checking
+ ASSERT(m_needsContext) causes a crash on debug build.
+ ASSERT(m_needsContext == CreateGLContext) is better here.
+
+ No new tests since we can verify this with already existing AC tests.
+
+ * platform/gtk/RedirectedXCompositeWindow.cpp:
+ (WebCore::RedirectedXCompositeWindow::context):
+
2012-12-07 Rik Cabanier <[email protected]>
Extend platform layer so it can pass blend modes to the compositing calls
Modified: trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp (137019 => 137020)
--- trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp 2012-12-08 06:51:30 UTC (rev 137019)
+++ trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp 2012-12-08 08:36:58 UTC (rev 137020)
@@ -192,7 +192,7 @@
GLContext* RedirectedXCompositeWindow::context()
{
- ASSERT(m_needsContext);
+ ASSERT(m_needsContext == CreateGLContext);
if (m_context)
return m_context.get();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
