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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 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
« no previous file with comments | « content/plugin/webplugin_proxy.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_impl.h" 5 #include "content/renderer/pepper/pepper_platform_context_3d_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/common/gpu/client/gpu_channel_host.h" 8 #include "content/common/gpu/client/gpu_channel_host.h"
9 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 9 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
10 #include "content/renderer/pepper/pepper_parent_context_provider.h" 10 #include "content/renderer/pepper/pepper_parent_context_provider.h"
11 #include "content/renderer/render_thread_impl.h" 11 #include "content/renderer/render_thread_impl.h"
12 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
13 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 13 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
14 #include "gpu/command_buffer/client/gles2_implementation.h" 14 #include "gpu/command_buffer/client/gles2_implementation.h"
15 #include "gpu/ipc/command_buffer_proxy.h" 15 #include "gpu/ipc/command_buffer_proxy.h"
16 #include "ppapi/c/pp_graphics_3d.h" 16 #include "ppapi/c/pp_graphics_3d.h"
17 #include "ui/gfx/gl/gpu_preference.h" 17 #include "ui/gl/gpu_preference.h"
18 18
19 #ifdef ENABLE_GPU 19 #ifdef ENABLE_GPU
20 20
21 namespace content { 21 namespace content {
22 22
23 PlatformContext3DImpl::PlatformContext3DImpl( 23 PlatformContext3DImpl::PlatformContext3DImpl(
24 PepperParentContextProvider* parent_context_provider) 24 PepperParentContextProvider* parent_context_provider)
25 : parent_context_provider_(parent_context_provider), 25 : parent_context_provider_(parent_context_provider),
26 parent_texture_id_(0), 26 parent_texture_id_(0),
27 has_alpha_(false), 27 has_alpha_(false),
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 void PlatformContext3DImpl::OnConsoleMessage(const std::string& msg, int id) { 199 void PlatformContext3DImpl::OnConsoleMessage(const std::string& msg, int id) {
200 DCHECK(command_buffer_); 200 DCHECK(command_buffer_);
201 201
202 if (!console_message_callback_.is_null()) 202 if (!console_message_callback_.is_null())
203 console_message_callback_.Run(msg, id); 203 console_message_callback_.Run(msg, id);
204 } 204 }
205 205
206 } // namespace content 206 } // namespace content
207 207
208 #endif // ENABLE_GPU 208 #endif // ENABLE_GPU
OLDNEW
« no previous file with comments | « content/plugin/webplugin_proxy.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698