| Index: content/browser/compositor/gpu_process_transport_factory.cc
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
|
| index 7d4769ac53f5bc4b274fd3a8cfd942147ba44a41..ca66319446eadaf6ba08d1b44a6c3bed9672d2d8 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -42,12 +42,12 @@
|
| #include "content/common/gpu/client/context_provider_command_buffer.h"
|
| #include "content/common/gpu/client/gpu_channel_host.h"
|
| #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
|
| -#include "content/common/gpu/gpu_process_launch_causes.h"
|
| #include "content/common/host_shared_bitmap_manager.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "gpu/GLES2/gl2extchromium.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| +#include "gpu/ipc/common/gpu_process_launch_causes.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/compositor_constants.h"
|
| @@ -121,7 +121,7 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
|
|
|
| scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
|
| GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
|
| - CauseForGpuLaunch cause =
|
| + gpu::CauseForGpuLaunch cause = gpu::
|
| CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
|
| scoped_refptr<GpuChannelHost> gpu_channel_host(
|
| BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause));
|
| @@ -226,7 +226,7 @@ void GpuProcessTransportFactory::CreateOutputSurface(
|
| bool create_gpu_output_surface =
|
| ShouldCreateGpuOutputSurface(compositor.get());
|
| if (create_gpu_output_surface) {
|
| - CauseForGpuLaunch cause =
|
| + gpu::CauseForGpuLaunch cause = gpu::
|
| CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
|
| BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
|
| cause, base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
|
| @@ -313,7 +313,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
|
|
|
| if (!created_gpu_browser_compositor) {
|
| // Try again.
|
| - CauseForGpuLaunch cause =
|
| + gpu::CauseForGpuLaunch cause = gpu::
|
| CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
|
| BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
|
| cause, base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
|
|
|