| 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_RESOURCES_TILE_PRIORITY_H_ | 5 #ifndef CC_RESOURCES_TILE_PRIORITY_H_ |
| 6 #define CC_RESOURCES_TILE_PRIORITY_H_ | 6 #define CC_RESOURCES_TILE_PRIORITY_H_ |
| 7 | 7 |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/debug/trace_event_argument.h" | |
| 13 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/trace_event/trace_event_argument.h" |
| 14 #include "cc/base/cc_export.h" | 14 #include "cc/base/cc_export.h" |
| 15 | 15 |
| 16 namespace base { | 16 namespace base { |
| 17 class Value; | 17 class Value; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace cc { | 20 namespace cc { |
| 21 | 21 |
| 22 enum WhichTree { | 22 enum WhichTree { |
| 23 // Note: these must be 0 and 1 because we index with them in various places, | 23 // Note: these must be 0 and 1 because we index with them in various places, |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 bool operator!=(const GlobalStateThatImpactsTilePriority& other) const { | 150 bool operator!=(const GlobalStateThatImpactsTilePriority& other) const { |
| 151 return !(*this == other); | 151 return !(*this == other); |
| 152 } | 152 } |
| 153 | 153 |
| 154 void AsValueInto(base::debug::TracedValue* dict) const; | 154 void AsValueInto(base::debug::TracedValue* dict) const; |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 } // namespace cc | 157 } // namespace cc |
| 158 | 158 |
| 159 #endif // CC_RESOURCES_TILE_PRIORITY_H_ | 159 #endif // CC_RESOURCES_TILE_PRIORITY_H_ |
| OLD | NEW |