Title: [151597] trunk/Source/WebCore
- Revision
- 151597
- Author
- [email protected]
- Date
- 2013-06-14 09:36:45 -0700 (Fri, 14 Jun 2013)
Log Message
CSSParser::parseImageSet() doesn't need a parameter.
https://bugs.webkit.org/show_bug.cgi?id=117617
Patch by Jaehun Lim <[email protected]> on 2013-06-14
Reviewed by Darin Adler.
parseImageSet() can get m_valueList directly.
And minor fixes.
No new tests, no behavior change.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseContent):
(WebCore::CSSParser::parseFillImage):
(WebCore::CSSParser::parseBorderImage):
(WebCore::CSSParser::parseImageSet):
* css/CSSParser.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151596 => 151597)
--- trunk/Source/WebCore/ChangeLog 2013-06-14 16:25:51 UTC (rev 151596)
+++ trunk/Source/WebCore/ChangeLog 2013-06-14 16:36:45 UTC (rev 151597)
@@ -1,3 +1,23 @@
+2013-06-14 Jaehun Lim <[email protected]>
+
+ CSSParser::parseImageSet() doesn't need a parameter.
+ https://bugs.webkit.org/show_bug.cgi?id=117617
+
+ Reviewed by Darin Adler.
+
+ parseImageSet() can get m_valueList directly.
+ And minor fixes.
+
+ No new tests, no behavior change.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseContent):
+ (WebCore::CSSParser::parseFillImage):
+ (WebCore::CSSParser::parseBorderImage):
+ (WebCore::CSSParser::parseImageSet):
+ * css/CSSParser.h:
+
2013-06-14 Tiancheng Jiang <[email protected]>
[BlackBerry] Dropdown button UX updates.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (151596 => 151597)
--- trunk/Source/WebCore/css/CSSParser.cpp 2013-06-14 16:25:51 UTC (rev 151596)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-06-14 16:36:45 UTC (rev 151597)
@@ -2032,7 +2032,7 @@
image = CSSImageValue::create(completeURL(uri));
#if ENABLE(CSS_IMAGE_SET) && ENABLE(MOUSE_CURSOR_SCALE)
} else if (value->unit == CSSParserValue::Function && equalIgnoringCase(value->function->name, "-webkit-image-set(")) {
- image = parseImageSet(m_valueList.get());
+ image = parseImageSet();
if (!image)
break;
#endif
@@ -2164,7 +2164,7 @@
}
#if ENABLE(CSS_IMAGE_SET)
else if (value->unit == CSSParserValue::Function && equalIgnoringCase(value->function->name, "-webkit-image-set(")) {
- parsedValue = parseImageSet(m_valueList.get());
+ parsedValue = parseImageSet();
if (!parsedValue)
return false;
m_valueList->next();
@@ -3737,7 +3737,7 @@
return false;
#if ENABLE(CSS_IMAGE_SET)
} else if (equalIgnoringCase(val->function->name, "-webkit-image-set(")) {
- parsedValue = parseImageSet(m_valueList.get());
+ parsedValue = parseImageSet();
if (!parsedValue)
return false;
#endif
@@ -3830,7 +3830,7 @@
#if ENABLE(CSS_IMAGE_SET)
if (valueList->current()->unit == CSSParserValue::Function && equalIgnoringCase(valueList->current()->function->name, "-webkit-image-set(")) {
- value = parseImageSet(m_valueList.get());
+ value = parseImageSet();
if (value)
return true;
}
@@ -6737,7 +6737,7 @@
return false;
#if ENABLE(CSS_IMAGE_SET)
} else if (val->unit == CSSParserValue::Function && equalIgnoringCase(val->function->name, "-webkit-image-set(")) {
- RefPtr<CSSValue> value = parseImageSet(m_valueList.get());
+ RefPtr<CSSValue> value = parseImageSet();
if (value)
context.commitImage(value.release());
else
@@ -8022,27 +8022,22 @@
#endif
#if ENABLE(CSS_IMAGE_SET)
-PassRefPtr<CSSValue> CSSParser::parseImageSet(CSSParserValueList* valueList)
+PassRefPtr<CSSValue> CSSParser::parseImageSet()
{
- CSSParserValue* function = valueList->current();
+ CSSParserValue* value = m_valueList->current();
+ ASSERT(value->unit == CSSParserValue::Function);
- if (function->unit != CSSParserValue::Function)
- return 0;
-
- CSSParserValueList* functionArgs = valueList->current()->function->args.get();
+ CSSParserValueList* functionArgs = value->function->args.get();
if (!functionArgs || !functionArgs->size() || !functionArgs->current())
return 0;
RefPtr<CSSImageSetValue> imageSet = CSSImageSetValue::create();
-
CSSParserValue* arg = functionArgs->current();
while (arg) {
if (arg->unit != CSSPrimitiveValue::CSS_URI)
return 0;
- RefPtr<CSSImageValue> image = CSSImageValue::create(completeURL(arg->string));
- imageSet->append(image);
-
+ imageSet->append(CSSImageValue::create(completeURL(arg->string)));
arg = functionArgs->next();
if (!arg || arg->unit != CSSPrimitiveValue::CSS_DIMENSION)
return 0;
Modified: trunk/Source/WebCore/css/CSSParser.h (151596 => 151597)
--- trunk/Source/WebCore/css/CSSParser.h 2013-06-14 16:25:51 UTC (rev 151596)
+++ trunk/Source/WebCore/css/CSSParser.h 2013-06-14 16:36:45 UTC (rev 151597)
@@ -240,7 +240,7 @@
#endif
#if ENABLE(CSS_IMAGE_SET)
- PassRefPtr<CSSValue> parseImageSet(CSSParserValueList*);
+ PassRefPtr<CSSValue> parseImageSet();
#endif
#if ENABLE(CSS_FILTERS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes