| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ | 5 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ |
| 6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ | 6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "ipc/ipc_message.h" | 23 #include "ipc/ipc_message.h" |
| 24 #include "ui/gfx/transform.h" | 24 #include "ui/gfx/transform.h" |
| 25 | 25 |
| 26 class SkCanvas; | 26 class SkCanvas; |
| 27 | 27 |
| 28 namespace cc { | 28 namespace cc { |
| 29 class BeginFrameSource; | 29 class BeginFrameSource; |
| 30 class CompositorFrameSinkSupport; | 30 class CompositorFrameSinkSupport; |
| 31 class ContextProvider; | 31 class ContextProvider; |
| 32 class Display; | 32 class Display; |
| 33 class SurfaceIdAllocator; | 33 class LocalSurfaceIdAllocator; |
| 34 class SurfaceManager; | 34 class SurfaceManager; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace IPC { | 37 namespace IPC { |
| 38 class Message; | 38 class Message; |
| 39 class Sender; | 39 class Sender; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace content { | 42 namespace content { |
| 43 | 43 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 void DisplayOutputSurfaceLost() override {} | 144 void DisplayOutputSurfaceLost() override {} |
| 145 void DisplayWillDrawAndSwap( | 145 void DisplayWillDrawAndSwap( |
| 146 bool will_draw_and_swap, | 146 bool will_draw_and_swap, |
| 147 const cc::RenderPassList& render_passes) override {} | 147 const cc::RenderPassList& render_passes) override {} |
| 148 void DisplayDidDrawAndSwap() override {} | 148 void DisplayDidDrawAndSwap() override {} |
| 149 }; | 149 }; |
| 150 | 150 |
| 151 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface | 151 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface |
| 152 // is owned/destroyed on the compositor thread. | 152 // is owned/destroyed on the compositor thread. |
| 153 std::unique_ptr<cc::SurfaceManager> surface_manager_; | 153 std::unique_ptr<cc::SurfaceManager> surface_manager_; |
| 154 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; | 154 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_; |
| 155 cc::LocalSurfaceId child_local_surface_id_; | 155 cc::LocalSurfaceId child_local_surface_id_; |
| 156 cc::LocalSurfaceId root_local_surface_id_; | 156 cc::LocalSurfaceId root_local_surface_id_; |
| 157 // Uses surface_manager_. | 157 // Uses surface_manager_. |
| 158 std::unique_ptr<cc::CompositorFrameSinkSupport> root_support_; | 158 std::unique_ptr<cc::CompositorFrameSinkSupport> root_support_; |
| 159 // Uses surface_manager_. | 159 // Uses surface_manager_. |
| 160 std::unique_ptr<cc::CompositorFrameSinkSupport> child_support_; | 160 std::unique_ptr<cc::CompositorFrameSinkSupport> child_support_; |
| 161 StubDisplayClient display_client_; | 161 StubDisplayClient display_client_; |
| 162 // Uses surface_manager_. | 162 // Uses surface_manager_. |
| 163 std::unique_ptr<cc::Display> display_; | 163 std::unique_ptr<cc::Display> display_; |
| 164 // Owned by |display_|. | 164 // Owned by |display_|. |
| 165 SoftwareOutputSurface* software_output_surface_ = nullptr; | 165 SoftwareOutputSurface* software_output_surface_ = nullptr; |
| 166 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_; | 166 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_; |
| 167 | 167 |
| 168 gfx::Rect sw_viewport_for_current_draw_; | 168 gfx::Rect sw_viewport_for_current_draw_; |
| 169 | 169 |
| 170 base::ThreadChecker thread_checker_; | 170 base::ThreadChecker thread_checker_; |
| 171 | 171 |
| 172 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink); | 172 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink); |
| 173 }; | 173 }; |
| 174 | 174 |
| 175 } // namespace content | 175 } // namespace content |
| 176 | 176 |
| 177 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ | 177 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ |
| OLD | NEW |