Remove the ENABLE_GPU #define and enable_gpu gyp variable

It doesn't make any sense to configure chromium without a gpu and (unsurprisingly)
trying to set this variable to false just results in a broken build.

R=piman

Review URL: https://codereview.chromium.org/25666014

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

8 files changed, 1 insertions, 33 deletions

diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index 1876250..ddcd34e 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -617,8 +617,6 @@ void GpuChannel::CreateViewCommandBuffer(
 
   *route_id = MSG_ROUTING_NONE;
 
-#if defined(ENABLE_GPU)
-
   GpuCommandBufferStub* share_group = stubs_.Lookup(init_params.share_group_id);
 
   // Virtualize compositor contexts on OS X to prevent performance regressions
@@ -650,7 +648,6 @@ void GpuChannel::CreateViewCommandBuffer(
     stub->SetPreemptByFlag(preempted_flag_);
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
-#endif  // ENABLE_GPU
 }
 
 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) {
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index 23c27e0..b02fafb 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -244,10 +244,8 @@ class GpuChannel : public IPC::Listener,
   scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
 #endif
 
-#if defined(ENABLE_GPU)
   typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
   StubMap stubs_;
-#endif  // defined (ENABLE_GPU)
 
   typedef IDMap<GpuVideoEncodeAccelerator, IDMapOwnPointer> EncoderMap;
   EncoderMap video_encoders_;
diff --git a/content/common/gpu/gpu_memory_manager_client.cc b/content/common/gpu/gpu_memory_manager_client.cc
index fb3182c..26fc95c 100644
--- a/content/common/gpu/gpu_memory_manager_client.cc
+++ b/content/common/gpu/gpu_memory_manager_client.cc
@@ -4,8 +4,6 @@
 
 #include "content/common/gpu/gpu_memory_manager_client.h"
 
-#if defined(ENABLE_GPU)
-
 #include "content/common/gpu/gpu_memory_manager.h"
 
 namespace content {
@@ -47,5 +45,3 @@ void GpuMemoryManagerClientState::SetManagedMemoryStats(
 }
 
 }  // namespace content
-
-#endif
diff --git a/content/common/gpu/gpu_memory_manager_client.h b/content/common/gpu/gpu_memory_manager_client.h
index ca7c002..1579fb8 100644
--- a/content/common/gpu/gpu_memory_manager_client.h
+++ b/content/common/gpu/gpu_memory_manager_client.h
@@ -5,8 +5,6 @@
 #ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_CLIENT_H_
 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_CLIENT_H_
 
-#if defined(ENABLE_GPU)
-
 #include <list>
 
 #include "base/basictypes.h"
@@ -108,6 +106,4 @@ class CONTENT_EXPORT GpuMemoryManagerClientState {
 
 }  // namespace content
 
-#endif
-
 #endif  // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_CLIENT_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5412334..36beb54 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -404,6 +404,7 @@
     }, {  # OS!="ios"
       'dependencies': [
         '../cc/cc.gyp:cc',
+        '../gpu/gpu.gyp:command_buffer_service',
         '../gpu/gpu.gyp:gles2_c_lib',
         '../gpu/gpu.gyp:gles2_implementation',
         '../gpu/gpu.gyp:gpu_ipc',
@@ -484,11 +485,6 @@
         'common/sandbox_util.cc',
       ],
     }],
-    ['enable_gpu==1', {
-      'dependencies': [
-        '../gpu/gpu.gyp:command_buffer_service',
-      ],
-    }],
     ['OS=="android"', {
       'dependencies': [
         '../media/media.gyp:media',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 13bae57..b51c9ab 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -696,13 +696,6 @@
         'renderer/media/crypto/ppapi_decryptor.h',
       ],
     }],
-    ['enable_gpu!=1', {
-      'sources!': [
-        'renderer/pepper/ppb_graphics_3d_impl.cc',
-        'renderer/pepper/ppb_graphics_3d_impl.h',
-        'renderer/pepper/ppb_open_gl_es_impl.cc',
-      ],
-    }],
     ['use_openssl==1', {
       'sources!': [
         'renderer/webcrypto/webcrypto_impl_nss.cc',
diff --git a/content/renderer/pepper/pepper_platform_context_3d.cc b/content/renderer/pepper/pepper_platform_context_3d.cc
index 292478e..fab9c00 100644
--- a/content/renderer/pepper/pepper_platform_context_3d.cc
+++ b/content/renderer/pepper/pepper_platform_context_3d.cc
@@ -15,8 +15,6 @@
 #include "ui/gl/gpu_preference.h"
 #include "url/gurl.h"
 
-#ifdef ENABLE_GPU
-
 namespace content {
 
 PlatformContext3D::PlatformContext3D()
@@ -170,5 +168,3 @@ void PlatformContext3D::OnConsoleMessage(const std::string& msg, int id) {
 }
 
 }  // namespace content
-
-#endif  // ENABLE_GPU
diff --git a/content/renderer/pepper/pepper_platform_context_3d.h b/content/renderer/pepper/pepper_platform_context_3d.h
index c27334b..4170e18 100644
--- a/content/renderer/pepper/pepper_platform_context_3d.h
+++ b/content/renderer/pepper/pepper_platform_context_3d.h
@@ -12,8 +12,6 @@
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "gpu/command_buffer/common/mailbox.h"
 
-#ifdef ENABLE_GPU
-
 class CommandBufferProxy;
 namespace gpu {
 class CommandBuffer;
@@ -79,6 +77,4 @@ class PlatformContext3D {
 
 }  // namespace content
 
-#endif  // ENABLE_GPU
-
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_CONTEXT_3D_H_