Title: [135611] trunk/Source/WebCore
- Revision
- 135611
- Author
- zeno.albis...@digia.com
- Date
- 2012-11-23 07:34:56 -0800 (Fri, 23 Nov 2012)
Log Message
[Qt] GraphicsContext3DQt makes wrong surface current.
https://bugs.webkit.org/show_bug.cgi?id=103136
blitMultisampleFramebufferAndRestoreContext restores
the wrong surface in case the currentContext is the same
as m_platformContext.
In this case we would reset the bound surface to NULL.
Instead we should just leave the context unchanged.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/qt/GraphicsContext3DQt.cpp:
(WebCore::GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135610 => 135611)
--- trunk/Source/WebCore/ChangeLog 2012-11-23 15:32:46 UTC (rev 135610)
+++ trunk/Source/WebCore/ChangeLog 2012-11-23 15:34:56 UTC (rev 135611)
@@ -1,3 +1,19 @@
+2012-11-23 Zeno Albisser <z...@webkit.org>
+
+ [Qt] GraphicsContext3DQt makes wrong surface current.
+ https://bugs.webkit.org/show_bug.cgi?id=103136
+
+ blitMultisampleFramebufferAndRestoreContext restores
+ the wrong surface in case the currentContext is the same
+ as m_platformContext.
+ In this case we would reset the bound surface to NULL.
+ Instead we should just leave the context unchanged.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * platform/graphics/qt/GraphicsContext3DQt.cpp:
+ (WebCore::GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext):
+
2012-11-23 Alexei Filippov <a...@chromium.org>
Web Inspector: remove total item from NMI snapshot grid
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (135610 => 135611)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2012-11-23 15:32:46 UTC (rev 135610)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2012-11-23 15:34:56 UTC (rev 135611)
@@ -330,7 +330,7 @@
m_platformContext->makeCurrent(m_surface);
}
blitMultisampleFramebuffer();
- if (currentContext)
+ if (currentContext && currentContext != m_platformContext)
const_cast<QOpenGLContext*>(currentContext)->makeCurrent(currentSurface);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
