OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
7 | 7 |
8 #include "cc/output/output_surface.h" | 8 #include "cc/output/output_surface.h" |
9 #include "cc/surfaces/surface_factory.h" | 9 #include "cc/surfaces/surface_factory.h" |
10 #include "cc/surfaces/surface_factory_client.h" | 10 #include "cc/surfaces/surface_factory_client.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 // This class is maps a compositor OutputSurface to the surface system's Display | 21 // This class is maps a compositor OutputSurface to the surface system's Display |
22 // concept, allowing a compositor client to submit frames for a native root | 22 // concept, allowing a compositor client to submit frames for a native root |
23 // window or physical display. | 23 // window or physical display. |
24 class SurfaceDisplayOutputSurface : public cc::OutputSurface, | 24 class SurfaceDisplayOutputSurface : public cc::OutputSurface, |
25 public cc::SurfaceFactoryClient { | 25 public cc::SurfaceFactoryClient { |
26 public: | 26 public: |
27 // The underlying cc::Display and cc::SurfaceManager must outlive this class. | 27 // The underlying cc::Display and cc::SurfaceManager must outlive this class. |
28 SurfaceDisplayOutputSurface( | 28 SurfaceDisplayOutputSurface( |
29 cc::SurfaceManager* surface_manager, | 29 cc::SurfaceManager* surface_manager, |
30 cc::SurfaceIdAllocator* allocator, | 30 cc::SurfaceIdAllocator* allocator, |
31 const scoped_refptr<cc::ContextProvider>& context_provider); | 31 const scoped_refptr<cc::ContextProvider>& context_provider, |
| 32 const scoped_refptr<cc::ContextProvider>& worker_context_provider); |
32 ~SurfaceDisplayOutputSurface() override; | 33 ~SurfaceDisplayOutputSurface() override; |
33 | 34 |
34 void set_display_client(OnscreenDisplayClient* display_client) { | 35 void set_display_client(OnscreenDisplayClient* display_client) { |
35 display_client_ = display_client; | 36 display_client_ = display_client; |
36 } | 37 } |
37 cc::SurfaceFactory* factory() { return &factory_; } | 38 cc::SurfaceFactory* factory() { return &factory_; } |
38 void ReceivedVSyncParameters(base::TimeTicks timebase, | 39 void ReceivedVSyncParameters(base::TimeTicks timebase, |
39 base::TimeDelta interval); | 40 base::TimeDelta interval); |
40 | 41 |
41 // cc::OutputSurface implementation. | 42 // cc::OutputSurface implementation. |
(...skipping 13 matching lines...) Expand all Loading... |
55 gfx::Size display_size_; | 56 gfx::Size display_size_; |
56 cc::SurfaceId surface_id_; | 57 cc::SurfaceId surface_id_; |
57 cc::SurfaceIdAllocator* allocator_; | 58 cc::SurfaceIdAllocator* allocator_; |
58 | 59 |
59 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); | 60 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); |
60 }; | 61 }; |
61 | 62 |
62 } // namespace content | 63 } // namespace content |
63 | 64 |
64 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 65 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
OLD | NEW |