diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/graphics/glx/GLContextGLX.h | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/graphics/glx/GLContextGLX.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/glx/GLContextGLX.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.h b/Source/WebCore/platform/graphics/glx/GLContextGLX.h index b3b18c156..00f56e791 100644 --- a/Source/WebCore/platform/graphics/glx/GLContextGLX.h +++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.h @@ -25,7 +25,6 @@ #include "GLContext.h" typedef struct __GLXcontextRec* GLXContext; -typedef struct _XDisplay Display; typedef struct __GLXcontextRec *GLXContext; typedef unsigned long GLXPbuffer; typedef unsigned long GLXPixmap; @@ -45,11 +44,10 @@ public: virtual ~GLContextGLX(); virtual bool makeContextCurrent(); virtual void swapBuffers(); + virtual void waitNative(); virtual bool canRenderToDefaultFramebuffer(); virtual IntSize defaultFrameBufferSize(); - static Display* sharedDisplay(); - #if USE(3D_GRAPHICS) virtual PlatformGraphicsContext3D platformContext(); #endif @@ -57,10 +55,6 @@ public: private: static PassOwnPtr<GLContextGLX> createPbufferContext(GLXContext sharingContext); static PassOwnPtr<GLContextGLX> createPixmapContext(GLXContext sharingContext); - static void removeActiveContext(GLContext*); - - static void addActiveContext(GLContextGLX*); - static void cleanupActiveContextsAtExit(); GLContextGLX(GLXContext); GLContextGLX(GLXContext, Pixmap, GLXPixmap); |