Changeset 213561 in webkit

Timestamp:

Mar 7, 2017, 7:15:02 PM (8 years ago)

Author:

Simon Fraser

Message:

Parsing -webkit-hyphenate-character uses confusingly named consumeLocale()
​https://bugs.webkit.org/show_bug.cgi?id=168638

Reviewed by Zalan Bujtas.

Parsing CSSPropertyWebkitHyphenateCharacter very confusingly called consumeLocale(),
which is really just "consume the 'auto' ident or a string", so rename that function.

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeAutoOrString):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::consumeLocale): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/parser/CSSPropertyParser.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Parsing -webkit-hyphenate-character uses confusingly named consumeLocale()
+        https://bugs.webkit.org/show_bug.cgi?id=168638
+
+        Reviewed by Zalan Bujtas.
+
+        Parsing CSSPropertyWebkitHyphenateCharacter very confusingly called consumeLocale(),
+        which is really just "consume the 'auto' ident or a string", so rename that function.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeAutoOrString):
+        (WebCore::CSSPropertyParser::parseSingleValue):
+        (WebCore::consumeLocale): Deleted.
+
 2017-03-07  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -1379 +1379 @@
 }
 
-static RefPtr<CSSValue> consumeLocale(CSSParserTokenRange& range)
+static RefPtr<CSSValue> consumeAutoOrString(CSSParserTokenRange& range)
 {
     if (range.peek().id() == CSSValueAuto)
@@ -3923 +3923 @@
     case CSSPropertyWebkitHyphenateCharacter:
     case CSSPropertyWebkitLocale:
-        return consumeLocale(m_range);
+        return consumeAutoOrString(m_range);
     case CSSPropertyWebkitHyphenateLimitBefore:
     case CSSPropertyWebkitHyphenateLimitAfter: