Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / gl / gl_surface_glx.h

diff --git a/src/ui/gl/gl_surface_glx.h b/src/ui/gl/gl_surface_glx.h
index c41f4ef..8b199f7 100644 (file)
--- a/src/ui/gl/gl_surface_glx.h
+++ b/src/ui/gl/gl_surface_glx.h
@@ -60,7 +60,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual void* GetHandle() OVERRIDE;
-  virtual std::string GetExtensions() OVERRIDE;
+  virtual bool SupportsPostSubBuffer() OVERRIDE;
   virtual void* GetConfig() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual VSyncProvider* GetVSyncProvider() OVERRIDE;
@@ -76,34 +76,6 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
   // Window passed in at creation. Always valid.
   gfx::AcceleratedWidget parent_window_;
 
-#if defined(TOOLKIT_GTK)
-  // Some NVIDIA drivers don't allow deleting GLX windows separately from their
-  // parent X windows. Work around this by creating a child X window to the
-  // window passed in to the constructor, creating the GLX window against the
-  // child window, and then destroying the child window to destroy the GLX
-  // window.
-  // http://crbug.com/145600
-  void CreateChildWindow();
-  void DestroyChildWindow();
-
-  // Destroy the child window when both the front and back buffers are
-  // deallocated.
-  virtual bool SetBackbufferAllocation(bool allocated) OVERRIDE;
-  virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
-  void AdjustBufferAllocation();
-
-  // Child window which is used with GLX, and is discarded when it is
-  // backgrounded.
-  gfx::AcceleratedWidget child_window_;
-
-  // Dummy 1x1 window which is supplied to glXMakeCurrent when making
-  // the context current while its output surface is destroyed.
-  gfx::AcceleratedWidget dummy_window_;
-
-  bool backbuffer_allocated_;
-  bool frontbuffer_allocated_;
-#endif
-
   void* config_;
   gfx::Size size_;