OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 5 #ifndef COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
6 #define COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 6 #define COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "cc/surfaces/display_client.h" | 9 #include "cc/surfaces/display_client.h" |
10 #include "cc/surfaces/surface_factory.h" | 10 #include "cc/surfaces/surface_factory.h" |
11 #include "cc/surfaces/surface_factory_client.h" | 11 #include "cc/surfaces/surface_factory_client.h" |
12 #include "components/mus/gles2/gpu_state.h" | |
13 #include "components/mus/surfaces/surfaces_context_provider.h" | 12 #include "components/mus/surfaces/surfaces_context_provider.h" |
14 #include "components/mus/surfaces/surfaces_context_provider_delegate.h" | 13 #include "components/mus/surfaces/surfaces_context_provider_delegate.h" |
15 #include "components/mus/surfaces/surfaces_state.h" | 14 #include "components/mus/surfaces/surfaces_state.h" |
16 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" | 15 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" |
17 #include "ui/gfx/native_widget_types.h" | 16 #include "ui/gfx/native_widget_types.h" |
18 | 17 |
19 namespace cc { | 18 namespace cc { |
20 class Display; | 19 class Display; |
21 class SurfaceFactory; | 20 class SurfaceFactory; |
22 } | 21 } |
23 | 22 |
24 namespace mus { | 23 namespace gles2 { |
| 24 class GpuState; |
| 25 } |
| 26 |
| 27 namespace surfaces { |
25 | 28 |
26 class DisplayDelegate; | 29 class DisplayDelegate; |
27 class SurfacesScheduler; | 30 class SurfacesScheduler; |
28 class SurfacesState; | 31 class SurfacesState; |
29 | 32 |
30 // A TopLevelDisplayClient manages the top level surface that is rendered into a | 33 // A TopLevelDisplayClient manages the top level surface that is rendered into a |
31 // provided AcceleratedWidget. Frames are submitted here. New frames are | 34 // provided AcceleratedWidget. Frames are submitted here. New frames are |
32 // scheduled to be generated here based on VSync. | 35 // scheduled to be generated here based on VSync. |
33 class TopLevelDisplayClient : public cc::DisplayClient, | 36 class TopLevelDisplayClient : public cc::DisplayClient, |
34 public cc::SurfaceFactoryClient, | 37 public cc::SurfaceFactoryClient, |
35 public SurfacesContextProviderDelegate { | 38 public surfaces::SurfacesContextProviderDelegate { |
36 public: | 39 public: |
37 TopLevelDisplayClient(gfx::AcceleratedWidget widget, | 40 TopLevelDisplayClient(gfx::AcceleratedWidget widget, |
38 const scoped_refptr<GpuState>& gpu_state, | 41 const scoped_refptr<gles2::GpuState>& gpu_state, |
39 const scoped_refptr<SurfacesState>& surfaces_state); | 42 const scoped_refptr<SurfacesState>& surfaces_state); |
40 ~TopLevelDisplayClient() override; | 43 ~TopLevelDisplayClient() override; |
41 | 44 |
42 void SubmitCompositorFrame(scoped_ptr<cc::CompositorFrame> frame, | 45 void SubmitCompositorFrame(scoped_ptr<cc::CompositorFrame> frame, |
43 const base::Closure& callback); | 46 const base::Closure& callback); |
44 | 47 |
45 private: | 48 private: |
46 // DisplayClient implementation. | 49 // DisplayClient implementation. |
47 // TODO(rjkroege, fsamuel): This won't work correctly with multiple displays. | 50 // TODO(rjkroege, fsamuel): This won't work correctly with multiple displays. |
48 void CommitVSyncParameters(base::TimeTicks timebase, | 51 void CommitVSyncParameters(base::TimeTicks timebase, |
(...skipping 12 matching lines...) Expand all Loading... |
61 cc::SurfaceId cc_id_; | 64 cc::SurfaceId cc_id_; |
62 | 65 |
63 gfx::Size last_submitted_frame_size_; | 66 gfx::Size last_submitted_frame_size_; |
64 scoped_ptr<cc::CompositorFrame> pending_frame_; | 67 scoped_ptr<cc::CompositorFrame> pending_frame_; |
65 | 68 |
66 scoped_ptr<cc::Display> display_; | 69 scoped_ptr<cc::Display> display_; |
67 | 70 |
68 DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient); | 71 DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient); |
69 }; | 72 }; |
70 | 73 |
71 } // namespace mus | 74 } // namespace surfaces |
72 | 75 |
73 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 76 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
OLD | NEW |