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

Side by Side Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 209433004: Do not zero-initialize RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compilation on gcc and msvc Created 6 years, 9 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 | Annotate | Revision Log
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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 element->document().cssPendingAnimations().add(player.get()); 511 element->document().cssPendingAnimations().add(player.get());
512 runningTransition.transition = transition.get(); 512 runningTransition.transition = transition.get();
513 m_transitions.set(id, runningTransition); 513 m_transitions.set(id, runningTransition);
514 ASSERT(id != CSSPropertyInvalid); 514 ASSERT(id != CSSPropertyInvalid);
515 blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProper ties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(id)); 515 blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProper ties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(id));
516 } 516 }
517 } 517 }
518 518
519 void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, const CSSAnimationData* anim, const RenderStyle& oldStyle, const RenderStyle& style, const TransitionMap* activeTransitions, CSSAnimationUpdate* update, const Elemen t* element) 519 void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, const CSSAnimationData* anim, const RenderStyle& oldStyle, const RenderStyle& style, const TransitionMap* activeTransitions, CSSAnimationUpdate* update, const Elemen t* element)
520 { 520 {
521 RefPtrWillBeRawPtr<AnimatableValue> to; 521 RefPtrWillBeRawPtr<AnimatableValue> to = nullptr;
522 if (activeTransitions) { 522 if (activeTransitions) {
523 TransitionMap::const_iterator activeTransitionIter = activeTransitions-> find(id); 523 TransitionMap::const_iterator activeTransitionIter = activeTransitions-> find(id);
524 if (activeTransitionIter != activeTransitions->end()) { 524 if (activeTransitionIter != activeTransitions->end()) {
525 to = CSSAnimatableValueFactory::create(id, style); 525 to = CSSAnimatableValueFactory::create(id, style);
526 const AnimatableValue* activeTo = activeTransitionIter->value.to; 526 const AnimatableValue* activeTo = activeTransitionIter->value.to;
527 if (to->equals(activeTo)) 527 if (to->equals(activeTo))
528 return; 528 return;
529 update->cancelTransition(id); 529 update->cancelTransition(id);
530 ASSERT(!element->activeAnimations() || !element->activeAnimations()- >isAnimationStyleChange()); 530 ASSERT(!element->activeAnimations() || !element->activeAnimations()- >isAnimationStyleChange());
531 } 531 }
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 CSSPropertyID id = convertToCSSPropertyID(i); 890 CSSPropertyID id = convertToCSSPropertyID(i);
891 if (isAnimatableProperty(id)) 891 if (isAnimatableProperty(id))
892 properties.append(id); 892 properties.append(id);
893 } 893 }
894 propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, propertie s.begin(), properties.size()); 894 propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, propertie s.begin(), properties.size());
895 } 895 }
896 return propertyShorthand; 896 return propertyShorthand;
897 } 897 }
898 898
899 } // namespace WebCore 899 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/CompositorAnimationsTest.cpp ('k') | Source/core/css/BasicShapeFunctions.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698