Add CSS support for text-decoration-skip

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1103 matching lines @@
     case TextDecorationStyleDashed:
       return CSSIdentifierValue::create(CSSValueDashed);
     case TextDecorationStyleWavy:
       return CSSIdentifierValue::create(CSSValueWavy);
   }
 
   ASSERT_NOT_REACHED();
   return CSSInitialValue::create();
 }
 
+static CSSValue* valueForTextDecorationSkip(
+    TextDecorationSkip textDecorationSkip) {
+  CSSValueList* list = CSSValueList::createSpaceSeparated();
+  if (textDecorationSkip & TextDecorationSkipObjects)
+    list->append(*CSSIdentifierValue::create(CSSValueObjects));
+  if (textDecorationSkip & TextDecorationSkipInk)
+    list->append(*CSSIdentifierValue::create(CSSValueInk));
+
+  if (!list->length())
+    return CSSIdentifierValue::create(CSSValueObjects);

[Timothy Loh, 2016/10/11 00:00:33]

Maybe better to DCHECK(list->length()) for now instead?

[drott, 2016/10/11 07:15:27]

Done.

+  return list;
+}
+
 static CSSValue* touchActionFlagsToCSSValue(TouchAction touchAction) {
   CSSValueList* list = CSSValueList::createSpaceSeparated();
   if (touchAction == TouchActionAuto) {
     list->append(*CSSIdentifierValue::create(CSSValueAuto));
   } else if (touchAction == TouchActionNone) {
     list->append(*CSSIdentifierValue::create(CSSValueNone));
   } else if (touchAction == TouchActionManipulation) {
     list->append(*CSSIdentifierValue::create(CSSValueManipulation));
   } else {
     if ((touchAction & TouchActionPanX) == TouchActionPanX)
@@ skipping 1533 matching lines @@
     case CSSPropertyTextAlignLast:
       return CSSIdentifierValue::create(style.getTextAlignLast());
     case CSSPropertyTextDecoration:
       if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
         return valuesForShorthandProperty(textDecorationShorthand(), style,
                                           layoutObject, styledNode,
                                           allowVisitedStyle);
     // Fall through.
     case CSSPropertyTextDecorationLine:
       return renderTextDecorationFlagsToCSSValue(style.getTextDecoration());
+    case CSSPropertyTextDecorationSkip:
+      return valueForTextDecorationSkip(style.getTextDecorationSkip());
     case CSSPropertyTextDecorationStyle:
       return valueForTextDecorationStyle(style.getTextDecorationStyle());
     case CSSPropertyTextDecorationColor:
       return currentColorOrValidColor(style, style.textDecorationColor());
     case CSSPropertyTextJustify:
       return CSSIdentifierValue::create(style.getTextJustify());
     case CSSPropertyTextUnderlinePosition:
       return CSSIdentifierValue::create(style.getTextUnderlinePosition());
     case CSSPropertyWebkitTextDecorationsInEffect:
       return renderTextDecorationFlagsToCSSValue(
@@ skipping 912 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink