| Index: ui/gl/gl_surface_glx.h
|
| diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
|
| index 355b65d1c45e71a2b6ba1450cbaef9cbbad5b1a7..5e77759badae183b6702d734d17f70fc0f9d2ee6 100644
|
| --- a/ui/gl/gl_surface_glx.h
|
| +++ b/ui/gl/gl_surface_glx.h
|
| @@ -17,6 +17,8 @@
|
|
|
| namespace gfx {
|
|
|
| +class NativeViewXExposeEventForwarder;
|
| +
|
| // Base class for GLX surfaces.
|
| class GL_EXPORT GLSurfaceGLX : public GLSurface {
|
| public:
|
| @@ -69,6 +71,8 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
|
| NativeViewGLSurfaceGLX();
|
| virtual ~NativeViewGLSurfaceGLX();
|
|
|
| + // Window that is passed down from the browser process.
|
| + gfx::AcceleratedWidget parent_window_;
|
| gfx::AcceleratedWidget window_;
|
|
|
| private:
|
| @@ -76,6 +80,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
|
| gfx::Size size_;
|
|
|
| scoped_ptr<VSyncProvider> vsync_provider_;
|
| + scoped_ptr<NativeViewXExposeEventForwarder> event_forwarder_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX);
|
| };
|
|
|