Changeset 136207 in webkit

Timestamp:

Nov 29, 2012, 10:41:40 PM (14 years ago)

Author:

Martin Robinson

Message:

[GTK] [WebKit2] WebKitWebViewBase creates a GL context for the redirected XComposite window crashing WebKit in Xvfb
​https://bugs.webkit.org/show_bug.cgi?id=103476

Reviewed by Alejandro G. Castro.

Source/WebCore:

Allow creation of RedirectedXCompositeWindow in a mode which does not have a backing
GLContext. For WebKit2 the GLContext is always in the WebProcess. Creating the GLContext
in both processes can cause crashes when library is run in Xvfb.

No new tests. This fixes a crash running tests on some systems.

• platform/gtk/RedirectedXCompositeWindow.cpp:

(WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
(WebCore::RedirectedXCompositeWindow::resize): Do not create the GLContext when
in the new no-GLContext mode.
(WebCore::RedirectedXCompositeWindow::context): ASSERT that we are not in
no-GLContext mode.

Source/WebKit2:

Create the RedirectedXCompositeWindow with an argument specifying that it
should never have a GLContext backing it.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(_WebKitWebViewBasePrivate::_WebKitWebViewBasePrivate):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/RedirectedXCompositeWindow.cpp (modified) (3 diffs)
• WebCore/platform/gtk/RedirectedXCompositeWindow.h (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [WebKit2] WebKitWebViewBase creates a GL context for the redirected XComposite window crashing WebKit in Xvfb
+        https://bugs.webkit.org/show_bug.cgi?id=103476
+
+        Reviewed by Alejandro G. Castro.
+
+        Allow creation of RedirectedXCompositeWindow in a mode which does not have a backing
+        GLContext. For WebKit2 the GLContext is always in the WebProcess. Creating the GLContext
+        in both processes can cause crashes when library is run in Xvfb.
+
+        No new tests. This fixes a crash running tests on some systems.
+
+        * platform/gtk/RedirectedXCompositeWindow.cpp:
+        (WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
+        (WebCore::RedirectedXCompositeWindow::resize): Do not create the GLContext when
+        in the new no-GLContext mode.
+        (WebCore::RedirectedXCompositeWindow::context): ASSERT that we are not in
+        no-GLContext mode.
+
 2012-11-29  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp

@@ -93 +93 @@
 }
 
-PassOwnPtr<RedirectedXCompositeWindow> RedirectedXCompositeWindow::create(const IntSize& size)
-{
-    return supportsXDamageAndXComposite() ? adoptPtr(new RedirectedXCompositeWindow(size)) : nullptr;
-}
-
-RedirectedXCompositeWindow::RedirectedXCompositeWindow(const IntSize& size)
+PassOwnPtr<RedirectedXCompositeWindow> RedirectedXCompositeWindow::create(const IntSize& size, GLContextNeeded needsContext)
+{
+    return supportsXDamageAndXComposite() ? adoptPtr(new RedirectedXCompositeWindow(size, needsContext)) : nullptr;
+}
+
+RedirectedXCompositeWindow::RedirectedXCompositeWindow(const IntSize& size, GLContextNeeded needsContext)
     : m_size(size)
     , m_window(0)
     , m_parentWindow(0)
     , m_pixmap(0)
+    , m_needsContext(needsContext)
     , m_surface(0)
     , m_needsNewPixmapAfterResize(false)
@@ -177 +178 @@
 
     XFlush(display);
-    context()->waitNative();
-
-    // This swap is based on code in Chromium. It tries to work-around a bug in the Intel drivers
-    // where a swap is necessary to ensure the front and back buffers are properly resized.
-    if (context() == GLContext::getCurrent())
-        context()->swapBuffers();
+
+    if (m_needsContext == CreateGLContext) {
+        context()->waitNative();
+        // This swap is based on code in Chromium. It tries to work-around a bug in the Intel drivers
+        // where a swap is necessary to ensure the front and back buffers are properly resized.
+        if (context() == GLContext::getCurrent())
+            context()->swapBuffers();
+    }
 
     m_size = size;
@@ -190 +193 @@
 GLContext* RedirectedXCompositeWindow::context()
 {
+    ASSERT(m_needsContext);
+
     if (m_context)
         return m_context.get();

trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h

@@ -43 +43 @@
 class RedirectedXCompositeWindow {
 public:
-    static PassOwnPtr<RedirectedXCompositeWindow> create(const IntSize&);
+    enum GLContextNeeded { CreateGLContext, DoNotCreateGLContext };
+    static PassOwnPtr<RedirectedXCompositeWindow> create(const IntSize&, GLContextNeeded = CreateGLContext);
     virtual ~RedirectedXCompositeWindow();
     const IntSize& size() { return m_size; }
@@ -60 +61 @@
 
 private:
-    RedirectedXCompositeWindow(const IntSize&);
+    RedirectedXCompositeWindow(const IntSize&, GLContextNeeded);
     void cleanupPixmapAndPixmapSurface();
 
@@ -67 +68 @@
     Window m_parentWindow;
     Pixmap m_pixmap;
+    GLContextNeeded m_needsContext;
     OwnPtr<GLContext> m_context;
     RefPtr<cairo_surface_t> m_surface;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [WebKit2] WebKitWebViewBase creates a GL context for the redirected XComposite window crashing WebKit in Xvfb
+        https://bugs.webkit.org/show_bug.cgi?id=103476
+
+        Reviewed by Alejandro G. Castro.
+
+        Create the RedirectedXCompositeWindow with an argument specifying that it
+        should never have a GLContext backing it.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (_WebKitWebViewBasePrivate::_WebKitWebViewBasePrivate):
+
 2012-11-29  Rafael Weinstein  <rafaelw@chromium.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -84 +84 @@
         : imContext(adoptGRef(gtk_im_multicontext_new()))
 #if USE(TEXTURE_MAPPER_GL)
-        , redirectedWindow(RedirectedXCompositeWindow::create(IntSize(1, 1)))
+        , redirectedWindow(RedirectedXCompositeWindow::create(IntSize(1, 1), RedirectedXCompositeWindow::DoNotCreateGLContext))
 #endif
     {