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

Unified Diff: third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
index c3343d1a9adc407b766f462073a6799e9c049978..f88e814e46ba80778fc055dd93ca24aa19bc59b9 100644
--- a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
+++ b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
@@ -176,7 +176,7 @@ void KeyframeEffectModelBase::ensureKeyframeGroups() const {
if (m_keyframeGroups)
return;
- m_keyframeGroups = wrapUnique(new KeyframeGroupMap);
+ m_keyframeGroups = WTF::wrapUnique(new KeyframeGroupMap);
RefPtr<TimingFunction> zeroOffsetEasing = m_defaultKeyframeEasing;
for (const auto& keyframe : normalizedKeyframes(getFrames())) {
if (keyframe->offset() == 0)
@@ -185,13 +185,14 @@ void KeyframeEffectModelBase::ensureKeyframeGroups() const {
for (const PropertyHandle& property : keyframe->properties()) {
KeyframeGroupMap::iterator groupIter = m_keyframeGroups->find(property);
PropertySpecificKeyframeGroup* group;
- if (groupIter == m_keyframeGroups->end())
- group =
- m_keyframeGroups
- ->add(property, wrapUnique(new PropertySpecificKeyframeGroup))
- .storedValue->value.get();
- else
+ if (groupIter == m_keyframeGroups->end()) {
+ group = m_keyframeGroups
+ ->add(property,
+ WTF::wrapUnique(new PropertySpecificKeyframeGroup))
+ .storedValue->value.get();
+ } else {
group = groupIter->value.get();
+ }
group->appendKeyframe(keyframe->createPropertySpecificKeyframe(property));
}

Powered by Google App Engine
This is Rietveld 408576698