Reland 107243 - Added GLSurfaceAdapter, an implementation of GLSurface that forwards all calls to another instance of GLSurface.

This is to allow new implementations of GLSurface that "derive" from different implementations selected at runtime. For example an ImageTransportSurface might derive from either GLSurfaceOSMesa or GLSurfaceGLX depending on the current GL backend in use. See http://codereview.chromium.org/8060045/.

Other yak shaving includes:
- Ensure no GLContext implementations do not assume that they can statically cast a GLSurface to a particular concrete type. E.g. GLContextGLX might actually be working together with a GLSurfaceAdapter derived class that delegates out to the actual GLSurfaceGLX. To that end, I made all the classes implement the likes of GetDisplay as virtuals rather than statics in the same way as we already did with GLSurfaceEGL.
- Add a Resize method to GLSurfaceEGL to allow resizing of a shared pbuffer surface.
- Add a method to get the D3D share handle for a PbufferGLSurfaceEGL
Review URL: http://codereview.chromium.org/8390011

TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/8395027
Review URL: http://codereview.chromium.org/8394060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107433 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 0 deletions

diff --git a/ui/gfx/gl/gl_context_glx.h b/ui/gfx/gl/gl_context_glx.h
index 3f8a535..f5cfa14 100644
--- a/ui/gfx/gl/gl_context_glx.h
+++ b/ui/gfx/gl/gl_context_glx.h
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "ui/base/x/x11_util.h"
 #include "ui/gfx/gl/gl_context.h"
 
 namespace gfx {
@@ -30,6 +31,7 @@ class GLContextGLX : public GLContext {
 
  private:
   void* context_;
+  Display* display_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContextGLX);
 };