Title: [135651] trunk/Source/WebKit/qt
- Revision
- 135651
- Author
- [email protected]
- Date
- 2012-11-24 07:32:25 -0800 (Sat, 24 Nov 2012)
Log Message
Unreviewed, rolling out r135648 and r135649.
http://trac.webkit.org/changeset/135648
http://trac.webkit.org/changeset/135649
https://bugs.webkit.org/show_bug.cgi?id=103176
This change cannot be built with a qt-minimal configuration.
(Requested by zalbisser on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-11-24
* WebCoreSupport/PageClientQt.cpp:
(WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (135650 => 135651)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-24 15:11:55 UTC (rev 135650)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-24 15:32:25 UTC (rev 135651)
@@ -1,3 +1,16 @@
+2012-11-24 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r135648 and r135649.
+ http://trac.webkit.org/changeset/135648
+ http://trac.webkit.org/changeset/135649
+ https://bugs.webkit.org/show_bug.cgi?id=103176
+
+ This change cannot be built with a qt-minimal configuration.
+ (Requested by zalbisser on #webkit).
+
+ * WebCoreSupport/PageClientQt.cpp:
+ (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
+
2012-11-24 Zeno Albisser <[email protected]>
Unreviewed Qt build fix:
Modified: trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp (135650 => 135651)
--- trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp 2012-11-24 15:11:55 UTC (rev 135650)
+++ trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp 2012-11-24 15:32:25 UTC (rev 135651)
@@ -28,7 +28,7 @@
#include <QX11Info>
#endif
-#if USE(TEXTURE_MAPPER_GL)
+#ifdef QT_OPENGL_LIB
#include <QGLWidget>
#endif
@@ -284,14 +284,9 @@
TextureMapperLayerClient = adoptPtr(new TextureMapperLayerClientQt(page->mainFrame(), layer));
#if USE(TEXTURE_MAPPER_GL)
QGraphicsView* graphicsView = view->scene()->views()[0];
- if (graphicsView && graphicsView->viewport()) {
- QGLWidget* glWidget = qobject_cast<QGLWidget*>(graphicsView->viewport());
- if (glWidget) {
- // The GL context belonging to the QGLWidget viewport must be current when TextureMapper is being created.
- glWidget->makeCurrent();
- TextureMapperLayerClient->setTextureMapper(TextureMapper::create(TextureMapper::OpenGLMode));
- return;
- }
+ if (graphicsView && graphicsView->viewport() && graphicsView->viewport()->inherits("QGLWidget")) {
+ TextureMapperLayerClient->setTextureMapper(TextureMapper::create(TextureMapper::OpenGLMode));
+ return;
}
#endif
TextureMapperLayerClient->setTextureMapper(TextureMapper::create());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
