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

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

Issue 1115553002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 7 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
« no previous file with comments | « no previous file | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 24 matching lines...) Expand all
35 #include "core/animation/StyleInterpolation.h" 35 #include "core/animation/StyleInterpolation.h"
36 #include "core/animation/css/CSSAnimations.h" 36 #include "core/animation/css/CSSAnimations.h"
37 #include "wtf/BitArray.h" 37 #include "wtf/BitArray.h"
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 copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<blin k::Interpolation>>& source, ActiveInterpolationMap& target) 45 void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<Inte rpolation>>& source, ActiveInterpolationMap& target)
46 { 46 {
47 for (const auto& interpolation : source) { 47 for (const auto& interpolation : source) {
48 target.set(interpolation->property(), interpolation.get()); 48 target.set(interpolation->property(), interpolation.get());
49 } 49 }
50 } 50 }
51 51
52 bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnP trWillBeMember<SampledEffect>& effect2) 52 bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnP trWillBeMember<SampledEffect>& effect2)
53 { 53 {
54 ASSERT(effect1 && effect2); 54 ASSERT(effect1 && effect2);
55 return effect1->sequenceNumber() < effect2->sequenceNumber(); 55 return effect1->sequenceNumber() < effect2->sequenceNumber();
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 FloatBox expandingBox(originalBox); 123 FloatBox expandingBox(originalBox);
124 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *anim->effect(), startRange, endRange)) 124 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *anim->effect(), startRange, endRange))
125 return false; 125 return false;
126 box.expandTo(expandingBox); 126 box.expandTo(expandingBox);
127 } 127 }
128 } 128 }
129 return true; 129 return true;
130 } 130 }
131 131
132 } // namespace blink 132 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698