Title: [193526] branches/safari-601-branch/Source/WebCore
- Revision
- 193526
- Author
- matthew_han...@apple.com
- Date
- 2015-12-05 11:54:25 -0800 (Sat, 05 Dec 2015)
Log Message
Merge r191155. rdar://problem/23772908
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193525 => 193526)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 19:54:21 UTC (rev 193525)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 19:54:25 UTC (rev 193526)
@@ -1,5 +1,21 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r191155. rdar://problem/23772908
+
+ 2015-10-15 David Hyatt <hy...@apple.com>
+
+ Patch parseKeywordValue to accept "unset" so that it goes down the faster parsing path.
+ https://bugs.webkit.org/show_bug.cgi?id=150213
+
+ Reviewed by Dean Jackson.
+
+ No new tests as correctness doesn't change (just speed).
+
+ * css/CSSParser.cpp:
+ (WebCore::parseKeywordValue):
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r191151. rdar://problem/23772904
2015-10-15 David Hyatt <hy...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193525 => 193526)
--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 19:54:21 UTC (rev 193525)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 19:54:25 UTC (rev 193526)
@@ -1191,10 +1191,10 @@
if (!isKeywordPropertyID(propertyId)) {
// All properties accept the values of "initial" and "inherit".
String lowerCaseString = string.lower();
- if (lowerCaseString != "initial" && lowerCaseString != "inherit")
+ if (lowerCaseString != "initial" && lowerCaseString != "inherit" && lowerCaseString != "unset")
return CSSParser::ParseResult::Error;
- // Parse initial/inherit shorthands using the CSSParser.
+ // Parse initial/inherit/unset shorthands using the CSSParser.
if (shorthandForProperty(propertyId).length())
return CSSParser::ParseResult::Error;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
