Changeset 171871 in webkit
- Timestamp:
- Jul 31, 2014 11:20:51 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r171866 r171871 1 2014-07-31 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> 2 3 Eliminate "FractionConversion" from CSSPrimitiveValue::convertToLength 4 https://bugs.webkit.org/show_bug.cgi?id=135377 5 6 Reviewed by Darin Adler. 7 8 The FractionConversion argument in CSSPrimitiveValue::convertToLength 9 doesn't seem to actually have a purpose. It is for converting numbers 10 into Length(x * 100, Percent), but this case shouldn't be reachable. 11 The original patch introducing it doesn't shed any light either: 12 [https://bugs.webkit.org/show_bug.cgi?id=74913 13 14 This patch removes the now unused FractionConversion argument. Note 15 that we can probably also merge the two Fixed conversions, as the 16 two only differ in clamping large numbers (probably unintended). 17 18 Patch by Timothy Loh, backported from Blink: https://codereview.chromium.org/71253002 19 20 No new tests. 21 22 * css/CSSCalculationValue.cpp: 23 (WebCore::determineCategory): 24 * css/CSSParser.cpp: 25 (WebCore::parseTransformTranslateArguments): 26 (WebCore::parseTranslateTransformValue): 27 (WebCore::parseTransformArguments): Deleted. 28 * css/CSSPrimitiveValueMappings.h: 29 (WebCore::CSSPrimitiveValue::convertToLength): 30 * css/DeprecatedStyleBuilder.cpp: 31 (WebCore::ApplyPropertyClip::convertToLength): 32 * css/StyleResolver.cpp: 33 (WebCore::StyleResolver::convertToIntLength): 34 (WebCore::StyleResolver::convertToFloatLength): 35 * css/TransformFunctions.cpp: 36 (WebCore::convertToFloatLength): 37 1 38 2014-07-31 Joseph Pecoraro <pecoraro@apple.com> 2 39 -
trunk/Source/WebCore/css/CSSCalculationValue.cpp
r170774 r171871 229 229 CSSPrimitiveValue* primitiveValue = m_value.get(); 230 230 return std::make_unique<CalcExpressionLength>(primitiveValue 231 ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | FractionConversion>(conversionData) : Length(Undefined));231 ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion>(conversionData) : Length(Undefined)); 232 232 } 233 233 // Only types that could be part of a Length expression can be converted -
trunk/Source/WebCore/css/CSSParser.cpp
r171677 r171871 1182 1182 1183 1183 template <typename CharacterType> 1184 static bool parseTransform Arguments(WebKitCSSTransformValue* transformValue, CharacterType* characters, unsigned length, unsigned start, unsigned expectedCount)1184 static bool parseTransformTranslateArguments(WebKitCSSTransformValue* transformValue, CharacterType* characters, unsigned length, unsigned start, unsigned expectedCount) 1185 1185 { 1186 1186 while (expectedCount) { … … 1195 1195 if (unit != CSSPrimitiveValue::CSS_PX && (number || unit != CSSPrimitiveValue::CSS_NUMBER)) 1196 1196 return false; 1197 transformValue->append(cssValuePool().createValue(number, unit));1197 transformValue->append(cssValuePool().createValue(number, CSSPrimitiveValue::CSS_PX)); 1198 1198 start = end + 1; 1199 1199 --expectedCount; … … 1238 1238 bool success; 1239 1239 if (string.is8Bit()) 1240 success = parseTransform Arguments(transformValue.get(), string.characters8(), string.length(), argumentStart, expectedArgumentCount);1240 success = parseTransformTranslateArguments(transformValue.get(), string.characters8(), string.length(), argumentStart, expectedArgumentCount); 1241 1241 else 1242 success = parseTransform Arguments(transformValue.get(), string.characters16(), string.length(), argumentStart, expectedArgumentCount);1242 success = parseTransformTranslateArguments(transformValue.get(), string.characters16(), string.length(), argumentStart, expectedArgumentCount); 1243 1243 if (!success) 1244 1244 return false; -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r171677 r171871 4566 4566 AutoConversion = 1 << 2, 4567 4567 PercentConversion = 1 << 3, 4568 FractionConversion = 1 << 4, 4569 CalculatedConversion = 1 << 5 4568 CalculatedConversion = 1 << 4 4570 4569 }; 4571 4570 … … 4580 4579 if ((supported & PercentConversion) && isPercentage()) 4581 4580 return Length(getDoubleValue(), Percent); 4582 if ((supported & FractionConversion) && isNumber())4583 return Length(getDoubleValue() * 100.0, Percent);4584 4581 if ((supported & AutoConversion) && getValueID() == CSSValueAuto) 4585 4582 return Length(Auto); -
trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp
r171591 r171871 231 231 static Length convertToLength(StyleResolver* styleResolver, CSSPrimitiveValue* value) 232 232 { 233 return value->convertToLength<FixedIntegerConversion | PercentConversion | FractionConversion |AutoConversion>(styleResolver->state().cssToLengthConversionData());233 return value->convertToLength<FixedIntegerConversion | PercentConversion | AutoConversion>(styleResolver->state().cssToLengthConversionData()); 234 234 } 235 235 public: -
trunk/Source/WebCore/css/StyleResolver.cpp
r171785 r171871 1465 1465 Length StyleResolver::convertToIntLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData) 1466 1466 { 1467 return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion | FractionConversion>(conversionData) : Length(Undefined);1467 return primitiveValue ? primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined); 1468 1468 } 1469 1469 1470 1470 Length StyleResolver::convertToFloatLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData) 1471 1471 { 1472 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion | FractionConversion>(conversionData) : Length(Undefined);1472 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined); 1473 1473 } 1474 1474 -
trunk/Source/WebCore/css/TransformFunctions.cpp
r169407 r171871 79 79 static Length convertToFloatLength(const CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData) 80 80 { 81 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion | FractionConversion>(conversionData) : Length(Undefined);81 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion>(conversionData) : Length(Undefined); 82 82 } 83 83
Note: See TracChangeset
for help on using the changeset viewer.