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

Unified Diff: content/browser/gpu/browser_gpu_channel_host_factory.cc

Issue 1823763003: Move more files to gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Android Build Created 4 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
Index: content/browser/gpu/browser_gpu_channel_host_factory.cc
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
index 471723b9f71d0d972c0113dae7a3dc4d3d309847..5307076296aa833c757e36849152007cfdf3b422 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -36,7 +36,7 @@ BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
class BrowserGpuChannelHostFactory::EstablishRequest
: public base::RefCountedThreadSafe<EstablishRequest> {
public:
- static scoped_refptr<EstablishRequest> Create(CauseForGpuLaunch cause,
+ static scoped_refptr<EstablishRequest> Create(gpu::CauseForGpuLaunch cause,
int gpu_client_id,
uint64_t gpu_client_tracing_id,
int gpu_host_id);
@@ -49,7 +49,7 @@ class BrowserGpuChannelHostFactory::EstablishRequest
private:
friend class base::RefCountedThreadSafe<EstablishRequest>;
- explicit EstablishRequest(CauseForGpuLaunch cause,
+ explicit EstablishRequest(gpu::CauseForGpuLaunch cause,
int gpu_client_id,
uint64_t gpu_client_tracing_id,
int gpu_host_id);
@@ -61,7 +61,7 @@ class BrowserGpuChannelHostFactory::EstablishRequest
void FinishOnMain();
base::WaitableEvent event_;
- CauseForGpuLaunch cause_for_gpu_launch_;
+ gpu::CauseForGpuLaunch cause_for_gpu_launch_;
const int gpu_client_id_;
const uint64_t gpu_client_tracing_id_;
int gpu_host_id_;
@@ -74,7 +74,7 @@ class BrowserGpuChannelHostFactory::EstablishRequest
scoped_refptr<BrowserGpuChannelHostFactory::EstablishRequest>
BrowserGpuChannelHostFactory::EstablishRequest::Create(
- CauseForGpuLaunch cause,
+ gpu::CauseForGpuLaunch cause,
int gpu_client_id,
uint64_t gpu_client_tracing_id,
int gpu_host_id) {
@@ -91,7 +91,7 @@ BrowserGpuChannelHostFactory::EstablishRequest::Create(
}
BrowserGpuChannelHostFactory::EstablishRequest::EstablishRequest(
- CauseForGpuLaunch cause,
+ gpu::CauseForGpuLaunch cause,
int gpu_client_id,
uint64_t gpu_client_tracing_id,
int gpu_host_id)
@@ -102,8 +102,7 @@ BrowserGpuChannelHostFactory::EstablishRequest::EstablishRequest(
gpu_host_id_(gpu_host_id),
reused_gpu_process_(false),
finished_(false),
- main_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
-}
+ main_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
void BrowserGpuChannelHostFactory::EstablishRequest::EstablishOnIO() {
// TODO(pkasting): Remove ScopedTracker below once crbug.com/477117 is fixed.
@@ -212,7 +211,7 @@ void BrowserGpuChannelHostFactory::Initialize(bool establish_gpu_channel) {
DCHECK(!instance_);
instance_ = new BrowserGpuChannelHostFactory();
if (establish_gpu_channel) {
- instance_->EstablishGpuChannel(CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP,
+ instance_->EstablishGpuChannel(gpu::CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP,
base::Closure());
}
}
@@ -281,7 +280,7 @@ BrowserGpuChannelHostFactory::AllocateSharedMemory(size_t size) {
// task on the UI thread first, so we cannot block here.)
#if !defined(OS_ANDROID)
GpuChannelHost* BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
- CauseForGpuLaunch cause_for_gpu_launch) {
+ gpu::CauseForGpuLaunch cause_for_gpu_launch) {
EstablishGpuChannel(cause_for_gpu_launch, base::Closure());
if (pending_request_.get())
@@ -292,7 +291,7 @@ GpuChannelHost* BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
#endif
void BrowserGpuChannelHostFactory::EstablishGpuChannel(
- CauseForGpuLaunch cause_for_gpu_launch,
+ gpu::CauseForGpuLaunch cause_for_gpu_launch,
const base::Closure& callback) {
if (gpu_channel_.get() && gpu_channel_->IsLost()) {
DCHECK(!pending_request_.get());

Powered by Google App Engine
This is Rietveld 408576698