Changeset 276205 in webkit

Timestamp:

Apr 17, 2021, 1:16:22 PM (5 years ago)

Author:

basuke.suzuki@sony.com

Message:

[clang 11] Remove warning when converting WebCore::maxValueForCssLength from int to float
​https://bugs.webkit.org/show_bug.cgi?id=224714

Reviewed by Chris Dumez.

On clang 11, the conversion from const int WebCore::maxValueForCssLength (= 33554429) to
float generates conversion warning:

warning: implicit conversion from 'const int' to 'float' changes value from 33554429 to 33554428

Changing the target type from float to double works for this. Length constructor accept double
so that there's no drawback with this change.

No test because it's compiler behavior.

• style/StyleBuilderConverter.h:

(WebCore::Style::BuilderConverter::convertWordSpacing):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValue.cpp (modified) (1 diff)
• style/StyleBuilderConverter.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Basuke Suzuki  <basuke.suzuki@sony.com>
+
+        [clang 11] Remove warning when converting WebCore::maxValueForCssLength from int to float
+        https://bugs.webkit.org/show_bug.cgi?id=224714
+
+        Reviewed by Chris Dumez.
+
+        On clang 11, the conversion from const int WebCore::maxValueForCssLength (= 33554429) to
+        float generates conversion warning: 
+        > warning: implicit conversion from 'const int' to 'float' changes value from 33554429 to 33554428
+
+        Changing the target type from float to double works for this. Length constructor accept double
+        so that there's no drawback with this change.
+
+        No test because it's compiler behavior.
+
+        * style/StyleBuilderConverter.h:
+        (WebCore::Style::BuilderConverter::convertWordSpacing):
+
 2021-04-17  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -543 +543 @@
 template<> Length CSSPrimitiveValue::computeLength(const CSSToLengthConversionData& conversionData) const
 {
-    return Length(clampTo<float>(computeLengthDouble(conversionData), minValueForCssLength, maxValueForCssLength), LengthType::Fixed);
+    return Length(clampTo<double>(computeLengthDouble(conversionData), minValueForCssLength, maxValueForCssLength), LengthType::Fixed);
 }
 

trunk/Source/WebCore/style/StyleBuilderConverter.h

@@ -1213 +1213 @@
         wordSpacing = primitiveValue.computeLength<Length>(csstoLengthConversionDataWithTextZoomFactor(builderState));
     else if (primitiveValue.isPercentage())
-        wordSpacing = Length(clampTo<float>(primitiveValue.doubleValue(), minValueForCssLength, maxValueForCssLength), LengthType::Percent);
+        wordSpacing = Length(clampTo<double>(primitiveValue.doubleValue(), minValueForCssLength, maxValueForCssLength), LengthType::Percent);
     else if (primitiveValue.isNumber())
         wordSpacing = Length(primitiveValue.doubleValue(), LengthType::Fixed);