Revert of Parse text-decoration shorthand in CSSPropertyParser with CSSParserTokens

Revert of Parse text-decoration shorthand in CSSPropertyParser with CSSParserTokens (patchset #12 id:220001 of https://codereview.chromium.org/1412803007/ )

Reason for revert:
Looks like this cl may be responsible for crbug/551638? Apologies if its not the culprit.

BUG=551638
Original issue's description:
> Parse text-decoration shorthand in CSSPropertyParser with CSSParserTokens
>
> Move text-decoration shorthand property handling from
> LegacyCSSPropertyParser into CSSPropertyParser. Also
> move its related longhands.
>
> This patch adds a generic consumeShorthandGreedily that can be
> used to convert other shorthands.
>
> Finally the patch refuses duplicate keyword entries for text-decoration-line
> (like "blink blink") and adds tests for this to text-decoration-line.html.
>
> BUG=499780
>
> Committed: https://crrev.com/df53d14ebf099ad282ccbdd066e892bb6e5cfdaf
> Cr-Commit-Position: refs/heads/master@{#357842}

TBR=timloh@chromium.org,rob.buis@samsung.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=499780
Committed: https://crrev.com/7d7454951e0ae0e30d12aed3bd24fc9bc3dd02c1
Cr-Commit-Position: refs/heads/master@{#358128}

[michaeln, 2015-11-05 20:10:53]

Created Revert of Parse text-decoration shorthand in CSSPropertyParser with
CSSParserTokens

[commit-bot: I haz the power, 2015-11-05 20:12:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1417733010/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1417733010/1

[commit-bot: I haz the power, 2015-11-05 20:14:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-11-05 20:14:10]

Failed to apply patch for
third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp:1618
  Falling back to three-way merge...
  Applied patch to
'third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp' with
conflicts.
  U third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

Patch:       third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
index
304d82fbd3b8b1c4e6423f95f2c05fca79e6325e..171269f4704087fde1e30b4b2bd7421fe71b7abd
100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -1483,25 +1483,7 @@
         }
         list->append(filterValue.release());
     } while (!range.atEnd());
-    return list.release();
-}
-
-static PassRefPtrWillBeRawPtr<CSSValue>
consumeTextDecorationLine(CSSParserTokenRange& range)
-{
-    CSSValueID id = range.peek().id();
-    if (id == CSSValueNone)
-        return consumeIdent(range);
-
-    RefPtrWillBeRawPtr<CSSValueList> list =
CSSValueList::createSpaceSeparated();
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> ident;
-    while ((ident = consumeIdent<CSSValueBlink, CSSValueUnderline,
CSSValueOverline, CSSValueLineThrough>(range))) {
-        if (list->hasValue(ident.get()))
-            return nullptr;
-        list->append(ident.release());
-    }
-
-    if (!list->length())
-        return nullptr;
+
     return list.release();
 }
 
@@ -1602,9 +1584,6 @@
     case CSSPropertyOrphans:
     case CSSPropertyWidows:
         return consumeWidowsOrOrphans(m_range);
-    case CSSPropertyTextDecorationColor:
-        ASSERT(RuntimeEnabledFeatures::css3TextDecorationsEnabled());
-        return consumeColor(m_range, m_context);
     case CSSPropertyWebkitTextFillColor:
     case CSSPropertyWebkitTapHighlightColor:
         return consumeColor(m_range, m_context);
@@ -1618,9 +1597,6 @@
     case CSSPropertyWebkitFilter:
     case CSSPropertyBackdropFilter:
         return consumeFilter(m_range, m_context);
-    case CSSPropertyWebkitTextDecorationsInEffect:
-    case CSSPropertyTextDecorationLine:
-        return consumeTextDecorationLine(m_range);
     default:
         return nullptr;
     }
@@ -1983,40 +1959,6 @@
     return true;
 }
 
