Title: [108352] trunk/Source/WebCore
- Revision
- 108352
- Author
- [email protected]
- Date
- 2012-02-21 07:31:14 -0800 (Tue, 21 Feb 2012)
Log Message
Remove stylesheet pointer from StylePropertySet
https://bugs.webkit.org/show_bug.cgi?id=79092
Patch by Alexander Færøy <[email protected]> on 2012-02-21
Reviewed by Csaba Osztrogonác.
Qt buildfix after r108345.
* css/CSSParser.cpp:
(WebCore::parseColorValue):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108351 => 108352)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 15:14:49 UTC (rev 108351)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 15:31:14 UTC (rev 108352)
@@ -1,3 +1,15 @@
+2012-02-21 Alexander Færøy <[email protected]>
+
+ Remove stylesheet pointer from StylePropertySet
+ https://bugs.webkit.org/show_bug.cgi?id=79092
+
+ Reviewed by Csaba Osztrogonác.
+
+ Qt buildfix after r108345.
+
+ * css/CSSParser.cpp:
+ (WebCore::parseColorValue):
+
2012-02-21 Csaba Osztrogonác <[email protected]>
Remove stylesheet pointer from StylePropertySet
Modified: trunk/Source/WebCore/css/CSSParser.cpp (108351 => 108352)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-02-21 15:14:49 UTC (rev 108351)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-02-21 15:31:14 UTC (rev 108352)
@@ -348,14 +348,22 @@
Document* document = contextStyleSheet->findDocument();
if (validPrimitive) {
- RefPtr<CSSValue> value = document ? document->cssValuePool()->createIdentifierValue(valueID) : CSSPrimitiveValue::createIdentifier(valueID);
+ RefPtr<CSSValue> value;
+ if (document)
+ value = document->cssValuePool()->createIdentifierValue(valueID);
+ else
+ value = CSSPrimitiveValue::createIdentifier(valueID);
declaration->addParsedProperty(CSSProperty(propertyId, value.release(), important));
return true;
}
RGBA32 color;
if (!CSSParser::fastParseColor(color, string, strict && string[0] != '#'))
return false;
- RefPtr<CSSValue> value = document ? document->cssValuePool()->createColorValue(color) : CSSPrimitiveValue::createColor(color);
+ RefPtr<CSSValue> value;
+ if (document)
+ value = document->cssValuePool()->createColorValue(color);
+ else
+ value = CSSPrimitiveValue::createColor(color);
declaration->addParsedProperty(CSSProperty(propertyId, value.release(), important));
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
