| 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 SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ | 5 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ |
| 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ | 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include "cc/surfaces/display_client.h" | 8 #include "cc/surfaces/display_client.h" |
| 9 #include "cc/surfaces/surface.h" | 9 #include "cc/surfaces/surface.h" |
| 10 #include "cc/surfaces/surface_factory.h" | 10 #include "cc/surfaces/surface_factory.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 DisplayCompositor(scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 31 DisplayCompositor(scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 32 gfx::AcceleratedWidget widget, | 32 gfx::AcceleratedWidget widget, |
| 33 const scoped_refptr<GpuState>& gpu_state, | 33 const scoped_refptr<GpuState>& gpu_state, |
| 34 const scoped_refptr<SurfacesState>& surfaces_state); | 34 const scoped_refptr<SurfacesState>& surfaces_state); |
| 35 ~DisplayCompositor() override; | 35 ~DisplayCompositor() override; |
| 36 | 36 |
| 37 // DisplayCompositor embedders submit a CompositorFrame when content on the | 37 // DisplayCompositor embedders submit a CompositorFrame when content on the |
| 38 // display should be changed. A well-behaving embedder should only submit | 38 // display should be changed. A well-behaving embedder should only submit |
| 39 // a CompositorFrame once per BeginFrame tick. The callback is called the | 39 // a CompositorFrame once per BeginFrame tick. The callback is called the |
| 40 // first time this frame is used to draw, or if the frame is discarded. | 40 // first time this frame is used to draw, or if the frame is discarded. |
| 41 void SubmitCompositorFrame( | 41 void SubmitCompositorFrame(cc::CompositorFrame frame, |
| 42 cc::CompositorFrame frame, | 42 const base::Callback<void()>& callback); |
| 43 const base::Callback<void(cc::SurfaceDrawStatus)>& callback); | |
| 44 | 43 |
| 45 // TODO(fsamuel): This is used for surface hittesting and should not be | 44 // TODO(fsamuel): This is used for surface hittesting and should not be |
| 46 // exposed outside of DisplayCompositor. | 45 // exposed outside of DisplayCompositor. |
| 47 const cc::SurfaceId& surface_id() const { return surface_id_; } | 46 const cc::SurfaceId& surface_id() const { return surface_id_; } |
| 48 | 47 |
| 49 // This requests the display CompositorFrame be rendered and given to the | 48 // This requests the display CompositorFrame be rendered and given to the |
| 50 // callback within CopyOutputRequest. | 49 // callback within CopyOutputRequest. |
| 51 void RequestCopyOfOutput( | 50 void RequestCopyOfOutput( |
| 52 std::unique_ptr<cc::CopyOutputRequest> output_request); | 51 std::unique_ptr<cc::CopyOutputRequest> output_request); |
| 53 | 52 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 71 cc::SurfaceId surface_id_; | 70 cc::SurfaceId surface_id_; |
| 72 | 71 |
| 73 gfx::Size display_size_; | 72 gfx::Size display_size_; |
| 74 std::unique_ptr<cc::Display> display_; | 73 std::unique_ptr<cc::Display> display_; |
| 75 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); | 74 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); |
| 76 }; | 75 }; |
| 77 | 76 |
| 78 } // namespace ui | 77 } // namespace ui |
| 79 | 78 |
| 80 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ | 79 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ |
| OLD | NEW |