| Index: third_party/WebKit/Source/core/css/StyleColor.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/StyleColor.cpp b/third_party/WebKit/Source/core/css/StyleColor.cpp
|
| index 98afa0190b0e49ed9a90be1ad356c424ad23603a..2ce0f3901d285a79f08b53615b6ecdfbe656a4cc 100644
|
| --- a/third_party/WebKit/Source/core/css/StyleColor.cpp
|
| +++ b/third_party/WebKit/Source/core/css/StyleColor.cpp
|
| @@ -16,6 +16,7 @@ Color StyleColor::colorFromKeyword(CSSValueID keyword) {
|
| return LayoutTheme::theme().systemColor(keyword);
|
| }
|
|
|
| +// TODO(sashab): Generate this function.
|
| bool StyleColor::isColorKeyword(CSSValueID id) {
|
| // Named colors and color keywords:
|
| //
|
| @@ -39,14 +40,114 @@ bool StyleColor::isColorKeyword(CSSValueID id) {
|
| // '-webkit-focus-ring-color'
|
| // '-internal-quirk-inherit'
|
| //
|
| - return (id >= CSSValueAqua && id <= CSSValueInternalQuirkInherit) ||
|
| - (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) ||
|
| - id == CSSValueMenu;
|
| + return id == CSSValueAqua || id == CSSValueBlack || id == CSSValueBlue ||
|
| + id == CSSValueFuchsia || id == CSSValueGray || id == CSSValueGreen ||
|
| + id == CSSValueLime || id == CSSValueMaroon || id == CSSValueNavy ||
|
| + id == CSSValueOlive || id == CSSValueOrange || id == CSSValuePurple ||
|
| + id == CSSValueRed || id == CSSValueSilver || id == CSSValueTeal ||
|
| + id == CSSValueWhite || id == CSSValueYellow ||
|
| + id == CSSValueTransparent || id == CSSValueWebkitLink ||
|
| + id == CSSValueWebkitActivelink || id == CSSValueActiveborder ||
|
| + id == CSSValueActivecaption || id == CSSValueAppworkspace ||
|
| + id == CSSValueBackground || id == CSSValueButtonface ||
|
| + id == CSSValueButtonhighlight || id == CSSValueButtonshadow ||
|
| + id == CSSValueButtontext || id == CSSValueCaptiontext ||
|
| + id == CSSValueGraytext || id == CSSValueHighlight ||
|
| + id == CSSValueHighlighttext || id == CSSValueInactiveborder ||
|
| + id == CSSValueInactivecaption || id == CSSValueInactivecaptiontext ||
|
| + id == CSSValueInfobackground || id == CSSValueInfotext ||
|
| + id == CSSValueMenutext || id == CSSValueScrollbar ||
|
| + id == CSSValueThreeddarkshadow || id == CSSValueThreedface ||
|
| + id == CSSValueThreedhighlight || id == CSSValueThreedlightshadow ||
|
| + id == CSSValueThreedshadow || id == CSSValueWindow ||
|
| + id == CSSValueWindowframe || id == CSSValueWindowtext ||
|
| + id == CSSValueInternalActiveListBoxSelection ||
|
| + id == CSSValueInternalActiveListBoxSelectionText ||
|
| + id == CSSValueInternalInactiveListBoxSelection ||
|
| + id == CSSValueInternalInactiveListBoxSelectionText ||
|
| + id == CSSValueWebkitFocusRingColor || id == CSSValueCurrentcolor ||
|
| + id == CSSValueGrey || id == CSSValueInternalQuirkInherit ||
|
| + id == CSSValueAliceblue || id == CSSValueAntiquewhite ||
|
| + id == CSSValueAquamarine || id == CSSValueAzure ||
|
| + id == CSSValueBeige || id == CSSValueBisque ||
|
| + id == CSSValueBlanchedalmond || id == CSSValueBlueviolet ||
|
| + id == CSSValueBrown || id == CSSValueBurlywood ||
|
| + id == CSSValueCadetblue || id == CSSValueChartreuse ||
|
| + id == CSSValueChocolate || id == CSSValueCoral ||
|
| + id == CSSValueCornflowerblue || id == CSSValueCornsilk ||
|
| + id == CSSValueCrimson || id == CSSValueCyan ||
|
| + id == CSSValueDarkblue || id == CSSValueDarkcyan ||
|
| + id == CSSValueDarkgoldenrod || id == CSSValueDarkgray ||
|
| + id == CSSValueDarkgreen || id == CSSValueDarkgrey ||
|
| + id == CSSValueDarkkhaki || id == CSSValueDarkmagenta ||
|
| + id == CSSValueDarkolivegreen || id == CSSValueDarkorange ||
|
| + id == CSSValueDarkorchid || id == CSSValueDarkred ||
|
| + id == CSSValueDarksalmon || id == CSSValueDarkseagreen ||
|
| + id == CSSValueDarkslateblue || id == CSSValueDarkslategray ||
|
| + id == CSSValueDarkslategrey || id == CSSValueDarkturquoise ||
|
| + id == CSSValueDarkviolet || id == CSSValueDeeppink ||
|
| + id == CSSValueDeepskyblue || id == CSSValueDimgray ||
|
| + id == CSSValueDimgrey || id == CSSValueDodgerblue ||
|
| + id == CSSValueFirebrick || id == CSSValueFloralwhite ||
|
| + id == CSSValueForestgreen || id == CSSValueGainsboro ||
|
| + id == CSSValueGhostwhite || id == CSSValueGold ||
|
| + id == CSSValueGoldenrod || id == CSSValueGreenyellow ||
|
| + id == CSSValueHoneydew || id == CSSValueHotpink ||
|
| + id == CSSValueIndianred || id == CSSValueIndigo ||
|
| + id == CSSValueIvory || id == CSSValueKhaki || id == CSSValueLavender ||
|
| + id == CSSValueLavenderblush || id == CSSValueLawngreen ||
|
| + id == CSSValueLemonchiffon || id == CSSValueLightblue ||
|
| + id == CSSValueLightcoral || id == CSSValueLightcyan ||
|
| + id == CSSValueLightgoldenrodyellow || id == CSSValueLightgray ||
|
| + id == CSSValueLightgreen || id == CSSValueLightgrey ||
|
| + id == CSSValueLightpink || id == CSSValueLightsalmon ||
|
| + id == CSSValueLightseagreen || id == CSSValueLightskyblue ||
|
| + id == CSSValueLightslategray || id == CSSValueLightslategrey ||
|
| + id == CSSValueLightsteelblue || id == CSSValueLightyellow ||
|
| + id == CSSValueLimegreen || id == CSSValueLinen ||
|
| + id == CSSValueMagenta || id == CSSValueMediumaquamarine ||
|
| + id == CSSValueMediumblue || id == CSSValueMediumorchid ||
|
| + id == CSSValueMediumpurple || id == CSSValueMediumseagreen ||
|
| + id == CSSValueMediumslateblue || id == CSSValueMediumspringgreen ||
|
| + id == CSSValueMediumturquoise || id == CSSValueMediumvioletred ||
|
| + id == CSSValueMidnightblue || id == CSSValueMintcream ||
|
| + id == CSSValueMistyrose || id == CSSValueMoccasin ||
|
| + id == CSSValueNavajowhite || id == CSSValueOldlace ||
|
| + id == CSSValueOlivedrab || id == CSSValueOrangered ||
|
| + id == CSSValueOrchid || id == CSSValuePalegoldenrod ||
|
| + id == CSSValuePalegreen || id == CSSValuePaleturquoise ||
|
| + id == CSSValuePalevioletred || id == CSSValuePapayawhip ||
|
| + id == CSSValuePeachpuff || id == CSSValuePeru || id == CSSValuePink ||
|
| + id == CSSValuePlum || id == CSSValuePowderblue ||
|
| + id == CSSValueRebeccapurple || id == CSSValueRosybrown ||
|
| + id == CSSValueRoyalblue || id == CSSValueSaddlebrown ||
|
| + id == CSSValueSalmon || id == CSSValueSandybrown ||
|
| + id == CSSValueSeagreen || id == CSSValueSeashell ||
|
| + id == CSSValueSienna || id == CSSValueSkyblue ||
|
| + id == CSSValueSlateblue || id == CSSValueSlategray ||
|
| + id == CSSValueSlategrey || id == CSSValueSnow ||
|
| + id == CSSValueSpringgreen || id == CSSValueSteelblue ||
|
| + id == CSSValueTan || id == CSSValueThistle || id == CSSValueTomato ||
|
| + id == CSSValueTurquoise || id == CSSValueViolet ||
|
| + id == CSSValueWheat || id == CSSValueWhitesmoke ||
|
| + id == CSSValueYellowgreen || id == CSSValueMenu;
|
| }
|
|
|
| bool StyleColor::isSystemColor(CSSValueID id) {
|
| - return (id >= CSSValueActiveborder && id <= CSSValueWindowtext) ||
|
| - id == CSSValueMenu;
|
| + return id == CSSValueActiveborder || id == CSSValueActivecaption ||
|
| + id == CSSValueAppworkspace || id == CSSValueBackground ||
|
| + id == CSSValueButtonface || id == CSSValueButtonhighlight ||
|
| + id == CSSValueButtonshadow || id == CSSValueButtontext ||
|
| + id == CSSValueCaptiontext || id == CSSValueGraytext ||
|
| + id == CSSValueHighlight || id == CSSValueHighlighttext ||
|
| + id == CSSValueInactiveborder || id == CSSValueInactivecaption ||
|
| + id == CSSValueInactivecaptiontext || id == CSSValueInfobackground ||
|
| + id == CSSValueInfotext || id == CSSValueMenutext ||
|
| + id == CSSValueScrollbar || id == CSSValueThreeddarkshadow ||
|
| + id == CSSValueThreedface || id == CSSValueThreedhighlight ||
|
| + id == CSSValueThreedlightshadow || id == CSSValueThreedshadow ||
|
| + id == CSSValueWindow || id == CSSValueWindowframe ||
|
| + id == CSSValueWindowtext || id == CSSValueMenu;
|
| }
|
|
|
| } // namespace blink
|
|
|