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

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

Issue 1096963002: Make UseCounters work on aliased properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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
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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 552
553 BitArray<numCSSProperties> listedProperties; 553 BitArray<numCSSProperties> listedProperties;
554 bool anyTransitionHadTransitionAll = false; 554 bool anyTransitionHadTransitionAll = false;
555 const LayoutObject* renderer = animatingElement->layoutObject(); 555 const LayoutObject* renderer = animatingElement->layoutObject();
556 if (!animationStyleRecalc && style.display() != NONE && renderer && renderer ->style() && transitionData) { 556 if (!animationStyleRecalc && style.display() != NONE && renderer && renderer ->style() && transitionData) {
557 const ComputedStyle& oldStyle = *renderer->style(); 557 const ComputedStyle& oldStyle = *renderer->style();
558 558
559 for (size_t i = 0; i < transitionData->propertyList().size(); ++i) { 559 for (size_t i = 0; i < transitionData->propertyList().size(); ++i) {
560 const CSSTransitionData::TransitionProperty& transitionProperty = tr ansitionData->propertyList()[i]; 560 const CSSTransitionData::TransitionProperty& transitionProperty = tr ansitionData->propertyList()[i];
561 CSSTransitionData::TransitionPropertyType mode = transitionProperty. propertyType; 561 CSSTransitionData::TransitionPropertyType mode = transitionProperty. propertyType;
562 CSSPropertyID property = transitionProperty.propertyId; 562 CSSPropertyID property = resolveCSSPropertyID(transitionProperty.unr esolvedProperty);
563 if (mode == CSSTransitionData::TransitionNone || mode == CSSTransiti onData::TransitionUnknown) 563 if (mode == CSSTransitionData::TransitionNone || mode == CSSTransiti onData::TransitionUnknown)
564 continue; 564 continue;
565 565
566 bool animateAll = mode == CSSTransitionData::TransitionAll; 566 bool animateAll = mode == CSSTransitionData::TransitionAll;
567 ASSERT(animateAll || mode == CSSTransitionData::TransitionSingleProp erty); 567 ASSERT(animateAll || mode == CSSTransitionData::TransitionSingleProp erty);
568 if (animateAll) 568 if (animateAll)
569 anyTransitionHadTransitionAll = true; 569 anyTransitionHadTransitionAll = true;
570 const StylePropertyShorthand& propertyList = animateAll ? CSSAnimati ons::propertiesForTransitionAll() : shorthandForProperty(property); 570 const StylePropertyShorthand& propertyList = animateAll ? CSSAnimati ons::propertiesForTransitionAll() : shorthandForProperty(property);
571 // If not a shorthand we only execute one iteration of this loop, an d refer to the property directly. 571 // If not a shorthand we only execute one iteration of this loop, an d refer to the property directly.
572 for (unsigned j = 0; !j || j < propertyList.length(); ++j) { 572 for (unsigned j = 0; !j || j < propertyList.length(); ++j) {
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 visitor->trace(m_activeInterpolationsForAnimations); 840 visitor->trace(m_activeInterpolationsForAnimations);
841 visitor->trace(m_activeInterpolationsForTransitions); 841 visitor->trace(m_activeInterpolationsForTransitions);
842 visitor->trace(m_newAnimations); 842 visitor->trace(m_newAnimations);
843 visitor->trace(m_suppressedAnimationPlayers); 843 visitor->trace(m_suppressedAnimationPlayers);
844 visitor->trace(m_animationsWithUpdates); 844 visitor->trace(m_animationsWithUpdates);
845 visitor->trace(m_animationsWithStyleUpdates); 845 visitor->trace(m_animationsWithStyleUpdates);
846 #endif 846 #endif
847 } 847 }
848 848
849 } // namespace blink 849 } // namespace blink
OLDNEW
« no previous file with comments | « Source/build/scripts/templates/CSSPropertyMetadata.cpp.tmpl ('k') | Source/core/animation/css/CSSTransitionData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698