| 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 23 matching lines...) Expand all Loading... |
| 34 cc::SurfaceFactory* factory() { return &factory_; } | 34 cc::SurfaceFactory* factory() { return &factory_; } |
| 35 | 35 |
| 36 // cc::OutputSurface implementation. | 36 // cc::OutputSurface implementation. |
| 37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; | 37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; |
| 38 | 38 |
| 39 // cc::SurfaceFactoryClient implementation. | 39 // cc::SurfaceFactoryClient implementation. |
| 40 virtual void ReturnResources( | 40 virtual void ReturnResources( |
| 41 const cc::ReturnedResourceArray& resources) OVERRIDE; | 41 const cc::ReturnedResourceArray& resources) OVERRIDE; |
| 42 | 42 |
| 43 private: | 43 private: |
| 44 void SwapBuffersComplete(); |
| 45 |
| 44 cc::Display* display_; | 46 cc::Display* display_; |
| 45 cc::SurfaceManager* surface_manager_; | 47 cc::SurfaceManager* surface_manager_; |
| 46 cc::SurfaceFactory factory_; | 48 cc::SurfaceFactory factory_; |
| 47 gfx::Size display_size_; | 49 gfx::Size display_size_; |
| 48 cc::SurfaceId surface_id_; | 50 cc::SurfaceId surface_id_; |
| 49 cc::SurfaceIdAllocator allocator_; | 51 cc::SurfaceIdAllocator allocator_; |
| 50 | 52 |
| 51 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); | 53 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); |
| 52 }; | 54 }; |
| 53 | 55 |
| 54 } // namespace content | 56 } // namespace content |
| 55 | 57 |
| 56 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 58 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
| OLD | NEW |