Title: [137600] trunk/Source/WebCore
- Revision
- 137600
- Author
- zeno.albis...@digia.com
- Date
- 2012-12-13 09:10:49 -0800 (Thu, 13 Dec 2012)
Log Message
[Qt] Remove temporary workaround from GraphicsSurfaceGLX constructor.
https://bugs.webkit.org/show_bug.cgi?id=104904
QXcbNativeInterface::nativeResourceForContext() is now
available in Qt5. Therefore the temporary workaround
in GraphicsSurfaceGLX can be removed.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:
(WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137599 => 137600)
--- trunk/Source/WebCore/ChangeLog 2012-12-13 17:08:45 UTC (rev 137599)
+++ trunk/Source/WebCore/ChangeLog 2012-12-13 17:10:49 UTC (rev 137600)
@@ -1,3 +1,17 @@
+2012-12-13 Zeno Albisser <z...@webkit.org>
+
+ [Qt] Remove temporary workaround from GraphicsSurfaceGLX constructor.
+ https://bugs.webkit.org/show_bug.cgi?id=104904
+
+ QXcbNativeInterface::nativeResourceForContext() is now
+ available in Qt5. Therefore the temporary workaround
+ in GraphicsSurfaceGLX can be removed.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:
+ (WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
+
2012-12-13 Joanmarie Diggs <jdi...@igalia.com>
[GTK] Expose ARIA roles for tab, tabpanel and tablist
Modified: trunk/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp (137599 => 137600)
--- trunk/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp 2012-12-13 17:08:45 UTC (rev 137599)
+++ trunk/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp 2012-12-13 17:10:49 UTC (rev 137600)
@@ -155,23 +155,10 @@
#if PLATFORM(QT)
if (shareContext) {
-#if 0
- // This code path requires QXcbNativeInterface::nativeResourceForContext() which is not availble in Qt5 on the build bots yet.
QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
shareContextObject = static_cast<GLXContext>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("glxcontext"), shareContext));
if (!shareContextObject)
return;
-#else
- // This code path should be removed as soon as QXcbNativeInterface::nativeResourceForContext() can provide the GLXContext.
- QOpenGLContext* previousContext = QOpenGLContext::currentContext();
- QSurface* previousSurface = previousContext->surface();
- QSurface* currentSurface = shareContext->surface();
- shareContext->makeCurrent(currentSurface);
-
- shareContextObject = glXGetCurrentContext();
-
- previousContext->makeCurrent(previousSurface);
-#endif
}
#else
UNUSED_PARAM(shareContext);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
