Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Side by Side Diff: third_party/WebKit/Source/core/animation/AnimationStack.cpp

Issue 1780603002: blink: Rename bindings/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-bindings: rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #include "wtf/NonCopyingSort.h" 38 #include "wtf/NonCopyingSort.h"
39 #include <algorithm> 39 #include <algorithm>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 namespace { 43 namespace {
44 44
45 void copyToActiveInterpolationsMap(const Vector<RefPtr<Interpolation>>& source, AnimationStack::PropertyHandleFilter propertyHandleFilter, ActiveInterpolationsM ap& target) 45 void copyToActiveInterpolationsMap(const Vector<RefPtr<Interpolation>>& source, AnimationStack::PropertyHandleFilter propertyHandleFilter, ActiveInterpolationsM ap& target)
46 { 46 {
47 for (const auto& interpolation : source) { 47 for (const auto& interpolation : source) {
48 PropertyHandle property = interpolation->property(); 48 PropertyHandle property = interpolation->getProperty();
49 if (propertyHandleFilter && !propertyHandleFilter(property)) 49 if (propertyHandleFilter && !propertyHandleFilter(property))
50 continue; 50 continue;
51 ActiveInterpolationsMap::AddResult entry = target.add(property, ActiveIn terpolations(1)); 51 ActiveInterpolationsMap::AddResult entry = target.add(property, ActiveIn terpolations(1));
52 ActiveInterpolations& activeInterpolations = entry.storedValue->value; 52 ActiveInterpolations& activeInterpolations = entry.storedValue->value;
53 if (!entry.isNewEntry 53 if (!entry.isNewEntry
54 && (RuntimeEnabledFeatures::stackedCSSPropertyAnimationsEnabled() || !property.isCSSProperty() || property.isPresentationAttribute()) 54 && (RuntimeEnabledFeatures::stackedCSSPropertyAnimationsEnabled() || !property.isCSSProperty() || property.isPresentationAttribute())
55 && interpolation->isInvalidatableInterpolation() 55 && interpolation->isInvalidatableInterpolation()
56 && toInvalidatableInterpolation(*interpolation).dependsOnUnderlyingV alue()) { 56 && toInvalidatableInterpolation(*interpolation).dependsOnUnderlyingV alue()) {
57 activeInterpolations.append(interpolation.get()); 57 activeInterpolations.append(interpolation.get());
58 } else { 58 } else {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 FloatBox expandingBox(originalBox); 154 FloatBox expandingBox(originalBox);
155 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *effect->model(), startRange, endRange)) 155 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *effect->model(), startRange, endRange))
156 return false; 156 return false;
157 box.expandTo(expandingBox); 157 box.expandTo(expandingBox);
158 } 158 }
159 } 159 }
160 return true; 160 return true;
161 } 161 }
162 162
163 } // namespace blink 163 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698