<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128315] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/128315">128315</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2012-09-12 08:36:45 -0700 (Wed, 12 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Qt] Segmentation fault when closing QtTestBrowser
https://bugs.webkit.org/show_bug.cgi?id=95003

Patch by Roland Takacs &lt;rtakacs@inf.u-szeged.hu&gt; 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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsqtGraphicsContext3DQtcpp">trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformqtQWebPageClienth">trunk/Source/WebCore/platform/qt/QWebPageClient.h</a></li>
<li><a href="#trunkSourceWebKitqtChangeLog">trunk/Source/WebKit/qt/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitqtWebCoreSupportPageClientQtcpp">trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp</a></li>
<li><a href="#trunkSourceWebKitqtWebCoreSupportPageClientQth">trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (128314 => 128315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-12 15:34:37 UTC (rev 128314)
+++ trunk/Source/WebCore/ChangeLog        2012-09-12 15:36:45 UTC (rev 128315)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2012-09-12  Roland Takacs  &lt;rtakacs@inf.u-szeged.hu&gt;
+
+        [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):
+
</ins><span class="cx"> 2012-09-12  Ryuan Choi  &lt;ryuan.choi@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL] Fix build break when netscape-plugin-api is enebled after r126971
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsqtGraphicsContext3DQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (128314 => 128315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp        2012-09-12 15:34:37 UTC (rev 128314)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp        2012-09-12 15:36:45 UTC (rev 128315)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx">     HostWindow* m_hostWindow;
</span><span class="cx">     PlatformGraphicsSurface3D m_surface;
</span><span class="cx">     PlatformGraphicsContext3D m_platformContext;
</span><ins>+    QObject* m_surfaceOwner;
</ins><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx">     GraphicsSurface::Flags m_surfaceFlags;
</span><span class="cx">     RefPtr&lt;GraphicsSurface&gt; m_graphicsSurface;
</span><span class="lines">@@ -111,11 +112,12 @@
</span><span class="cx">     , m_hostWindow(hostWindow)
</span><span class="cx">     , m_surface(0)
</span><span class="cx">     , m_platformContext(0)
</span><ins>+    , m_surfaceOwner(0)
</ins><span class="cx"> {
</span><span class="cx">     if (m_hostWindow &amp;&amp; m_hostWindow-&gt;platformPageClient()) {
</span><span class="cx">         // This is the WebKit1 code path.
</span><span class="cx">         QWebPageClient* webPageClient = m_hostWindow-&gt;platformPageClient();
</span><del>-        webPageClient-&gt;createPlatformGraphicsContext3D(&amp;m_platformContext, &amp;m_surface);
</del><ins>+        webPageClient-&gt;createPlatformGraphicsContext3D(&amp;m_platformContext, &amp;m_surface, &amp;m_surfaceOwner);
</ins><span class="cx">         if (!m_surface)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="lines">@@ -137,6 +139,7 @@
</span><span class="cx">     window-&gt;setGeometry(-10, -10, 1, 1);
</span><span class="cx">     window-&gt;create();
</span><span class="cx">     m_surface = window;
</span><ins>+    m_surfaceOwner = window;
</ins><span class="cx"> 
</span><span class="cx">     m_platformContext = new QOpenGLContext(window);
</span><span class="cx">     if (!m_platformContext-&gt;create())
</span><span class="lines">@@ -208,12 +211,8 @@
</span><span class="cx"> 
</span><span class="cx"> GraphicsContext3DPrivate::~GraphicsContext3DPrivate()
</span><span class="cx"> {
</span><del>-    if (m_hostWindow) {
-        delete m_surface;
-        m_surface = 0;
-        // Platform context is assumed to be owned by surface.
-        m_platformContext = 0;
-    }
</del><ins>+    delete m_surfaceOwner;
+    m_surfaceOwner = 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline quint32 swapBgrToRgb(quint32 pixel)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformqtQWebPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/qt/QWebPageClient.h (128314 => 128315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/qt/QWebPageClient.h        2012-09-12 15:34:37 UTC (rev 128314)
+++ trunk/Source/WebCore/platform/qt/QWebPageClient.h        2012-09-12 15:36:45 UTC (rev 128315)
</span><span class="lines">@@ -108,7 +108,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(3D_GRAPHICS)
</span><span class="cx">     virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
</span><del>-                                                 PlatformGraphicsSurface3D*) = 0;
</del><ins>+                                                 PlatformGraphicsSurface3D*,
+                                                 QObject** = 0) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">     virtual QWindow* ownerWindow() const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitqtChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/qt/ChangeLog (128314 => 128315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/qt/ChangeLog        2012-09-12 15:34:37 UTC (rev 128314)
+++ trunk/Source/WebKit/qt/ChangeLog        2012-09-12 15:36:45 UTC (rev 128315)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2012-09-12  Roland Takacs  &lt;rtakacs@inf.u-szeged.hu&gt;
+
+        [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):
+
</ins><span class="cx"> 2012-09-12  Andras Becsi  &lt;andras.becsi@nokia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Qt] Add module identifier directive to the qmldir files
</span></span></pre></div>
<a id="trunkSourceWebKitqtWebCoreSupportPageClientQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp (128314 => 128315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp        2012-09-12 15:34:37 UTC (rev 128314)
+++ trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp        2012-09-12 15:36:45 UTC (rev 128315)
</span><span class="lines">@@ -36,11 +36,13 @@
</span><span class="cx"> #include &lt;QWindow&gt;
</span><span class="cx"> 
</span><span class="cx"> static void createPlatformGraphicsContext3DFromWidget(QWidget* widget, PlatformGraphicsContext3D* context,
</span><del>-                                                      PlatformGraphicsSurface3D* surface)
</del><ins>+                                                      PlatformGraphicsSurface3D* surface, QObject** surfaceOwner)
</ins><span class="cx"> {
</span><span class="cx"> #ifdef QT_OPENGL_LIB
</span><span class="cx">     *context = 0;
</span><span class="cx">     *surface = 0;
</span><ins>+    if (surfaceOwner)
+        *surfaceOwner = 0;
</ins><span class="cx">     QAbstractScrollArea* scrollArea = qobject_cast&lt;QAbstractScrollArea*&gt;(widget);
</span><span class="cx">     if (!scrollArea)
</span><span class="cx">         return;
</span><span class="lines">@@ -52,6 +54,8 @@
</span><span class="cx">     if (glWidget-&gt;isValid()) {
</span><span class="cx">         // Geometry can be set to zero because m_glWidget is used only for its QGLContext.
</span><span class="cx">         glWidget-&gt;setGeometry(0, 0, 0, 0);
</span><ins>+        if (surfaceOwner)
+            *surfaceOwner = glWidget;
</ins><span class="cx">         *surface = glWidget-&gt;windowHandle();
</span><span class="cx">         *context = glWidget-&gt;context()-&gt;contextHandle();
</span><span class="cx">     } else {
</span><span class="lines">@@ -235,9 +239,10 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(3D_GRAPHICS)
</span><span class="cx"> void PageClientQWidget::createPlatformGraphicsContext3D(PlatformGraphicsContext3D* context,
</span><del>-                                                        PlatformGraphicsSurface3D* surface)
</del><ins>+                                                        PlatformGraphicsSurface3D* surface,
+                                                        QObject** surfaceOwner)
</ins><span class="cx"> {
</span><del>-    createPlatformGraphicsContext3DFromWidget(view, context, surface);
</del><ins>+    createPlatformGraphicsContext3DFromWidget(view, context, surface, surfaceOwner);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -424,9 +429,10 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(3D_GRAPHICS)
</span><span class="cx"> void PageClientQGraphicsWidget::createPlatformGraphicsContext3D(PlatformGraphicsContext3D* context,
</span><del>-                                                                PlatformGraphicsSurface3D* surface)
</del><ins>+                                                                PlatformGraphicsSurface3D* surface,
+                                                                QObject** surfaceOwner)
</ins><span class="cx"> {
</span><del>-    createPlatformGraphicsContext3DFromWidget(ownerWidget(), context, surface);
</del><ins>+    createPlatformGraphicsContext3DFromWidget(ownerWidget(), context, surface, surfaceOwner);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitqtWebCoreSupportPageClientQth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h (128314 => 128315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h        2012-09-12 15:34:37 UTC (rev 128314)
+++ trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h        2012-09-12 15:36:45 UTC (rev 128315)
</span><span class="lines">@@ -101,7 +101,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(3D_GRAPHICS)
</span><span class="cx">     virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
</span><del>-                                                 PlatformGraphicsSurface3D*);
</del><ins>+                                                 PlatformGraphicsSurface3D*,
+                                                 QObject**);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     QWidget* view;
</span><span class="lines">@@ -209,7 +210,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(3D_GRAPHICS)
</span><span class="cx">     virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
</span><del>-                                                 PlatformGraphicsSurface3D*);
</del><ins>+                                                 PlatformGraphicsSurface3D*,
+                                                 QObject**);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if USE(TILED_BACKING_STORE)
</span></span></pre>
</div>
</div>

</body>
</html>