| 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 <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <map> | 11 #include <map> |
| 9 #include <set> | 12 #include <set> |
| 10 #include <vector> | 13 #include <vector> |
| 11 | 14 |
| 12 #include "base/callback.h" | 15 #include "base/callback.h" |
| 13 #include "base/containers/hash_tables.h" | 16 #include "base/containers/hash_tables.h" |
| 14 #include "base/macros.h" | 17 #include "base/macros.h" |
| 15 #include "base/memory/scoped_ptr.h" | 18 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/memory/weak_ptr.h" | 19 #include "base/memory/weak_ptr.h" |
| 17 #include "cc/output/copy_output_request.h" | 20 #include "cc/output/copy_output_request.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 std::vector<SurfaceId> referenced_surfaces_; | 106 std::vector<SurfaceId> referenced_surfaces_; |
| 104 | 107 |
| 105 DrawCallback draw_callback_; | 108 DrawCallback draw_callback_; |
| 106 | 109 |
| 107 DISALLOW_COPY_AND_ASSIGN(Surface); | 110 DISALLOW_COPY_AND_ASSIGN(Surface); |
| 108 }; | 111 }; |
| 109 | 112 |
| 110 } // namespace cc | 113 } // namespace cc |
| 111 | 114 |
| 112 #endif // CC_SURFACES_SURFACE_H_ | 115 #endif // CC_SURFACES_SURFACE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1539203002:
Switch to standard integer types in cc/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master