Title: [125489] trunk/Source/WebCore
- Revision
- 125489
- Author
- [email protected]
- Date
- 2012-08-13 18:27:21 -0700 (Mon, 13 Aug 2012)
Log Message
Unreviewed, rolling out r124970.
http://trac.webkit.org/changeset/124970
https://bugs.webkit.org/show_bug.cgi?id=93495
Postponing the merge in a clearer context (Requested by
Michelangelo on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-08-13
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseTransform):
* css/CSSParser.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125488 => 125489)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 01:24:46 UTC (rev 125488)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 01:27:21 UTC (rev 125489)
@@ -1,3 +1,17 @@
+2012-08-13 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r124970.
+ http://trac.webkit.org/changeset/124970
+ https://bugs.webkit.org/show_bug.cgi?id=93495
+
+ Postponing the merge in a clearer context (Requested by
+ Michelangelo on #webkit).
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseTransform):
+ * css/CSSParser.h:
+
2012-08-12 Shawn Singh <[email protected]>
[chromium] renderSurface in incorrect space if owning layer has empty but non-zero bounds
Modified: trunk/Source/WebCore/css/CSSParser.cpp (125488 => 125489)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-08-14 01:24:46 UTC (rev 125488)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-08-14 01:27:21 UTC (rev 125489)
@@ -2320,9 +2320,9 @@
if (id == CSSValueNone)
validPrimitive = true;
else {
- RefPtr<CSSValue> transformValue = parseTransform(m_valueList.get());
- if (transformValue) {
- addProperty(propId, transformValue.release(), important);
+ PassRefPtr<CSSValue> val = parseTransform();
+ if (val) {
+ addProperty(propId, val, important);
return true;
}
return false;
@@ -7266,15 +7266,15 @@
CSSParser::Units m_unit;
};
-PassRefPtr<CSSValueList> CSSParser::parseTransform(CSSParserValueList* valueList)
+PassRefPtr<CSSValueList> CSSParser::parseTransform()
{
- if (!valueList)
+ if (!m_valueList)
return 0;
// The transform is a list of functional primitives that specify transform operations.
// We collect a list of WebKitCSSTransformValues, where each value specifies a single operation.
RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
- for (CSSParserValue* value = valueList->current(); value; value = valueList->next()) {
+ for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
if (value->unit != CSSParserValue::Function || !value->function)
return 0;
Modified: trunk/Source/WebCore/css/CSSParser.h (125488 => 125489)
--- trunk/Source/WebCore/css/CSSParser.h 2012-08-14 01:24:46 UTC (rev 125488)
+++ trunk/Source/WebCore/css/CSSParser.h 2012-08-14 01:27:21 UTC (rev 125489)
@@ -225,7 +225,7 @@
static bool isBlendMode(int ident);
static bool isCompositeOperator(int ident);
- PassRefPtr<CSSValueList> parseTransform(CSSParserValueList*);
+ PassRefPtr<CSSValueList> parseTransform();
bool parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
bool parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
