Index: gpu/command_buffer/service/gles2_cmd_decoder.h |
=================================================================== |
--- gpu/command_buffer/service/gles2_cmd_decoder.h (revision 43138) |
+++ gpu/command_buffer/service/gles2_cmd_decoder.h (working copy) |
@@ -23,7 +23,7 @@ |
namespace gpu { |
// Forward-declared instead of including x_utils.h, because including glx.h |
// causes havok. |
-class XWindowWrapper; |
+class GLXContextWrapper; |
namespace gles2 { |
@@ -50,11 +50,11 @@ |
} |
#if defined(OS_LINUX) |
- void set_window_wrapper(XWindowWrapper *window) { |
- window_ = window; |
+ void set_context_wrapper(GLXContextWrapper *context) { |
+ context_ = context; |
} |
- XWindowWrapper* window() const { |
- return window_; |
+ GLXContextWrapper* context() const { |
+ return context_; |
} |
#elif defined(OS_WIN) |
void set_hwnd(HWND hwnd) { |
@@ -108,7 +108,7 @@ |
bool debug_; |
#if defined(OS_LINUX) |
- XWindowWrapper *window_; |
+ GLXContextWrapper *context_; |
#elif defined(OS_WIN) |
// Handle to the GL device. |
HWND hwnd_; |