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

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

Issue 916273002: Make DocumentLoader::timing return a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 5 years, 10 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/dom/Document.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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 void AnimationTimeline::AnimationTimelineTiming::trace(Visitor* visitor) 178 void AnimationTimeline::AnimationTimelineTiming::trace(Visitor* visitor)
179 { 179 {
180 visitor->trace(m_timeline); 180 visitor->trace(m_timeline);
181 AnimationTimeline::PlatformTiming::trace(visitor); 181 AnimationTimeline::PlatformTiming::trace(visitor);
182 } 182 }
183 183
184 double AnimationTimeline::zeroTime() 184 double AnimationTimeline::zeroTime()
185 { 185 {
186 if (!m_zeroTimeInitialized && m_document && m_document->loader()) { 186 if (!m_zeroTimeInitialized && m_document && m_document->loader()) {
187 m_zeroTime = m_document->loader()->timing()->referenceMonotonicTime(); 187 m_zeroTime = m_document->loader()->timing().referenceMonotonicTime();
188 m_zeroTimeInitialized = true; 188 m_zeroTimeInitialized = true;
189 } 189 }
190 return m_zeroTime; 190 return m_zeroTime;
191 } 191 }
192 192
193 double AnimationTimeline::currentTime(bool& isNull) 193 double AnimationTimeline::currentTime(bool& isNull)
194 { 194 {
195 return currentTimeInternal(isNull) * 1000; 195 return currentTimeInternal(isNull) * 1000;
196 } 196 }
197 197
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 { 312 {
313 #if ENABLE(OILPAN) 313 #if ENABLE(OILPAN)
314 visitor->trace(m_document); 314 visitor->trace(m_document);
315 visitor->trace(m_timing); 315 visitor->trace(m_timing);
316 visitor->trace(m_playersNeedingUpdate); 316 visitor->trace(m_playersNeedingUpdate);
317 visitor->trace(m_players); 317 visitor->trace(m_players);
318 #endif 318 #endif
319 } 319 }
320 320
321 } // namespace 321 } // namespace
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698