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

Unified Diff: content/common/gpu/gpu_channel.cc

Issue 11227033: Move a bunch of code in content\common (as well as a few left in renderer) to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_channel.h ('k') | content/common/gpu/gpu_channel_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_channel.cc
===================================================================
--- content/common/gpu/gpu_channel.cc (revision 163290)
+++ content/common/gpu/gpu_channel.cc (working copy)
@@ -36,6 +36,7 @@
#include "content/common/gpu/stream_texture_manager_android.h"
#endif
+namespace content {
namespace {
// This filter does two things:
// - it counts the number of messages coming in on the channel
@@ -170,7 +171,7 @@
disallowed_features_.multisampling =
command_line->HasSwitch(switches::kDisableGLMultisampling);
#if defined(OS_ANDROID)
- stream_texture_manager_.reset(new content::StreamTextureManagerAndroid(this));
+ stream_texture_manager_.reset(new StreamTextureManagerAndroid(this));
#endif
}
@@ -571,7 +572,7 @@
}
void GpuChannel::OnEstablishStreamTexture(
- int32 stream_id, content::SurfaceTexturePeer::SurfaceTextureTarget type,
+ int32 stream_id, SurfaceTexturePeer::SurfaceTextureTarget type,
int32 primary_id, int32 secondary_id) {
stream_texture_manager_->EstablishStreamTexture(
stream_id, type, primary_id, secondary_id);
@@ -580,7 +581,7 @@
void GpuChannel::OnCollectRenderingStatsForSurface(
int32 surface_id, IPC::Message* reply_message) {
- content::GpuRenderingStats stats;
+ GpuRenderingStats stats;
for (StubMap::Iterator<GpuCommandBufferStub> it(&stubs_);
!it.IsAtEnd(); it.Advance()) {
@@ -607,3 +608,5 @@
stats);
Send(reply_message);
}
+
+} // namespace content
« no previous file with comments | « content/common/gpu/gpu_channel.h ('k') | content/common/gpu/gpu_channel_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698