| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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_OUTPUT_RENDERER_H_ | 5 #ifndef CC_OUTPUT_RENDERER_H_ |
| 6 #define CC_OUTPUT_RENDERER_H_ | 6 #define CC_OUTPUT_RENDERER_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
| 11 #include "cc/output/renderer_capabilities.h" | 12 #include "cc/output/renderer_capabilities.h" |
| 12 #include "cc/output/renderer_settings.h" | 13 #include "cc/output/renderer_settings.h" |
| 13 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
| 14 | 15 |
| 15 namespace cc { | 16 namespace cc { |
| 16 | 17 |
| 17 class CompositorFrameAck; | 18 class CompositorFrameAck; |
| 18 class CompositorFrameMetadata; | 19 class CompositorFrameMetadata; |
| 19 class RenderPass; | 20 class RenderPass; |
| 20 class RenderPassId; | 21 class RenderPassId; |
| 21 class ScopedResource; | 22 class ScopedResource; |
| 22 class Task; | 23 class Task; |
| 23 | 24 |
| 24 typedef std::vector<scoped_ptr<RenderPass>> RenderPassList; | 25 typedef std::vector<std::unique_ptr<RenderPass>> RenderPassList; |
| 25 | 26 |
| 26 struct RendererCapabilitiesImpl { | 27 struct RendererCapabilitiesImpl { |
| 27 RendererCapabilitiesImpl(); | 28 RendererCapabilitiesImpl(); |
| 28 ~RendererCapabilitiesImpl(); | 29 ~RendererCapabilitiesImpl(); |
| 29 | 30 |
| 30 // Capabilities copied to main thread. | 31 // Capabilities copied to main thread. |
| 31 ResourceFormat best_texture_format; | 32 ResourceFormat best_texture_format; |
| 32 bool allow_partial_texture_updates; | 33 bool allow_partial_texture_updates; |
| 33 int max_texture_size; | 34 int max_texture_size; |
| 34 bool using_shared_memory_resources; | 35 bool using_shared_memory_resources; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 const RendererSettings* settings_; | 94 const RendererSettings* settings_; |
| 94 bool visible_; | 95 bool visible_; |
| 95 | 96 |
| 96 private: | 97 private: |
| 97 DISALLOW_COPY_AND_ASSIGN(Renderer); | 98 DISALLOW_COPY_AND_ASSIGN(Renderer); |
| 98 }; | 99 }; |
| 99 | 100 |
| 100 } // namespace cc | 101 } // namespace cc |
| 101 | 102 |
| 102 #endif // CC_OUTPUT_RENDERER_H_ | 103 #endif // CC_OUTPUT_RENDERER_H_ |
| OLD | NEW |