| Index: content/browser/compositor/mus_browser_compositor_output_surface.h
|
| diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.h b/content/browser/compositor/mus_browser_compositor_output_surface.h
|
| index c5ee24d3aca2e3d529db4a769a69d4475104df30..2ae3a4f16903dcdc3fa30ae64161bea13555f1dd 100644
|
| --- a/content/browser/compositor/mus_browser_compositor_output_surface.h
|
| +++ b/content/browser/compositor/mus_browser_compositor_output_surface.h
|
| @@ -16,13 +16,16 @@
|
|
|
| namespace aura {
|
| class Window;
|
| -class WindowCompositorFrameSink;
|
| }
|
|
|
| namespace gpu {
|
| class GpuMemoryBufferManager;
|
| }
|
|
|
| +namespace ui {
|
| +class WindowCompositorFrameSink;
|
| +}
|
| +
|
| namespace content {
|
|
|
| // Adapts a WebGraphicsContext3DCommandBufferImpl into a
|
| @@ -68,7 +71,7 @@ class MusBrowserCompositorOutputSurface
|
| const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id);
|
|
|
| aura::Window* window_;
|
| - std::unique_ptr<aura::WindowCompositorFrameSink> compositor_frame_sink_;
|
| + std::unique_ptr<ui::WindowCompositorFrameSink> compositor_frame_sink_;
|
| std::vector<uint32_t> free_resource_ids_;
|
| std::vector<gpu::Mailbox> mailboxes_;
|
| cc::BeginFrameSource* begin_frame_source_;
|
|
|