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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp

Issue 1421553003: Oilpan: fix build after r355578. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "core/inspector/InspectorAnimationAgent.h" 7 #include "core/inspector/InspectorAnimationAgent.h"
8 8
9 #include "core/animation/Animation.h" 9 #include "core/animation/Animation.h"
10 #include "core/animation/AnimationEffect.h" 10 #include "core/animation/AnimationEffect.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 { 398 {
399 if (referenceTimeline().playbackRate() == 0) 399 if (referenceTimeline().playbackRate() == 0)
400 return animation.startTime() + referenceTimeline().currentTime() - anima tion.timeline()->currentTime(); 400 return animation.startTime() + referenceTimeline().currentTime() - anima tion.timeline()->currentTime();
401 return animation.startTime() + (animation.timeline()->zeroTime() - reference Timeline().zeroTime()) * 1000 * referenceTimeline().playbackRate(); 401 return animation.startTime() + (animation.timeline()->zeroTime() - reference Timeline().zeroTime()) * 1000 * referenceTimeline().playbackRate();
402 } 402 }
403 403
404 DEFINE_TRACE(InspectorAnimationAgent) 404 DEFINE_TRACE(InspectorAnimationAgent)
405 { 405 {
406 #if ENABLE(OILPAN) 406 #if ENABLE(OILPAN)
407 visitor->trace(m_domAgent); 407 visitor->trace(m_domAgent);
408 visitor->trace(m_cssAgent);
408 visitor->trace(m_injectedScriptManager); 409 visitor->trace(m_injectedScriptManager);
409 visitor->trace(m_idToAnimation); 410 visitor->trace(m_idToAnimation);
410 visitor->trace(m_idToAnimationType); 411 visitor->trace(m_idToAnimationType);
411 visitor->trace(m_idToAnimationClone); 412 visitor->trace(m_idToAnimationClone);
412 #endif 413 #endif
413 InspectorBaseAgent::trace(visitor); 414 InspectorBaseAgent::trace(visitor);
414 } 415 }
415 416
416 } 417 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698