OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "cc/output/compositor_frame_sink_client.h" | 12 #include "cc/output/compositor_frame_sink_client.h" |
13 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h" | 13 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h" |
14 #include "gpu/command_buffer/common/mailbox.h" | 14 #include "gpu/command_buffer/common/mailbox.h" |
15 #include "gpu/ipc/common/surface_handle.h" | 15 #include "gpu/ipc/common/surface_handle.h" |
16 | 16 |
17 namespace aura { | 17 namespace aura { |
18 class Window; | 18 class Window; |
19 } | 19 } |
20 | 20 |
21 namespace gpu { | 21 namespace gpu { |
22 class GpuMemoryBufferManager; | 22 class GpuMemoryBufferManager; |
23 } | 23 } |
24 | 24 |
25 namespace ui { | 25 namespace ui { |
26 class WindowCompositorFrameSink; | 26 class ClientCompositorFrameSink; |
27 } | 27 } |
28 | 28 |
29 namespace content { | 29 namespace content { |
30 | 30 |
31 // Adapts a WebGraphicsContext3DCommandBufferImpl into a | 31 // Adapts a WebGraphicsContext3DCommandBufferImpl into a |
32 // cc::OutputSurface that also handles vsync parameter updates | 32 // cc::OutputSurface that also handles vsync parameter updates |
33 // arriving from the GPU process. | 33 // arriving from the GPU process. |
34 class MusBrowserCompositorOutputSurface | 34 class MusBrowserCompositorOutputSurface |
35 : public GpuBrowserCompositorOutputSurface, | 35 : public GpuBrowserCompositorOutputSurface, |
36 public cc::CompositorFrameSinkClient { | 36 public cc::CompositorFrameSinkClient { |
(...skipping 27 matching lines...) Expand all Loading... |
64 void SetExternalTilePriorityConstraints( | 64 void SetExternalTilePriorityConstraints( |
65 const gfx::Rect& viewport_rect, | 65 const gfx::Rect& viewport_rect, |
66 const gfx::Transform& transform) override; | 66 const gfx::Transform& transform) override; |
67 | 67 |
68 private: | 68 private: |
69 uint32_t AllocateResourceId(); | 69 uint32_t AllocateResourceId(); |
70 void FreeResourceId(uint32_t id); | 70 void FreeResourceId(uint32_t id); |
71 const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id); | 71 const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id); |
72 | 72 |
73 aura::Window* window_; | 73 aura::Window* window_; |
74 std::unique_ptr<ui::WindowCompositorFrameSink> compositor_frame_sink_; | 74 std::unique_ptr<ui::ClientCompositorFrameSink> compositor_frame_sink_; |
75 std::vector<uint32_t> free_resource_ids_; | 75 std::vector<uint32_t> free_resource_ids_; |
76 std::vector<gpu::Mailbox> mailboxes_; | 76 std::vector<gpu::Mailbox> mailboxes_; |
77 cc::BeginFrameSource* begin_frame_source_; | 77 cc::BeginFrameSource* begin_frame_source_; |
78 | 78 |
79 DISALLOW_COPY_AND_ASSIGN(MusBrowserCompositorOutputSurface); | 79 DISALLOW_COPY_AND_ASSIGN(MusBrowserCompositorOutputSurface); |
80 }; | 80 }; |
81 | 81 |
82 } // namespace content | 82 } // namespace content |
83 | 83 |
84 #endif // CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 84 #endif // CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |