| Index: third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp b/third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp
|
| index a180f8de557b0bad0c4120966ec8d4754e582e5b..cfe3ab2855608476d9a42f1eb179db60ff3112e3 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "platform/graphics/OffscreenCanvasFrameDispatcherImpl.h"
|
|
|
| +#include "cc/ipc/display_compositor.mojom-blink.h"
|
| #include "cc/output/compositor_frame.h"
|
| #include "cc/quads/texture_draw_quad.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| @@ -15,7 +16,8 @@
|
| #include "public/platform/InterfaceProvider.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebGraphicsContext3DProvider.h"
|
| -#include "public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom-blink.h"
|
| +//#include
|
| +//"public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom-blink.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "third_party/khronos/GLES2/gl2ext.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| @@ -48,12 +50,12 @@ OffscreenCanvasFrameDispatcherImpl::OffscreenCanvasFrameDispatcherImpl(
|
| // mojo channel for this special case.
|
| m_currentLocalSurfaceId = m_surfaceIdAllocator.GenerateId();
|
| DCHECK(!m_sink.is_bound());
|
| - mojom::blink::OffscreenCanvasCompositorFrameSinkProviderPtr provider;
|
| + cc::mojom::blink::DisplayCompositorPtr compositor;
|
| Platform::current()->interfaceProvider()->getInterface(
|
| - mojo::MakeRequest(&provider));
|
| - provider->CreateCompositorFrameSink(m_frameSinkId,
|
| - m_binding.CreateInterfacePtrAndBind(),
|
| - mojo::MakeRequest(&m_sink));
|
| + mojo::MakeRequest(&compositor));
|
| + compositor->CreateOffscreenCanvasCompositorFrameSink(
|
| + m_frameSinkId, mojo::MakeRequest(&m_sink),
|
| + m_binding.CreateInterfacePtrAndBind());
|
| }
|
| }
|
|
|
|
|