| Index: content/browser/renderer_host/compositor_impl_android.cc
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
|
| index 82db867f9bf69b51d3423ac52e97361762a40ae6..5684852f9a64c734a9f48b1f31bb0b7bdf1e133b 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.cc
|
| +++ b/content/browser/renderer_host/compositor_impl_android.cc
|
| @@ -53,7 +53,6 @@
|
| #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/browser/android/compositor.h"
|
| #include "content/public/browser/android/compositor_client.h"
|
| @@ -61,6 +60,7 @@
|
| #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
|
| #include "gpu/command_buffer/client/context_support.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| +#include "gpu/ipc/common/gpu_process_launch_causes.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "third_party/khronos/GLES2/gl2ext.h"
|
| #include "third_party/skia/include/core/SkMallocPixelRef.h"
|
| @@ -472,7 +472,8 @@ void CompositorImpl::RequestNewOutputSurface() {
|
| BrowserGpuChannelHostFactory::instance();
|
| if (!factory->GetGpuChannel() || factory->GetGpuChannel()->IsLost()) {
|
| factory->EstablishGpuChannel(
|
| - CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE,
|
| + gpu::
|
| + CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE,
|
| base::Bind(&CompositorImpl::OnGpuChannelEstablished,
|
| weak_factory_.GetWeakPtr()));
|
| establish_gpu_channel_timeout_.Start(
|
|
|