Changeset 128315 in webkit

Timestamp:

Sep 12, 2012 8:36:45 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Segmentation fault when closing QtTestBrowser
​https://bugs.webkit.org/show_bug.cgi?id=95003

Patch by Roland Takacs <​rtakacs@inf.u-szeged.hu> on 2012-09-12
Reviewed by Simon Hausmann.

Source/WebCore:

Defined a new QObject* variable.
If WebKit1 is used, it points to the QGLWidget that was
created in 'createPlatformGraphicsContext3DFromWidget'.
If WebKit2 is used, it points to the QWindow that was
created in GraphicsContext3DPrivate's constructor.
It is neccessary for deallocating them.

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):

• platform/qt/QWebPageClient.h:

(QWebPageClient):

Source/WebKit/qt:

Defined a new QObject* variable that points to the QGLWidget that was created
in 'createPlatformGraphicsContext3DFromWidget'.
It is neccessary for deallocating it.

• WebCoreSupport/PageClientQt.cpp:

(createPlatformGraphicsContext3DFromWidget):
(WebCore::PageClientQWidget::createPlatformGraphicsContext3D):
(WebCore::PageClientQGraphicsWidget::createPlatformGraphicsContext3D):

• WebCoreSupport/PageClientQt.h:

(PageClientQWidget):
(PageClientQGraphicsWidget):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (4 diffs)
• WebCore/platform/qt/QWebPageClient.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/PageClientQt.cpp (modified) (4 diffs)
• WebKit/qt/WebCoreSupport/PageClientQt.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-12  Roland Takacs  <rtakacs@inf.u-szeged.hu>
+
+        [Qt] Segmentation fault when closing QtTestBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=95003
+
+        Reviewed by Simon Hausmann.
+
+        Defined a new QObject* variable.
+        If WebKit1 is used, it points to the QGLWidget that was 
+        created in 'createPlatformGraphicsContext3DFromWidget'.
+        If WebKit2 is used, it points to the QWindow that was 
+        created in GraphicsContext3DPrivate's constructor.
+        It is neccessary for deallocating them.
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (GraphicsContext3DPrivate):
+        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
+        (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
+        * platform/qt/QWebPageClient.h:
+        (QWebPageClient):
+
 2012-09-12  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -85 +85 @@
     PlatformGraphicsSurface3D m_surface;
     PlatformGraphicsContext3D m_platformContext;
+    QObject* m_surfaceOwner;
 #if USE(GRAPHICS_SURFACE)
     GraphicsSurface::Flags m_surfaceFlags;
@@ -112 +113 @@
     , m_surface(0)
     , m_platformContext(0)
+    , m_surfaceOwner(0)
 {
     if (m_hostWindow && m_hostWindow->platformPageClient()) {
         // This is the WebKit1 code path.
         QWebPageClient* webPageClient = m_hostWindow->platformPageClient();
-        webPageClient->createPlatformGraphicsContext3D(&m_platformContext, &m_surface);
+        webPageClient->createPlatformGraphicsContext3D(&m_platformContext, &m_surface, &m_surfaceOwner);
         if (!m_surface)
             return;
@@ -138 +140 @@
     window->create();
     m_surface = window;
+    m_surfaceOwner = window;
 
     m_platformContext = new QOpenGLContext(window);
@@ -209 +212 @@
 GraphicsContext3DPrivate::~GraphicsContext3DPrivate()
 {
-    if (m_hostWindow) {
-        delete m_surface;
-        m_surface = 0;
-        // Platform context is assumed to be owned by surface.
-        m_platformContext = 0;
-    }
+    delete m_surfaceOwner;
+    m_surfaceOwner = 0;
 }
 

trunk/Source/WebCore/platform/qt/QWebPageClient.h

@@ -109 +109 @@
 #if USE(3D_GRAPHICS)
     virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
-                                                 PlatformGraphicsSurface3D*) = 0;
+                                                 PlatformGraphicsSurface3D*,
+                                                 QObject** = 0) = 0;
 #endif
     virtual QWindow* ownerWindow() const;

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-09-12  Roland Takacs  <rtakacs@inf.u-szeged.hu>
+
+        [Qt] Segmentation fault when closing QtTestBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=95003
+
+        Reviewed by Simon Hausmann.
+
+        Defined a new QObject* variable that points to the QGLWidget that was created
+        in 'createPlatformGraphicsContext3DFromWidget'.
+        It is neccessary for deallocating it.
+
+        * WebCoreSupport/PageClientQt.cpp:
+        (createPlatformGraphicsContext3DFromWidget):
+        (WebCore::PageClientQWidget::createPlatformGraphicsContext3D):
+        (WebCore::PageClientQGraphicsWidget::createPlatformGraphicsContext3D):
+        * WebCoreSupport/PageClientQt.h:
+        (PageClientQWidget):
+        (PageClientQGraphicsWidget):
+
 2012-09-12  Andras Becsi  <andras.becsi@nokia.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp

@@ -37 +37 @@
 
 static void createPlatformGraphicsContext3DFromWidget(QWidget* widget, PlatformGraphicsContext3D* context,
-                                                      PlatformGraphicsSurface3D* surface)
+                                                      PlatformGraphicsSurface3D* surface, QObject** surfaceOwner)
 {
 #ifdef QT_OPENGL_LIB
     *context = 0;
     *surface = 0;
+    if (surfaceOwner)
+        *surfaceOwner = 0;
     QAbstractScrollArea* scrollArea = qobject_cast<QAbstractScrollArea*>(widget);
     if (!scrollArea)
@@ -53 +55 @@
         // Geometry can be set to zero because m_glWidget is used only for its QGLContext.
         glWidget->setGeometry(0, 0, 0, 0);
+        if (surfaceOwner)
+            *surfaceOwner = glWidget;
         *surface = glWidget->windowHandle();
         *context = glWidget->context()->contextHandle();
@@ -236 +240 @@
 #if USE(3D_GRAPHICS)
 void PageClientQWidget::createPlatformGraphicsContext3D(PlatformGraphicsContext3D* context,
-                                                        PlatformGraphicsSurface3D* surface)
-{
-    createPlatformGraphicsContext3DFromWidget(view, context, surface);
+                                                        PlatformGraphicsSurface3D* surface,
+                                                        QObject** surfaceOwner)
+{
+    createPlatformGraphicsContext3DFromWidget(view, context, surface, surfaceOwner);
 }
 #endif
@@ -425 +430 @@
 #if USE(3D_GRAPHICS)
 void PageClientQGraphicsWidget::createPlatformGraphicsContext3D(PlatformGraphicsContext3D* context,
-                                                                PlatformGraphicsSurface3D* surface)
-{
-    createPlatformGraphicsContext3DFromWidget(ownerWidget(), context, surface);
+                                                                PlatformGraphicsSurface3D* surface,
+                                                                QObject** surfaceOwner)
+{
+    createPlatformGraphicsContext3DFromWidget(ownerWidget(), context, surface, surfaceOwner);
 }
 #endif

trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h

@@ -102 +102 @@
 #if USE(3D_GRAPHICS)
     virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
-                                                 PlatformGraphicsSurface3D*);
+                                                 PlatformGraphicsSurface3D*,
+                                                 QObject**);
 #endif
 
@@ -210 +211 @@
 #if USE(3D_GRAPHICS)
     virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
-                                                 PlatformGraphicsSurface3D*);
+                                                 PlatformGraphicsSurface3D*,
+                                                 QObject**);
 #endif