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

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

Issue 399033002: Web Animations: Don't compare start time for AnimationPlayer sorting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 5 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 | « Source/core/animation/AnimationStackTest.cpp ('k') | 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 /* 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 26 matching lines...) Expand all
37 #include "core/frame/FrameView.h" 37 #include "core/frame/FrameView.h"
38 #include "core/page/Page.h" 38 #include "core/page/Page.h"
39 #include "platform/TraceEvent.h" 39 #include "platform/TraceEvent.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 namespace { 43 namespace {
44 44
45 bool compareAnimationPlayers(const RefPtrWillBeMember<blink::AnimationPlayer>& l eft, const RefPtrWillBeMember<blink::AnimationPlayer>& right) 45 bool compareAnimationPlayers(const RefPtrWillBeMember<blink::AnimationPlayer>& l eft, const RefPtrWillBeMember<blink::AnimationPlayer>& right)
46 { 46 {
47 return left->sortInfo().hasLowerSequenceNumber(right->sortInfo()); 47 return AnimationPlayer::hasLowerPriority(left.get(), right.get());
48 } 48 }
49 49
50 } 50 }
51 51
52 // This value represents 1 frame at 30Hz plus a little bit of wiggle room. 52 // This value represents 1 frame at 30Hz plus a little bit of wiggle room.
53 // TODO: Plumb a nominal framerate through and derive this value from that. 53 // TODO: Plumb a nominal framerate through and derive this value from that.
54 const double AnimationTimeline::s_minimumDelay = 0.04; 54 const double AnimationTimeline::s_minimumDelay = 0.04;
55 55
56 56
57 PassRefPtrWillBeRawPtr<AnimationTimeline> AnimationTimeline::create(Document* do cument, PassOwnPtrWillBeRawPtr<PlatformTiming> timing) 57 PassRefPtrWillBeRawPtr<AnimationTimeline> AnimationTimeline::create(Document* do cument, PassOwnPtrWillBeRawPtr<PlatformTiming> timing)
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 { 248 {
249 #if ENABLE(OILPAN) 249 #if ENABLE(OILPAN)
250 visitor->trace(m_document); 250 visitor->trace(m_document);
251 visitor->trace(m_timing); 251 visitor->trace(m_timing);
252 visitor->trace(m_playersNeedingUpdate); 252 visitor->trace(m_playersNeedingUpdate);
253 visitor->trace(m_players); 253 visitor->trace(m_players);
254 #endif 254 #endif
255 } 255 }
256 256
257 } // namespace 257 } // namespace
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationStackTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698