Index: cc/animation/animation_host.cc |
diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc |
index 1bc8f2d980cd806e41c750682f0bfa98236aaa97..f03ae70a2d989a99ed30b9d67da7e27c0ea04e05 100644 |
--- a/cc/animation/animation_host.cc |
+++ b/cc/animation/animation_host.cc |
@@ -217,8 +217,7 @@ |
scoped_refptr<ElementAnimations> |
AnimationHost::GetElementAnimationsForElementId(ElementId element_id) const { |
- if (!element_id) |
- return nullptr; |
+ DCHECK(element_id); |
auto iter = element_to_animations_map_.find(element_id); |
return iter == element_to_animations_map_.end() ? nullptr : iter->second; |
} |
@@ -284,14 +283,14 @@ |
std::unique_ptr<AnimationEvents> events) { |
for (size_t event_index = 0; event_index < events->events_.size(); |
++event_index) { |
- ElementId element_id = events->events_[event_index].element_id; |
+ int event_layer_id = events->events_[event_index].element_id; |
// Use the map of all ElementAnimations, not just active ones, since |
// non-active ElementAnimations may still receive events for impl-only |
// animations. |
const ElementToAnimationsMap& all_element_animations = |
element_to_animations_map_; |
- auto iter = all_element_animations.find(element_id); |
+ auto iter = all_element_animations.find(event_layer_id); |
if (iter != all_element_animations.end()) { |
switch (events->events_[event_index].type) { |
case AnimationEvent::STARTED: |