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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

Issue 2354463002: CSS Properties and Values API: Implement computation / computational independence (Closed)
Patch Set: actually fix test :) Created 4 years, 2 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 | « third_party/WebKit/Source/core/css/PropertyRegistration.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 * * Redistributions of source code must retain the above copyright 4 * * Redistributions of source code must retain the above copyright
5 * notice, this list of conditions and the following disclaimer. 5 * notice, this list of conditions and the following disclaimer.
6 * * Redistributions in binary form must reproduce the above 6 * * Redistributions in binary form must reproduce the above
7 * copyright notice, this list of conditions and the following disclaimer 7 * copyright notice, this list of conditions and the following disclaimer
8 * in the documentation and/or other materials provided with the 8 * in the documentation and/or other materials provided with the
9 * distribution. 9 * distribution.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverStat e& state, const CSSValue& value) 1096 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverStat e& state, const CSSValue& value)
1097 { 1097 {
1098 if (value.isPathValue()) 1098 if (value.isPathValue())
1099 return toCSSPathValue(value).stylePath(); 1099 return toCSSPathValue(value).stylePath();
1100 ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() = = CSSValueNone); 1100 ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() = = CSSValueNone);
1101 return nullptr; 1101 return nullptr;
1102 } 1102 }
1103 1103
1104 const CSSValue& StyleBuilderConverter::convertRegisteredPropertyValue(const Styl eResolverState& state, const CSSValue& value) 1104 const CSSValue& StyleBuilderConverter::convertRegisteredPropertyValue(const Styl eResolverState& state, const CSSValue& value)
1105 { 1105 {
1106 // TODO(timloh): Resolve ems, etc. 1106 // TODO(timloh): Images and transform-function values can also contain lengt hs.
1107 if (value.isValueList()) {
1108 CSSValueList* newList = CSSValueList::createSpaceSeparated();
1109 for (const CSSValue* innerValue : toCSSValueList(value))
1110 newList->append(convertRegisteredPropertyValue(state, *innerValue));
1111 return *newList;
1112 }
1113
1114 if (value.isPrimitiveValue()) {
1115 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
1116 if (primitiveValue.isCalculated() || CSSPrimitiveValue::isRelativeUnit(p rimitiveValue.typeWithCalcResolved())) {
1117 // Instead of the actual zoom, use 1 to avoid potential rounding err ors
1118 Length length = primitiveValue.convertToLength(state.cssToLengthConv ersionData().copyWithAdjustedZoom(1));
1119 return *CSSPrimitiveValue::create(length, 1);
1120 }
1121 }
1107 return value; 1122 return value;
1108 } 1123 }
1109 1124
1110 } // namespace blink 1125 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/PropertyRegistration.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698