-bool CSSPropertyParser::consumeShorthandGreedily(const StylePropertyShorthand&
shorthand, bool important)
-{
-    ASSERT(shorthand.length() <= 6); // Existing shorthands have at most 6
longhands.
-    RefPtrWillBeRawPtr<CSSValue> longhands[6] = { nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr };
-    const CSSPropertyID* shorthandProperties = shorthand.properties();
-    do {
-        bool foundLonghand = false;
-        for (size_t i = 0; !foundLonghand && i < shorthand.length(); ++i) {
-            if (longhands[i])
-                continue;
-            // TODO: parseSingleValue needs to handle fastpath keywords.
-            if
(CSSParserFastPaths::isKeywordPropertyID(shorthandProperties[i])) {
-                if
(CSSParserFastPaths::isValidKeywordPropertyAndValue(shorthandProperties[i],
m_range.peek().id()))
-                    longhands[i] = consumeIdent(m_range);
-            } else {
-                longhands[i] = parseSingleValue(shorthandProperties[i]);
-            }
-            if (longhands[i])
-                foundLonghand = true;
-        }
-        if (!foundLonghand)
-            return false;
-    } while (!m_range.atEnd());
-
-    ImplicitScope implicitScope(this);
-    for (size_t i = 0; i < shorthand.length(); ++i) {
-        if (longhands[i])
-            addProperty(shorthandProperties[i], longhands[i].release(),
important);
-        else
-            addProperty(shorthandProperties[i],
cssValuePool().createImplicitInitialValue(), important);
-    }
-    return true;
-}
-
 bool CSSPropertyParser::parseShorthand(CSSPropertyID unresolvedProperty, bool
important)
 {
     CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
@@ -2081,17 +2023,6 @@
         return consumeAnimationShorthand(animationShorthandForParsing(),
unresolvedProperty == CSSPropertyAliasWebkitAnimation, important);
     case CSSPropertyTransition:
         return consumeAnimationShorthand(transitionShorthandForParsing(),
false, important);
-    case CSSPropertyTextDecoration: {
-        // Fall through 'text-decoration-line' parsing if CSS 3 Text Decoration
-        // is disabled to match CSS 2.1 rules for parsing 'text-decoration'.
-        if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
-            return consumeShorthandGreedily(textDecorationShorthand(),
important);
-        RefPtrWillBeRawPtr<CSSValue> textDecoration =
consumeTextDecorationLine(m_range);
-        if (!textDecoration || !m_range.atEnd())
-            return false;
-        addProperty(CSSPropertyTextDecoration, textDecoration.release(),
important);
-        return true;
-    }
     default:
         m_currentShorthand = oldShorthand;
         return false;

[commit-bot: I haz the power, 2015-11-05 20:15:38]

The CQ bit was unchecked by commit-bot@chromium.org

[michaeln, 2015-11-05 21:09:44]

Description was changed from

==========
Revert of Parse text-decoration shorthand in CSSPropertyParser with
CSSParserTokens (patchset #12 id:220001 of
https://codereview.chromium.org/1412803007/ )

Reason for revert:
Looks like this cl may be responsible for crbug/551638? Apologies if its not the
culprit.

Original issue's description:
> Parse text-decoration shorthand in CSSPropertyParser with CSSParserTokens
> 
> Move text-decoration shorthand property handling from
> LegacyCSSPropertyParser into CSSPropertyParser. Also
> move its related longhands.
> 
> This patch adds a generic consumeShorthandGreedily that can be
> used to convert other shorthands.
> 
> Finally the patch refuses duplicate keyword entries for text-decoration-line
> (like "blink blink") and adds tests for this to text-decoration-line.html.
> 
> BUG=499780
> 
> Committed: https://crrev.com/df53d14ebf099ad282ccbdd066e892bb6e5cfdaf
> Cr-Commit-Position: refs/heads/master@{#357842}

TBR=timloh@chromium.org,rob.buis@samsung.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=499780
==========

to

==========
Revert of Parse text-decoration shorthand in CSSPropertyParser with
CSSParserTokens (patchset #12 id:220001 of
https://codereview.chromium.org/1412803007/ )

Reason for revert:
Looks like this cl may be responsible for crbug/551638? Apologies if its not the
culprit.

BUG=551638

Original issue's description:
> Parse text-decoration shorthand in CSSPropertyParser with CSSParserTokens
> 
> Move text-decoration shorthand property handling from
> LegacyCSSPropertyParser into CSSPropertyParser. Also
> move its related longhands.
> 
> This patch adds a generic consumeShorthandGreedily that can be
> used to convert other shorthands.
> 
> Finally the patch refuses duplicate keyword entries for text-decoration-line
> (like "blink blink") and adds tests for this to text-decoration-line.html.
> 
> BUG=499780
> 
> Committed: https://crrev.com/df53d14ebf099ad282ccbdd066e892bb6e5cfdaf
> Cr-Commit-Position: refs/heads/master@{#357842}

TBR=timloh@chromium.org,rob.buis@samsung.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=499780
==========

[michaeln, 2015-11-05 21:09:56]

The CQ bit was checked by michaeln@chromium.org

[commit-bot: I haz the power, 2015-11-05 21:10:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1417733010/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1417733010/1

[commit-bot: I haz the power, 2015-11-05 21:12:32]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-11-05 21:13:11]

Patchset 1 (id:??) landed as
https://crrev.com/7d7454951e0ae0e30d12aed3bd24fc9bc3dd02c1
Cr-Commit-Position: refs/heads/master@{#358128}