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

Unified Diff: content/renderer/pepper_platform_context_3d_impl.cc

Issue 9340012: Move gpu client files to content_common, in content/common/gpu/client (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded enums Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper_platform_context_3d_impl.h ('k') | content/renderer/pepper_plugin_delegate_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper_platform_context_3d_impl.cc
diff --git a/content/renderer/pepper_platform_context_3d_impl.cc b/content/renderer/pepper_platform_context_3d_impl.cc
index cba3c7b32e9cdbc807678b30918d823cecb507b0..0fa636492de6d2f933a303bda84089c3447fdf61 100644
--- a/content/renderer/pepper_platform_context_3d_impl.cc
+++ b/content/renderer/pepper_platform_context_3d_impl.cc
@@ -5,11 +5,11 @@
#include "content/renderer/pepper_platform_context_3d_impl.h"
#include "base/bind.h"
+#include "content/common/gpu/client/content_gl_context.h"
+#include "content/common/gpu/client/gpu_channel_host.h"
+#include "content/common/gpu/client/command_buffer_proxy.h"
#include "content/renderer/pepper_parent_context_provider.h"
#include "content/renderer/render_thread_impl.h"
-#include "content/renderer/gpu/renderer_gl_context.h"
-#include "content/renderer/gpu/gpu_channel_host.h"
-#include "content/renderer/gpu/command_buffer_proxy.h"
#include "googleurl/src/gurl.h"
#include "gpu/command_buffer/client/gles2_cmd_helper.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
@@ -89,13 +89,13 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list) {
// we do not need to filter for width and height here.
if (attrib_list) {
for (const int32_t* attr = attrib_list;
- attr[0] != RendererGLContext::NONE;
+ attr[0] != ContentGLContext::NONE;
attr += 2) {
switch (attr[0]) {
- case RendererGLContext::WIDTH:
+ case ContentGLContext::WIDTH:
surface_size.set_width(attr[1]);
break;
- case RendererGLContext::HEIGHT:
+ case ContentGLContext::HEIGHT:
surface_size.set_height(attr[1]);
break;
default:
@@ -104,7 +104,7 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list) {
break;
}
}
- attribs.push_back(RendererGLContext::NONE);
+ attribs.push_back(ContentGLContext::NONE);
}
command_buffer_ = channel_->CreateOffscreenCommandBuffer(
@@ -124,7 +124,7 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list) {
// Fetch the parent context now, after any potential shutdown of the
// channel due to GPU switching, and creation of the Pepper 3D
// context with the discrete GPU preference.
- RendererGLContext* parent_context =
+ ContentGLContext* parent_context =
parent_context_provider_->GetParentContextForPlatformContext3D();
if (!parent_context)
return false;
« no previous file with comments | « content/renderer/pepper_platform_context_3d_impl.h ('k') | content/renderer/pepper_plugin_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698