| 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 14 matching lines...) Expand all Loading... |
| 25 public: | 25 public: |
| 26 // The underlying cc::Display and cc::SurfaceManager must outlive this class. | 26 // The underlying cc::Display and cc::SurfaceManager must outlive this class. |
| 27 SurfaceDisplayOutputSurface( | 27 SurfaceDisplayOutputSurface( |
| 28 cc::SurfaceManager* surface_manager, | 28 cc::SurfaceManager* surface_manager, |
| 29 uint32_t surface_id_namespace, | 29 uint32_t surface_id_namespace, |
| 30 const scoped_refptr<cc::ContextProvider>& context_provider); | 30 const scoped_refptr<cc::ContextProvider>& context_provider); |
| 31 virtual ~SurfaceDisplayOutputSurface(); | 31 virtual ~SurfaceDisplayOutputSurface(); |
| 32 | 32 |
| 33 void set_display(cc::Display* display) { display_ = display; } | 33 void set_display(cc::Display* display) { display_ = display; } |
| 34 cc::SurfaceFactory* factory() { return &factory_; } | 34 cc::SurfaceFactory* factory() { return &factory_; } |
| 35 void ReceivedVSyncParameters(base::TimeTicks timebase, |
| 36 base::TimeDelta interval); |
| 35 | 37 |
| 36 // cc::OutputSurface implementation. | 38 // cc::OutputSurface implementation. |
| 37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; | 39 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; |
| 38 | 40 |
| 39 // cc::SurfaceFactoryClient implementation. | 41 // cc::SurfaceFactoryClient implementation. |
| 40 virtual void ReturnResources( | 42 virtual void ReturnResources( |
| 41 const cc::ReturnedResourceArray& resources) OVERRIDE; | 43 const cc::ReturnedResourceArray& resources) OVERRIDE; |
| 42 | 44 |
| 43 private: | 45 private: |
| 44 void SwapBuffersComplete(); | 46 void SwapBuffersComplete(); |
| 45 | 47 |
| 46 cc::Display* display_; | 48 cc::Display* display_; |
| 47 cc::SurfaceManager* surface_manager_; | 49 cc::SurfaceManager* surface_manager_; |
| 48 cc::SurfaceFactory factory_; | 50 cc::SurfaceFactory factory_; |
| 49 gfx::Size display_size_; | 51 gfx::Size display_size_; |
| 50 cc::SurfaceId surface_id_; | 52 cc::SurfaceId surface_id_; |
| 51 cc::SurfaceIdAllocator allocator_; | 53 cc::SurfaceIdAllocator allocator_; |
| 52 | 54 |
| 53 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); | 55 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); |
| 54 }; | 56 }; |
| 55 | 57 |
| 56 } // namespace content | 58 } // namespace content |
| 57 | 59 |
| 58 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 60 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
| OLD | NEW |