Modified: trunk/Source/WebCore/ChangeLog (104575 => 104576)
--- trunk/Source/WebCore/ChangeLog 2012-01-10 15:48:40 UTC (rev 104575)
+++ trunk/Source/WebCore/ChangeLog 2012-01-10 15:58:31 UTC (rev 104576)
@@ -1,3 +1,20 @@
+2012-01-10 Zoltan Herczeg <[email protected]>
+
+ Fix style errors in CSSParser.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=75854
+
+ Reviewed by Nikolas Zimmermann.
+
+ Minor style fixes.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseShadow):
+ (WebCore::isBorderImageRepeatKeyword):
+ (WebCore::BorderImageSliceParseContext::commitBorderImageSlice):
+ (WebCore::BorderImageQuadParseContext::commitBorderImageQuad):
+ (WebCore::filterInfoForName):
+
2012-01-10 Julien Chaffraix <[email protected]>
REGRESSION (r93614): Safari Reader doesn't repaint correctly when scrolling
Modified: trunk/Source/WebCore/css/CSSParser.cpp (104575 => 104576)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-01-10 15:48:40 UTC (rev 104575)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-01-10 15:58:31 UTC (rev 104576)
@@ -906,28 +906,28 @@
break;
case CSSPropertyPosition: // static | relative | absolute | fixed | inherit
- if (id == CSSValueStatic ||
- id == CSSValueRelative ||
- id == CSSValueAbsolute ||
- id == CSSValueFixed)
+ if (id == CSSValueStatic
+ || id == CSSValueRelative
+ || id == CSSValueAbsolute
+ || id == CSSValueFixed)
validPrimitive = true;
break;
- case CSSPropertyPageBreakAfter: // auto | always | avoid | left | right | inherit
+ case CSSPropertyPageBreakAfter: // auto | always | avoid | left | right | inherit
case CSSPropertyPageBreakBefore:
case CSSPropertyWebkitColumnBreakAfter:
case CSSPropertyWebkitColumnBreakBefore:
case CSSPropertyWebkitRegionBreakAfter:
case CSSPropertyWebkitRegionBreakBefore:
- if (id == CSSValueAuto ||
- id == CSSValueAlways ||
- id == CSSValueAvoid ||
- id == CSSValueLeft ||
- id == CSSValueRight)
+ if (id == CSSValueAuto
+ || id == CSSValueAlways
+ || id == CSSValueAvoid
+ || id == CSSValueLeft
+ || id == CSSValueRight)
validPrimitive = true;
break;
- case CSSPropertyPageBreakInside: // avoid | auto | inherit
+ case CSSPropertyPageBreakInside: // avoid | auto | inherit
case CSSPropertyWebkitColumnBreakInside:
case CSSPropertyWebkitRegionBreakInside:
if (id == CSSValueAuto || id == CSSValueAvoid)
@@ -935,8 +935,8 @@
break;
case CSSPropertyEmptyCells: // show | hide | inherit
- if (id == CSSValueShow ||
- id == CSSValueHide)
+ if (id == CSSValueShow
+ || id == CSSValueHide)
validPrimitive = true;
break;
@@ -945,11 +945,11 @@
return parseContent(propId, important);
case CSSPropertyWhiteSpace: // normal | pre | nowrap | inherit
- if (id == CSSValueNormal ||
- id == CSSValuePre ||
- id == CSSValuePreWrap ||
- id == CSSValuePreLine ||
- id == CSSValueNowrap)
+ if (id == CSSValueNormal
+ || id == CSSValuePre
+ || id == CSSValuePreWrap
+ || id == CSSValuePreLine
+ || id == CSSValueNowrap)
validPrimitive = true;
break;
@@ -1036,8 +1036,8 @@
break;
case CSSPropertyClear: // none | left | right | both | inherit
- if (id == CSSValueNone || id == CSSValueLeft ||
- id == CSSValueRight|| id == CSSValueBoth)
+ if (id == CSSValueNone || id == CSSValueLeft
+ || id == CSSValueRight|| id == CSSValueBoth)
validPrimitive = true;
break;
@@ -1045,7 +1045,7 @@
// left | right | center | justify | webkit_left | webkit_right | webkit_center | webkit_match_parent |
// start | end | <string> | inherit
if ((id >= CSSValueWebkitAuto && id <= CSSValueWebkitMatchParent) || id == CSSValueStart || id == CSSValueEnd
- || value->unit == CSSPrimitiveValue::CSS_STRING)
+ || value->unit == CSSPrimitiveValue::CSS_STRING)
validPrimitive = true;
break;
@@ -1408,7 +1408,7 @@
return parseCounter(propId, 1, important);
validPrimitive = true;
break;
- case CSSPropertyCounterReset: // [ <identifier> <integer>? ]+ | none | inherit
+ case CSSPropertyCounterReset: // [ <identifier> <integer>? ]+ | none | inherit
if (id != CSSValueNone)
return parseCounter(propId, 0, important);
validPrimitive = true;
@@ -2009,7 +2009,7 @@
case CSSPropertyWebkitTapHighlightColor:
if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMenu
|| (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && !m_strict)) {
- validPrimitive = true;
+ validPrimitive = true;
} else {
parsedValue = parseColor();
if (parsedValue)
@@ -5170,7 +5170,7 @@
if (!parsedColor || !context.allowColor)
return 0; // This value is not a color or length and is invalid or
- // it is a color, but a color isn't allowed at this point.
+ // it is a color, but a color isn't allowed at this point.
context.commitColor(parsedColor.release());
}
@@ -5458,7 +5458,7 @@
static bool isBorderImageRepeatKeyword(int id)
{
- return id == CSSValueStretch || id == CSSValueRepeat || id == CSSValueSpace || id == CSSValueRound;
+ return id == CSSValueStretch || id == CSSValueRepeat || id == CSSValueSpace || id == CSSValueRound;
}
bool CSSParser::parseBorderImageRepeat(RefPtr<CSSValue>& result)
@@ -5543,7 +5543,7 @@
m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right->primitiveType());
}
if (!m_left)
- m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right->primitiveType());
+ m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right->primitiveType());
// Now build a rect value to hold all four of our primitive values.
RefPtr<Quad> quad = Quad::create();
@@ -5659,7 +5659,7 @@
m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right->primitiveType());
}
if (!m_left)
- m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right->primitiveType());
+ m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), (CSSPrimitiveValue::UnitTypes)m_right->primitiveType());
// Now build a quad value to hold all four of our primitive values.
RefPtr<Quad> quad = Quad::create();
@@ -6619,7 +6619,7 @@
else if (equalIgnoringCase(name, "sepia("))
filterType = WebKitCSSFilterValue::SepiaFilterOperation;
else if (equalIgnoringCase(name, "saturate("))
- filterType = WebKitCSSFilterValue::SaturateFilterOperation;
+ filterType = WebKitCSSFilterValue::SaturateFilterOperation;
else if (equalIgnoringCase(name, "hue-rotate("))
filterType = WebKitCSSFilterValue::HueRotateFilterOperation;
else if (equalIgnoringCase(name, "invert("))
