| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "cc/animation/element_id.h" | 5 #include "cc/trees/element_id.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <ostream> | 8 #include <ostream> |
| 9 | 9 |
| 10 #include "base/trace_event/trace_event_argument.h" | 10 #include "base/trace_event/trace_event_argument.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 | 12 |
| 13 namespace cc { | 13 namespace cc { |
| 14 | 14 |
| 15 bool ElementId::operator==(const ElementId& o) const { | 15 bool ElementId::operator==(const ElementId& o) const { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 size_t ElementIdHash::operator()(ElementId key) const { | 48 size_t ElementIdHash::operator()(ElementId key) const { |
| 49 return base::HashInts(key.primaryId, key.secondaryId); | 49 return base::HashInts(key.primaryId, key.secondaryId); |
| 50 } | 50 } |
| 51 | 51 |
| 52 std::ostream& operator<<(std::ostream& out, const ElementId& id) { | 52 std::ostream& operator<<(std::ostream& out, const ElementId& id) { |
| 53 return out << "(" << id.primaryId << ", " << id.secondaryId << ")"; | 53 return out << "(" << id.primaryId << ", " << id.secondaryId << ")"; |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace cc | 56 } // namespace cc |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2492133002:
CC Animation: Move ElementId from animation to trees. (Closed)
