| 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" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 public surfaces::SurfacesContextProviderDelegate { | 38 public surfaces::SurfacesContextProviderDelegate { |
| 39 public: | 39 public: |
| 40 TopLevelDisplayClient(gfx::AcceleratedWidget widget, | 40 TopLevelDisplayClient(gfx::AcceleratedWidget widget, |
| 41 const scoped_refptr<gles2::GpuState>& gpu_state, | 41 const scoped_refptr<gles2::GpuState>& gpu_state, |
| 42 const scoped_refptr<SurfacesState>& surfaces_state); | 42 const scoped_refptr<SurfacesState>& surfaces_state); |
| 43 ~TopLevelDisplayClient() override; | 43 ~TopLevelDisplayClient() override; |
| 44 | 44 |
| 45 void SubmitCompositorFrame(scoped_ptr<cc::CompositorFrame> frame, | 45 void SubmitCompositorFrame(scoped_ptr<cc::CompositorFrame> frame, |
| 46 const base::Closure& callback); | 46 const base::Closure& callback); |
| 47 | 47 |
| 48 const cc::CompositorFrame* GetLastCompositorFrame() const; |
| 49 |
| 50 const cc::SurfaceId& surface_id() const { return cc_id_; } |
| 48 private: | 51 private: |
| 49 // DisplayClient implementation. | 52 // DisplayClient implementation. |
| 50 // TODO(rjkroege, fsamuel): This won't work correctly with multiple displays. | 53 // TODO(rjkroege, fsamuel): This won't work correctly with multiple displays. |
| 51 void CommitVSyncParameters(base::TimeTicks timebase, | 54 void CommitVSyncParameters(base::TimeTicks timebase, |
| 52 base::TimeDelta interval) override; | 55 base::TimeDelta interval) override; |
| 53 void OutputSurfaceLost() override; | 56 void OutputSurfaceLost() override; |
| 54 void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override; | 57 void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override; |
| 55 | 58 |
| 56 // SurfacesContextProviderDelegate: | 59 // SurfacesContextProviderDelegate: |
| 57 void OnContextCreated(); | 60 void OnContextCreated(); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 69 scoped_ptr<cc::CompositorFrame> pending_frame_; | 72 scoped_ptr<cc::CompositorFrame> pending_frame_; |
| 70 | 73 |
| 71 scoped_ptr<cc::Display> display_; | 74 scoped_ptr<cc::Display> display_; |
| 72 | 75 |
| 73 DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient); | 76 DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient); |
| 74 }; | 77 }; |
| 75 | 78 |
| 76 } // namespace surfaces | 79 } // namespace surfaces |
| 77 | 80 |
| 78 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 81 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
| OLD | NEW |