| 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_SURFACE_H_ | 5 #ifndef CC_SURFACES_SURFACE_H_ | 
| 6 #define CC_SURFACES_SURFACE_H_ | 6 #define CC_SURFACES_SURFACE_H_ | 
| 7 | 7 | 
| 8 #include <map> | 8 #include <map> | 
| 9 #include <vector> | 9 #include <vector> | 
| 10 | 10 | 
| 11 #include "base/callback.h" | 11 #include "base/callback.h" | 
| 12 #include "base/containers/hash_tables.h" | 12 #include "base/containers/hash_tables.h" | 
| 13 #include "base/macros.h" | 13 #include "base/macros.h" | 
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" | 
| 15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" | 
| 16 #include "cc/base/scoped_ptr_vector.h" | 16 #include "cc/base/scoped_ptr_vector.h" | 
| 17 #include "cc/output/copy_output_request.h" | 17 #include "cc/output/copy_output_request.h" | 
| 18 #include "cc/quads/render_pass_id.h" | 18 #include "cc/quads/render_pass_id.h" | 
| 19 #include "cc/surfaces/surface_id.h" | 19 #include "cc/surfaces/surface_id.h" | 
| 20 #include "cc/surfaces/surfaces_export.h" | 20 #include "cc/surfaces/surfaces_export.h" | 
| 21 #include "ui/gfx/size.h" | 21 #include "ui/gfx/geometry/size.h" | 
| 22 | 22 | 
| 23 namespace ui { | 23 namespace ui { | 
| 24 struct LatencyInfo; | 24 struct LatencyInfo; | 
| 25 } | 25 } | 
| 26 | 26 | 
| 27 namespace cc { | 27 namespace cc { | 
| 28 class CompositorFrame; | 28 class CompositorFrame; | 
| 29 class CopyOutputRequest; | 29 class CopyOutputRequest; | 
| 30 class SurfaceManager; | 30 class SurfaceManager; | 
| 31 class SurfaceFactory; | 31 class SurfaceFactory; | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68   int frame_index_; | 68   int frame_index_; | 
| 69 | 69 | 
| 70   base::Closure draw_callback_; | 70   base::Closure draw_callback_; | 
| 71 | 71 | 
| 72   DISALLOW_COPY_AND_ASSIGN(Surface); | 72   DISALLOW_COPY_AND_ASSIGN(Surface); | 
| 73 }; | 73 }; | 
| 74 | 74 | 
| 75 }  // namespace cc | 75 }  // namespace cc | 
| 76 | 76 | 
| 77 #endif  // CC_SURFACES_SURFACE_H_ | 77 #endif  // CC_SURFACES_SURFACE_H_ | 
| OLD | NEW | 
|---|