Title: [110488] trunk/Source/WebCore
- Revision
- 110488
- Author
- [email protected]
- Date
- 2012-03-12 15:22:59 -0700 (Mon, 12 Mar 2012)
Log Message
clang build fix
* css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::convertToLength): Reorder
boolean operators, so that a warning about "use of logical || with constant operand" doesn't
appear.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110487 => 110488)
--- trunk/Source/WebCore/ChangeLog 2012-03-12 22:17:55 UTC (rev 110487)
+++ trunk/Source/WebCore/ChangeLog 2012-03-12 22:22:59 UTC (rev 110488)
@@ -1,3 +1,11 @@
+2012-03-12 Alexey Proskuryakov <[email protected]>
+
+ clang build fix
+
+ * css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::convertToLength): Reorder
+ boolean operators, so that a warning about "use of logical || with constant operand" doesn't
+ appear.
+
2012-03-12 Abhishek Arya <[email protected]>
Crash in Text::splitText due to mutation events.
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (110487 => 110488)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-03-12 22:17:55 UTC (rev 110487)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-03-12 22:22:59 UTC (rev 110488)
@@ -3720,7 +3720,7 @@
template<int supported> Length CSSPrimitiveValue::convertToLength(RenderStyle* style, RenderStyle* rootStyle, double multiplier, bool computingFontSize)
{
- if (((supported & FixedIntegerConversion) || (supported & FixedFloatConversion)) && isFontRelativeLength() && (!style || !rootStyle))
+ if ((supported & (FixedIntegerConversion | FixedFloatConversion)) && isFontRelativeLength() && (!style || !rootStyle))
return Length(Undefined);
if ((supported & FixedIntegerConversion) && isLength())
return computeLength<Length>(style, rootStyle, multiplier, computingFontSize);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
