[webkit-changes] [132671] trunk/Source/WebCore

Fri, 26 Oct 2012 10:17:52 -0700

Title: [132671] trunk/Source/WebCore
Revision
132671
Author
[email protected]
Date
2012-10-26 10:19:10 -0700 (Fri, 26 Oct 2012)

Log Message

[Qt] MiniBrowser segfaults on exit after using WebGL.
https://bugs.webkit.org/show_bug.cgi?id=100523

The display connection must not be closed before
destroying the offscreen window.
Therefore opening the connection is moved to the
getXWindow() function. And closing the connection
is being moved to the destructor of the offscreen window.

Reviewed by Kenneth Rohde Christiansen.

* platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp:
(WebCore::OffScreenRootWindow::OffScreenRootWindow):
(WebCore::OffScreenRootWindow::getXWindow):
(OffScreenRootWindow):
(WebCore::OffScreenRootWindow::display):
(WebCore::OffScreenRootWindow::~OffScreenRootWindow):
(WebCore):
(WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::~GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::createSurface):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (132670 => 132671)


--- trunk/Source/WebCore/ChangeLog	2012-10-26 16:31:33 UTC (rev 132670)
+++ trunk/Source/WebCore/ChangeLog	2012-10-26 17:19:10 UTC (rev 132671)
@@ -1,3 +1,28 @@
+2012-10-26  Zeno Albisser  <[email protected]>
+
+        [Qt] MiniBrowser segfaults on exit after using WebGL.
+        https://bugs.webkit.org/show_bug.cgi?id=100523
+
+        The display connection must not be closed before
+        destroying the offscreen window.
+        Therefore opening the connection is moved to the
+        getXWindow() function. And closing the connection
+        is being moved to the destructor of the offscreen window.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+
+        * platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp:
+        (WebCore::OffScreenRootWindow::OffScreenRootWindow):
+        (WebCore::OffScreenRootWindow::getXWindow):
+        (OffScreenRootWindow):
+        (WebCore::OffScreenRootWindow::display):
+        (WebCore::OffScreenRootWindow::~OffScreenRootWindow):
+        (WebCore):
+        (WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
+        (WebCore::GraphicsSurfacePrivate::~GraphicsSurfacePrivate):
+        (WebCore::GraphicsSurfacePrivate::createSurface):
+
 2012-10-26  Parth Patel  <[email protected]>
 
         [BlackBerry] Extending existing ThreadUnsafe singletons in webkit to

Modified: trunk/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp (132670 => 132671)


--- trunk/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp	2012-10-26 16:31:33 UTC (rev 132670)
+++ trunk/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp	2012-10-26 17:19:10 UTC (rev 132671)
@@ -55,40 +55,51 @@
 public:
     OffScreenRootWindow()
     {
-        ++refCount;
+        ++m_refCount;
     }
 
-    Window* get(Display* dpy)
+    Window getXWindow()
     {
-        if (!window) {
-            window = XCreateSimpleWindow(dpy, XDefaultRootWindow(dpy), -1, -1, 1, 1, 0, BlackPixel(dpy, 0), WhitePixel(dpy, 0));
+        if (!m_window) {
+            Display* dpy = display();
+            m_window = XCreateSimpleWindow(dpy, XDefaultRootWindow(dpy), -1, -1, 1, 1, 0, BlackPixel(dpy, 0), WhitePixel(dpy, 0));
             XSetWindowAttributes attributes;
             attributes.override_redirect = true;
-            XChangeWindowAttributes(dpy, window, X11OverrideRedirect, &attributes);
-            display = dpy;
+            XChangeWindowAttributes(dpy, m_window, X11OverrideRedirect, &attributes);
             // Map window to the screen
-            XMapWindow(dpy, window);
+            XMapWindow(dpy, m_window);
         }
 
-        return &window;
+        return m_window;
     }
 
+    Display* display()
+    {
+        if (!m_display)
+            m_display = XOpenDisplay(0);
+        return m_display;
+    }
+
     ~OffScreenRootWindow()
     {
-        if (!--refCount) {
-            XUnmapWindow(display, window);
-            XDestroyWindow(display, window);
+        if (!--m_refCount) {
+            XUnmapWindow(m_display, m_window);
+            XDestroyWindow(m_display, m_window);
+            if (m_display)
+                XCloseDisplay(m_display);
+            m_display = 0;
         }
     }
 
 private:
-    static int refCount;
-    static Window window;
-    Display* display;
+    static int m_refCount;
+    static Window m_window;
+    static Display* m_display;
 };
 
-int OffScreenRootWindow::refCount = 0;
-Window OffScreenRootWindow::window = 0;
+int OffScreenRootWindow::m_refCount = 0;
+Window OffScreenRootWindow::m_window = 0;
+Display* OffScreenRootWindow::m_display = 0;
 
 static const int glxSpec[] = {
     // The specification is a set key value pairs stored in a simple array.
@@ -143,6 +154,7 @@
         }
 #endif
 
+        m_display = m_offScreenWindow.display();
         int attributes[] = {
             GLX_LEVEL, 0,
             GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
@@ -170,9 +182,8 @@
             XFreePixmap(m_display, m_xPixmap);
         m_xPixmap = 0;
 
-        if (m_display)
-            XCloseDisplay(m_display);
-        m_display = 0;
+        if (m_glContext)
+            glXDestroyContext(m_display, m_glContext);
     }
 
     uint32_t createSurface(const IntSize& size)
@@ -181,12 +192,12 @@
         if (!visualInfo)
             return 0;
 
-        Colormap cmap = XCreateColormap(m_display, *m_offScreenWindow.get(m_display), visualInfo->visual, AllocNone);
+        Colormap cmap = XCreateColormap(m_display, m_offScreenWindow.getXWindow(), visualInfo->visual, AllocNone);
         XSetWindowAttributes a;
         a.background_pixel = WhitePixel(m_display, 0);
         a.border_pixel = BlackPixel(m_display, 0);
         a.colormap = cmap;
-        m_surface = XCreateWindow(m_display, *m_offScreenWindow.get(m_display), 0, 0, size.width(), size.height(),
+        m_surface = XCreateWindow(m_display, m_offScreenWindow.getXWindow(), 0, 0, size.width(), size.height(),
             0, visualInfo->depth, InputOutput, visualInfo->visual,
             CWBackPixel | CWBorderPixel | CWColormap, &a);
         XSetWindowBackgroundPixmap(m_display, m_surface, 0);

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to