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

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 6793054: Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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/gpu/gpu_child_thread.h ('k') | content/gpu/gpu_command_buffer_stub.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.cc
===================================================================
--- content/gpu/gpu_child_thread.cc (revision 80399)
+++ content/gpu/gpu_child_thread.cc (working copy)
@@ -13,8 +13,8 @@
#include "build/build_config.h"
#include "chrome/common/chrome_switches.h"
#include "content/common/child_process.h"
+#include "content/common/gpu/content_gpu_client.h"
#include "content/common/gpu_messages.h"
-#include "content/gpu/content_gpu_client.h"
#include "content/gpu/gpu_info_collector.h"
#include "content/gpu/gpu_watchdog_thread.h"
#include "ipc/ipc_channel_handle.h"
@@ -110,7 +110,8 @@
if (handled)
return true;
- return render_thread_.get() && render_thread_->OnMessageReceived(msg);
+ return gpu_channel_manager_.get() &&
+ gpu_channel_manager_->OnMessageReceived(msg);
}
void GpuChildThread::OnInitialize() {
@@ -187,7 +188,7 @@
// Defer creation of the render thread. This is to prevent it from handling
// IPC messages before the sandbox has been enabled and all other necessary
// initialization has succeeded.
- render_thread_.reset(new GpuRenderThread(
+ gpu_channel_manager_.reset(new GpuChannelManager(
this,
watchdog_thread_,
ChildProcess::current()->io_message_loop(),
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/gpu/gpu_command_buffer_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698