Changeset 116585 in webkit

Timestamp:

May 9, 2012 5:34:48 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Cairo] GLContextGLX releases the context with an uninitialized display
​https://bugs.webkit.org/show_bug.cgi?id=86039

Patch by Martin Robinson <​mrobinson@igalia.com> on 2012-05-09
Reviewed by Philippe Normand.

No new tests. This does not change behavior on most machines, but has
the potential to prevent a pretty nasty crash on others.

Use the shared display to release GLX contexts instead of the uninitialized
m_display member.

• platform/graphics/glx/GLContextGLX.cpp:

(WebCore::GLContextGLX::~GLContextGLX): Release the display with the shared
display.

• platform/graphics/glx/GLContextGLX.h:

(GLContextGLX): Remove the m_display member.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/glx/GLContextGLX.cpp (modified) (1 diff)
• platform/graphics/glx/GLContextGLX.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-09  Martin Robinson  <mrobinson@igalia.com>
+
+        [Cairo] GLContextGLX releases the context with an uninitialized display
+        https://bugs.webkit.org/show_bug.cgi?id=86039
+
+        Reviewed by Philippe Normand.
+
+        No new tests. This does not change behavior on most machines, but has
+        the potential to prevent a pretty nasty crash on others.
+
+        Use the shared display to release GLX contexts instead of the uninitialized
+        m_display member.
+
+        * platform/graphics/glx/GLContextGLX.cpp:
+        (WebCore::GLContextGLX::~GLContextGLX): Release the display with the shared
+        display.
+        * platform/graphics/glx/GLContextGLX.h:
+        (GLContextGLX): Remove the m_display member.
+
 2012-05-09  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp

@@ -241 +241 @@
         // from Mozilla's 3D canvas implementation at: http://bitbucket.org/ilmari/canvas3d/
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-        glXMakeCurrent(m_display, None, None);
-        glXDestroyContext(m_display, m_context);
+        glXMakeCurrent(sharedDisplay(), None, None);
+        glXDestroyContext(sharedDisplay(), m_context);
     }
 

trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h

@@ -64 +64 @@
 
     GLXContext m_context;
-    Display* m_display;
     XID m_window;
     GLXPbuffer m_pbuffer;