core/qtwebkit/QGLWidget2.diff

28 lines
906 B
Diff
Raw Normal View History

--- a/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp
@@ -45,16 +45,19 @@
*surface = 0;
if (surfaceOwner)
*surfaceOwner = 0;
+
+ QGLWidget* glViewport = 0;
+
QAbstractScrollArea* scrollArea = qobject_cast<QAbstractScrollArea*>(widget);
- if (!scrollArea)
- return;
- QGLWidget* glViewport = qobject_cast<QGLWidget*>(scrollArea->viewport());
+ if (scrollArea)
+ glViewport = qobject_cast<QGLWidget*>(scrollArea->viewport());
+
QGLWidget* glWidget = 0;
if (glViewport)
- glWidget = new QGLWidget(0, glViewport);
+ glWidget = new QGLWidget(widget, glViewport);
else
- glWidget = new QGLWidget();
+ glWidget = new QGLWidget(widget);
if (glWidget->isValid()) {
// Geometry can be set to zero because m_glWidget is used only for its QGLContext.