| 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 CC_SURFACES_DISPLAY_H_ | 5 #ifndef CC_SURFACES_DISPLAY_H_ |
| 6 #define CC_SURFACES_DISPLAY_H_ | 6 #define CC_SURFACES_DISPLAY_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 | 9 |
| 10 #include "cc/output/output_surface_client.h" | 10 #include "cc/output/output_surface_client.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 // SurfaceClient implementation. | 67 // SurfaceClient implementation. |
| 68 virtual void ReturnResources(const ReturnedResourceArray& resources) OVERRIDE; | 68 virtual void ReturnResources(const ReturnedResourceArray& resources) OVERRIDE; |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 void InitializeOutputSurface(); | 71 void InitializeOutputSurface(); |
| 72 | 72 |
| 73 DisplayClient* client_; | 73 DisplayClient* client_; |
| 74 SurfaceManager* manager_; | 74 SurfaceManager* manager_; |
| 75 SurfaceAggregator aggregator_; | 75 SurfaceAggregator aggregator_; |
| 76 SharedBitmapManager* bitmap_manager_; | 76 SharedBitmapManager* bitmap_manager_; |
| 77 LayerTreeSettings settings_; |
| 77 scoped_ptr<Surface> current_surface_; | 78 scoped_ptr<Surface> current_surface_; |
| 78 scoped_ptr<OutputSurface> output_surface_; | 79 scoped_ptr<OutputSurface> output_surface_; |
| 79 scoped_ptr<ResourceProvider> resource_provider_; | 80 scoped_ptr<ResourceProvider> resource_provider_; |
| 80 scoped_ptr<DirectRenderer> renderer_; | 81 scoped_ptr<DirectRenderer> renderer_; |
| 81 int child_id_; | 82 int child_id_; |
| 82 | 83 |
| 83 DISALLOW_COPY_AND_ASSIGN(Display); | 84 DISALLOW_COPY_AND_ASSIGN(Display); |
| 84 }; | 85 }; |
| 85 | 86 |
| 86 } // namespace cc | 87 } // namespace cc |
| 87 | 88 |
| 88 #endif // CC_SURFACES_DISPLAY_H_ | 89 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |