Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index a46a7edb2a42b765439f5b35c4a15a12e9239b67..981329883c61b7b76f20dbadc4376d3f6ed7f615 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -74,7 +74,6 @@ |
#include "content/common/frame_messages.h" |
#include "content/common/gpu/client/context_provider_command_buffer.h" |
#include "content/common/gpu/client/gpu_channel_host.h" |
-#include "content/common/gpu/gpu_process_launch_causes.h" |
#include "content/common/render_frame_setup.mojom.h" |
#include "content/common/render_process_messages.h" |
#include "content/common/resource_messages.h" |
@@ -129,6 +128,7 @@ |
#include "content/renderer/shared_worker/embedded_shared_worker_stub.h" |
#include "gin/public/debug.h" |
#include "gpu/GLES2/gl2extchromium.h" |
+#include "gpu/ipc/common/gpu_process_launch_causes.h" |
#include "ipc/ipc_channel_handle.h" |
#include "ipc/ipc_platform_file.h" |
#include "ipc/mojo/ipc_channel_mojo.h" |
@@ -1525,7 +1525,8 @@ RenderThreadImpl::CreateOffscreenContext3d() { |
bool lose_context_when_out_of_memory = true; |
scoped_refptr<GpuChannelHost> gpu_channel_host(EstablishGpuChannelSync( |
- CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)); |
+ gpu:: |
+ CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)); |
return make_scoped_ptr( |
WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( |
gpu_channel_host.get(), |
@@ -1576,7 +1577,7 @@ scoped_refptr<StreamTextureFactory> RenderThreadImpl::GetStreamTexureFactory() { |
return NULL; |
} |
scoped_refptr<GpuChannelHost> gpu_channel_host(EstablishGpuChannelSync( |
- CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE)); |
+ gpu::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE)); |
if (!gpu_channel_host.get()) { |
LOG(ERROR) << "Failed to establish GPU channel for media player"; |
stream_texture_factory_ = NULL; |
@@ -1844,7 +1845,7 @@ void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
} |
GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
- CauseForGpuLaunch cause_for_gpu_launch) { |
+ gpu::CauseForGpuLaunch cause_for_gpu_launch) { |
TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); |
if (gpu_channel_.get()) { |