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

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

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 m_timing->serviceOnNextFrame(); 166 m_timing->serviceOnNextFrame();
167 } else if (timeToNextEffect != std::numeric_limits<double>::infinity()) { 167 } else if (timeToNextEffect != std::numeric_limits<double>::infinity()) {
168 m_timing->wakeAfter(timeToNextEffect - s_minimumDelay); 168 m_timing->wakeAfter(timeToNextEffect - s_minimumDelay);
169 } 169 }
170 } 170 }
171 171
172 void AnimationTimeline::AnimationTimelineTiming::wakeAfter(double duration) 172 void AnimationTimeline::AnimationTimelineTiming::wakeAfter(double duration)
173 { 173 {
174 if (m_timer.isActive() && m_timer.nextFireInterval() < duration) 174 if (m_timer.isActive() && m_timer.nextFireInterval() < duration)
175 return; 175 return;
176 m_timer.startOneShot(duration, FROM_HERE); 176 m_timer.startOneShot(duration, BLINK_FROM_HERE);
177 } 177 }
178 178
179 void AnimationTimeline::AnimationTimelineTiming::cancelWake() 179 void AnimationTimeline::AnimationTimelineTiming::cancelWake()
180 { 180 {
181 m_timer.stop(); 181 m_timer.stop();
182 } 182 }
183 183
184 void AnimationTimeline::AnimationTimelineTiming::serviceOnNextFrame() 184 void AnimationTimeline::AnimationTimelineTiming::serviceOnNextFrame()
185 { 185 {
186 if (m_timeline->m_document && m_timeline->m_document->view()) 186 if (m_timeline->m_document && m_timeline->m_document->view())
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 335
336 DEFINE_TRACE(AnimationTimeline) 336 DEFINE_TRACE(AnimationTimeline)
337 { 337 {
338 visitor->trace(m_document); 338 visitor->trace(m_document);
339 visitor->trace(m_timing); 339 visitor->trace(m_timing);
340 visitor->trace(m_animationsNeedingUpdate); 340 visitor->trace(m_animationsNeedingUpdate);
341 visitor->trace(m_animations); 341 visitor->trace(m_animations);
342 } 342 }
343 343
344 } // namespace 344 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698