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

Side by Side Diff: Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1308073007: Don't special case transition-property: all in parsing and data storage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 945 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
946 list->append(valueForMatrixTransform(transform, style)); 946 list->append(valueForMatrixTransform(transform, style));
947 947
948 return list.release(); 948 return list.release();
949 } 949 }
950 950
951 static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST ransitionData::TransitionProperty& property) 951 static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST ransitionData::TransitionProperty& property)
952 { 952 {
953 if (property.propertyType == CSSTransitionData::TransitionNone) 953 if (property.propertyType == CSSTransitionData::TransitionNone)
954 return cssValuePool().createIdentifierValue(CSSValueNone); 954 return cssValuePool().createIdentifierValue(CSSValueNone);
955 if (property.propertyType == CSSTransitionData::TransitionAll) 955 if (property.propertyType == CSSTransitionData::TransitionUnknownProperty)
956 return cssValuePool().createIdentifierValue(CSSValueAll);
957 if (property.propertyType == CSSTransitionData::TransitionUnknown)
958 return cssValuePool().createValue(property.propertyString, CSSPrimitiveV alue::UnitType::CustomIdentifier); 956 return cssValuePool().createValue(property.propertyString, CSSPrimitiveV alue::UnitType::CustomIdentifier);
959 ASSERT(property.propertyType == CSSTransitionData::TransitionSingleProperty) ; 957 ASSERT(property.propertyType == CSSTransitionData::TransitionKnownProperty);
960 return cssValuePool().createValue(getPropertyNameString(property.unresolvedP roperty), CSSPrimitiveValue::UnitType::CustomIdentifier); 958 return cssValuePool().createValue(getPropertyNameString(property.unresolvedP roperty), CSSPrimitiveValue::UnitType::CustomIdentifier);
961 } 959 }
962 960
963 static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTran sitionData* transitionData) 961 static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTran sitionData* transitionData)
964 { 962 {
965 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ; 963 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ;
966 if (transitionData) { 964 if (transitionData) {
967 for (size_t i = 0; i < transitionData->propertyList().size(); ++i) 965 for (size_t i = 0; i < transitionData->propertyList().size(); ++i)
968 list->append(createTransitionPropertyValue(transitionData->propertyL ist()[i])); 966 list->append(createTransitionPropertyValue(transitionData->propertyL ist()[i]));
969 } else { 967 } else {
(...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after
2689 case CSSPropertyAll: 2687 case CSSPropertyAll:
2690 return nullptr; 2688 return nullptr;
2691 default: 2689 default:
2692 break; 2690 break;
2693 } 2691 }
2694 ASSERT_NOT_REACHED(); 2692 ASSERT_NOT_REACHED();
2695 return nullptr; 2693 return nullptr;
2696 } 2694 }
2697 2695
2698 } 2696 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698