diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 06:54:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 06:54:06 +0000 |
| commit | 638235b0ef2c3e12f6ceecf05f89caf46b311d81 (patch) | |
| tree | b676ad477a68bad89cd6a35dff9d4e791cef5692 /chrome/gpu/gpu_thread.h | |
| parent | 48c27f7fac6bb5cf9cc995df8a68d4f6d4c10600 (diff) | |
| download | chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.zip chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.tar.gz chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.tar.bz2 | |
Fix the ARM build which can't find OpenGL. This adds a new define which I use
to detect X and GL related build options. On ARM, this means we don't compile
the accelerated backing store even though its Linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/546144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu/gpu_thread.h')
| -rw-r--r-- | chrome/gpu/gpu_thread.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/gpu/gpu_thread.h b/chrome/gpu/gpu_thread.h index 8e8300d8..f58db07 100644 --- a/chrome/gpu/gpu_thread.h +++ b/chrome/gpu/gpu_thread.h @@ -11,9 +11,10 @@ #include "build/build_config.h" #include "chrome/common/child_thread.h" #include "chrome/common/gpu_native_window_handle.h" +#include "chrome/gpu/gpu_config.h" #include "chrome/gpu/x_util.h" -#if defined(OS_LINUX) +#if defined(GPU_USE_GLX) class GpuBackingStoreGLXContext; #endif @@ -22,7 +23,7 @@ class GpuThread : public ChildThread { GpuThread(); ~GpuThread(); -#if defined(OS_LINUX) +#if defined(GPU_USE_GLX) GpuBackingStoreGLXContext* GetGLXContext(); Display* display() const { return display_; } @@ -36,7 +37,7 @@ class GpuThread : public ChildThread { void OnNewRenderWidgetHostView(GpuNativeWindowHandle parent_window, int32 routing_id); -#if defined(OS_LINUX) +#if defined(GPU_USE_GLX) Display* display_; scoped_ptr<GpuBackingStoreGLXContext> glx_context_; #endif |