| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 const gfx::Transform& transform, | 57 const gfx::Transform& transform, |
| 58 const gfx::Rect& viewport, | 58 const gfx::Rect& viewport, |
| 59 const gfx::Rect& clip, | 59 const gfx::Rect& clip, |
| 60 bool valid_for_tile_management) OVERRIDE {} | 60 bool valid_for_tile_management) OVERRIDE {} |
| 61 virtual void SetMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE {} | 61 virtual void SetMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE {} |
| 62 virtual void SetTreeActivationCallback( | 62 virtual void SetTreeActivationCallback( |
| 63 const base::Closure& callback) OVERRIDE {} | 63 const base::Closure& callback) OVERRIDE {} |
| 64 | 64 |
| 65 // RendererClient implementation. | 65 // RendererClient implementation. |
| 66 virtual void SetFullRootLayerDamage() OVERRIDE {} | 66 virtual void SetFullRootLayerDamage() OVERRIDE {} |
| 67 virtual void RunOnDemandRasterTask(Task* on_demand_raster_task) OVERRIDE {} |
| 67 | 68 |
| 68 // SurfaceClient implementation. | 69 // SurfaceClient implementation. |
| 69 virtual void ReturnResources(const ReturnedResourceArray& resources) OVERRIDE; | 70 virtual void ReturnResources(const ReturnedResourceArray& resources) OVERRIDE; |
| 70 | 71 |
| 71 private: | 72 private: |
| 72 void InitializeOutputSurface(); | 73 void InitializeOutputSurface(); |
| 73 | 74 |
| 74 DisplayClient* client_; | 75 DisplayClient* client_; |
| 75 SurfaceManager* manager_; | 76 SurfaceManager* manager_; |
| 76 SurfaceAggregator aggregator_; | 77 SurfaceAggregator aggregator_; |
| 77 SharedBitmapManager* bitmap_manager_; | 78 SharedBitmapManager* bitmap_manager_; |
| 78 LayerTreeSettings settings_; | 79 LayerTreeSettings settings_; |
| 79 scoped_ptr<Surface> current_surface_; | 80 scoped_ptr<Surface> current_surface_; |
| 80 scoped_ptr<OutputSurface> output_surface_; | 81 scoped_ptr<OutputSurface> output_surface_; |
| 81 scoped_ptr<ResourceProvider> resource_provider_; | 82 scoped_ptr<ResourceProvider> resource_provider_; |
| 82 scoped_ptr<DirectRenderer> renderer_; | 83 scoped_ptr<DirectRenderer> renderer_; |
| 83 int child_id_; | 84 int child_id_; |
| 84 | 85 |
| 85 DISALLOW_COPY_AND_ASSIGN(Display); | 86 DISALLOW_COPY_AND_ASSIGN(Display); |
| 86 }; | 87 }; |
| 87 | 88 |
| 88 } // namespace cc | 89 } // namespace cc |
| 89 | 90 |
| 90 #endif // CC_SURFACES_DISPLAY_H_ | 91 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |