Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Side by Side Diff: content/renderer/pepper/pepper_platform_context_3d.cc

Issue 25666014: Remove the ENABLE_GPU #define and enable_gpu gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/pepper_platform_context_3d.h" 5 #include "content/renderer/pepper/pepper_platform_context_3d.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/common/gpu/client/context_provider_command_buffer.h" 8 #include "content/common/gpu/client/context_provider_command_buffer.h"
9 #include "content/common/gpu/client/gpu_channel_host.h" 9 #include "content/common/gpu/client/gpu_channel_host.h"
10 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 10 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
11 #include "content/renderer/render_thread_impl.h" 11 #include "content/renderer/render_thread_impl.h"
12 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 12 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
13 #include "gpu/command_buffer/client/gles2_implementation.h" 13 #include "gpu/command_buffer/client/gles2_implementation.h"
14 #include "ppapi/c/pp_graphics_3d.h" 14 #include "ppapi/c/pp_graphics_3d.h"
15 #include "ui/gl/gpu_preference.h" 15 #include "ui/gl/gpu_preference.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 #ifdef ENABLE_GPU
19
20 namespace content { 18 namespace content {
21 19
22 PlatformContext3D::PlatformContext3D() 20 PlatformContext3D::PlatformContext3D()
23 : has_alpha_(false), 21 : has_alpha_(false),
24 command_buffer_(NULL), 22 command_buffer_(NULL),
25 weak_ptr_factory_(this) { 23 weak_ptr_factory_(this) {
26 } 24 }
27 25
28 PlatformContext3D::~PlatformContext3D() { 26 PlatformContext3D::~PlatformContext3D() {
29 if (command_buffer_) { 27 if (command_buffer_) {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 161 }
164 162
165 void PlatformContext3D::OnConsoleMessage(const std::string& msg, int id) { 163 void PlatformContext3D::OnConsoleMessage(const std::string& msg, int id) {
166 DCHECK(command_buffer_); 164 DCHECK(command_buffer_);
167 165
168 if (!console_message_callback_.is_null()) 166 if (!console_message_callback_.is_null())
169 console_message_callback_.Run(msg, id); 167 console_message_callback_.Run(msg, id);
170 } 168 }
171 169
172 } // namespace content 170 } // namespace content
173
174 #endif // ENABLE_GPU
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_platform_context_3d.h ('k') | tools/gn/secondary/build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698