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

Side by Side Diff: Source/core/frame/animation/ImplicitAnimation.cpp

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/frame/animation/KeyframeAnimation.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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp ertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, RenderStyle* fromStyle) 43 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp ertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, RenderStyle* fromStyle)
44 : AnimationBase(transition, renderer, compAnim) 44 : AnimationBase(transition, renderer, compAnim)
45 , m_transitionProperty(transition->property()) 45 , m_transitionProperty(transition->property())
46 , m_animatingProperty(animatingProperty) 46 , m_animatingProperty(animatingProperty)
47 , m_overridden(false) 47 , m_overridden(false)
48 , m_active(true) 48 , m_active(true)
49 , m_fromStyle(fromStyle) 49 , m_fromStyle(fromStyle)
50 { 50 {
51 ASSERT(animatingProperty != CSSPropertyInvalid); 51 ASSERT(animatingProperty != CSSPropertyInvalid);
52 WebKit::Platform::current()->histogramSparse("WebCore.Animation.CSSPropertie s", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(m_animatingProperty)); 52 blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties ", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(m_animatingProperty));
53 } 53 }
54 54
55 ImplicitAnimation::~ImplicitAnimation() 55 ImplicitAnimation::~ImplicitAnimation()
56 { 56 {
57 // // Make sure to tell the renderer that we are ending. This will make sure any accelerated animations are removed. 57 // // Make sure to tell the renderer that we are ending. This will make sure any accelerated animations are removed.
58 if (!postActive()) 58 if (!postActive())
59 endAnimation(); 59 endAnimation();
60 } 60 }
61 61
62 bool ImplicitAnimation::shouldSendEventForListener(Document::ListenerType inList enerType) const 62 bool ImplicitAnimation::shouldSendEventForListener(Document::ListenerType inList enerType) const
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 // only need service at the end of the transition. 274 // only need service at the end of the transition.
275 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper ty) && isAccelerated()) { 275 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper ty) && isAccelerated()) {
276 bool isLooping; 276 bool isLooping;
277 getTimeToNextEvent(t, isLooping); 277 getTimeToNextEvent(t, isLooping);
278 } 278 }
279 279
280 return t; 280 return t;
281 } 281 }
282 282
283 } // namespace WebCore 283 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/frame/animation/KeyframeAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698