| Index: content/renderer/renderer_blink_platform_impl.cc
|
| diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
| index 2de292d848d739fdf503749f8688b0869fbddc17..673c7fea4ad93efa4f2b5d3fee8583d99330317a 100644
|
| --- a/content/renderer/renderer_blink_platform_impl.cc
|
| +++ b/content/renderer/renderer_blink_platform_impl.cc
|
| @@ -44,7 +44,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/mime_registry_messages.h"
|
| #include "content/common/render_process_messages.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -75,6 +74,7 @@
|
| #include "content/renderer/webgraphicscontext3d_provider_impl.h"
|
| #include "content/renderer/webpublicsuffixlist_impl.h"
|
| #include "gpu/config/gpu_info.h"
|
| +#include "gpu/ipc/common/gpu_process_launch_causes.h"
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "media/audio/audio_output_device.h"
|
| #include "media/base/audio_hardware_config.h"
|
| @@ -620,8 +620,8 @@ bool RendererBlinkPlatformImpl::databaseSetFileSize(
|
|
|
| bool RendererBlinkPlatformImpl::canAccelerate2dCanvas() {
|
| RenderThreadImpl* thread = RenderThreadImpl::current();
|
| - GpuChannelHost* host = thread->EstablishGpuChannelSync(
|
| - CAUSE_FOR_GPU_LAUNCH_CANVAS_2D);
|
| + GpuChannelHost* host =
|
| + thread->EstablishGpuChannelSync(gpu::CAUSE_FOR_GPU_LAUNCH_CANVAS_2D);
|
| if (!host)
|
| return false;
|
|
|
| @@ -1011,7 +1011,8 @@ RendererBlinkPlatformImpl::createOffscreenGraphicsContext3D(
|
|
|
| scoped_refptr<GpuChannelHost> gpu_channel_host(
|
| RenderThreadImpl::current()->EstablishGpuChannelSync(
|
| - CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
|
| + gpu::
|
| + CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
|
|
|
| WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits limits;
|
| bool lose_context_when_out_of_memory = false;
|
|
|