Remove CSSPropertySpeak

This does not belong in CSS in Sky.

R=ojan@chromium.org

Review URL: https://codereview.chromium.org/1068383005

engine/core/css/CSSComputedStyleDeclaration.cpp

@@ -154,7 +154,6 @@ static const CSSPropertyID staticComputableProperties[] = {
     CSSPropertyPointerEvents,
     CSSPropertyPosition,
     CSSPropertyRight,
-    CSSPropertySpeak,
     CSSPropertyTableLayout,
     CSSPropertyTabSize,
     CSSPropertyTextAlign,
@@ -1925,8 +1924,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
             rect->setLeft(pixelValue(style->clip().left().value(), *style));
             return cssValuePool().createValue(rect.release());
         }
-        case CSSPropertySpeak:
-            return cssValuePool().createValue(style->speak());
         case CSSPropertyTransform:
         case CSSPropertyWebkitTransform:
             return computedTransform(renderer, *style);

engine/core/css/CSSPrimitiveValueMappings.h

@@ -2413,32 +2413,6 @@ template<> inline CSSPrimitiveValue::operator TextRenderingMode() const
     return AutoTextRendering;
 }
 
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ESpeak e)
-    : CSSValue(PrimitiveClass)
-{
-    m_primitiveUnitType = CSS_VALUE_ID;
-    switch (e) {
-    case SpeakNone:
-        m_value.valueID = CSSValueNone;
-        break;
-    case SpeakNormal:
-        m_value.valueID = CSSValueNormal;
-        break;
-    case SpeakSpellOut:
-        m_value.valueID = CSSValueSpellOut;
-        break;
-    case SpeakDigits:
-        m_value.valueID = CSSValueDigits;
-        break;
-    case SpeakLiteralPunctuation:
-        m_value.valueID = CSSValueLiteralPunctuation;
-        break;
-    case SpeakNoPunctuation:
-        m_value.valueID = CSSValueNoPunctuation;
-        break;
-    }
-}
-
 template<> inline CSSPrimitiveValue::operator Order() const
 {
     ASSERT(isValueID());
@@ -2469,30 +2443,6 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Order e)
     }
 }
 
-template<> inline CSSPrimitiveValue::operator ESpeak() const
-{
-    ASSERT(isValueID());
-    switch (m_value.valueID) {
-    case CSSValueNone:
-        return SpeakNone;
-    case CSSValueNormal:
-        return SpeakNormal;
-    case CSSValueSpellOut:
-        return SpeakSpellOut;
-    case CSSValueDigits:
-        return SpeakDigits;
-    case CSSValueLiteralPunctuation:
-        return SpeakLiteralPunctuation;
-    case CSSValueNoPunctuation:
-        return SpeakNoPunctuation;
-    default:
-        break;
-    }
-
-    ASSERT_NOT_REACHED();
-    return SpeakNormal;
-}
-
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(blink::WebBlendMode blendMode)
     : CSSValue(PrimitiveClass)
 {

engine/core/css/CSSProperties.in

@@ -275,9 +275,6 @@ right animatable, initial=initialOffset, converter=convertLengthOrAuto
 // OBSOLETE
 size custom_all
 
-// OBSOLETE
-speak inherited
-
 // OBSOLETE
 table-layout
 

engine/core/css/CSSValueKeywords.in

@@ -490,14 +490,6 @@ bounding-box
 //all
 //none
 
-//
-// speech
-//
-spell-out
-digits
-literal-punctuation
-no-punctuation
-
 //
 // -webkit-font-smoothing
 //

engine/core/css/parser/BisonCSSParser-in.cpp

@@ -369,8 +369,6 @@ bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, CSSValueID valueID
         return valueID == CSSValueVisible || valueID == CSSValueNone || valueID == CSSValueAll || valueID == CSSValueAuto || (valueID >= CSSValueVisiblepainted && valueID <= CSSValueBoundingBox);
     case CSSPropertyPosition: // static | absolute
         return valueID == CSSValueStatic || valueID == CSSValueAbsolute;
-    case CSSPropertySpeak: // none | normal | spell-out | digits | literal-punctuation | no-punctuation
-        return valueID == CSSValueNone || valueID == CSSValueNormal || valueID == CSSValueSpellOut || valueID == CSSValueDigits || valueID == CSSValueLiteralPunctuation || valueID == CSSValueNoPunctuation;
     case CSSPropertyTableLayout: // auto | fixed
         return valueID == CSSValueAuto || valueID == CSSValueFixed;
     case CSSPropertyTextAlignLast:
@@ -476,7 +474,6 @@ bool isKeywordPropertyID(CSSPropertyID propertyId)
     case CSSPropertyPageBreakInside:
     case CSSPropertyPointerEvents:
     case CSSPropertyPosition:
-    case CSSPropertySpeak:
     case CSSPropertyTableLayout:
     case CSSPropertyTextAlignLast:
     case CSSPropertyTextDecorationStyle:

engine/core/rendering/style/RenderStyle.h

@@ -714,8 +714,6 @@ public:
 
     EImageRendering imageRendering() const { return static_cast<EImageRendering>(rareInheritedData->m_imageRendering); }
 
-    ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
-
     FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
     const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
     bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
@@ -967,7 +965,6 @@ public:
     void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.access()->m_transform, m_x, l); }
     void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.access()->m_transform, m_y, l); }
     void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m_transform, m_z, f); }
-    void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
     void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
     void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInheritedData, textEmphasisColor, setTextEmphasisColor, c); }
     void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
@@ -1153,7 +1150,6 @@ public:
     static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
     static LineBreak initialLineBreak() { return LineBreakAuto; }
     static const AtomicString& initialHighlight() { return nullAtom; }
-    static ESpeak initialSpeak() { return SpeakNormal; }
     static const AtomicString& initialHyphenationString() { return nullAtom; }
     static const AtomicString& initialLocale() { return nullAtom; }
     static bool initialHasAspectRatio() { return false; }

engine/core/rendering/style/RenderStyleConstants.h

@@ -232,8 +232,6 @@ enum EBackfaceVisibility {
 
 enum Hyphens { HyphensNone, HyphensManual, HyphensAuto };
 
-enum ESpeak { SpeakNone, SpeakNormal, SpeakSpellOut, SpeakDigits, SpeakLiteralPunctuation, SpeakNoPunctuation };
-
 enum TextEmphasisFill { TextEmphasisFillFilled, TextEmphasisFillOpen };
 
 enum TextEmphasisMark { TextEmphasisMarkNone, TextEmphasisMarkAuto, TextEmphasisMarkDot, TextEmphasisMarkCircle, TextEmphasisMarkDoubleCircle, TextEmphasisMarkTriangle, TextEmphasisMarkSesame, TextEmphasisMarkCustom };

engine/core/rendering/style/StyleRareInheritedData.cpp

@@ -62,7 +62,6 @@ StyleRareInheritedData::StyleRareInheritedData()
     , overflowWrap(RenderStyle::initialOverflowWrap())
     , lineBreak(LineBreakAuto)
     , userSelect(RenderStyle::initialUserSelect())
-    , speak(SpeakNormal)
     , hyphens(HyphensManual)
     , textEmphasisFill(TextEmphasisFillFilled)
     , textEmphasisMark(TextEmphasisMarkNone)
@@ -104,7 +103,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     , overflowWrap(o.overflowWrap)
     , lineBreak(o.lineBreak)
     , userSelect(o.userSelect)
-    , speak(o.speak)
     , hyphens(o.hyphens)
     , textEmphasisFill(o.textEmphasisFill)
     , textEmphasisMark(o.textEmphasisMark)
@@ -157,7 +155,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
         && overflowWrap == o.overflowWrap
         && lineBreak == o.lineBreak
         && userSelect == o.userSelect
-        && speak == o.speak
         && hyphens == o.hyphens
         && hyphenationLimitBefore == o.hyphenationLimitBefore
         && hyphenationLimitAfter == o.hyphenationLimitAfter

engine/core/rendering/style/StyleRareInheritedData.h

@@ -87,7 +87,6 @@ public:
     unsigned overflowWrap : 1; // EOverflowWrap
     unsigned lineBreak : 3; // LineBreak
     unsigned userSelect : 2; // EUserSelect
-    unsigned speak : 3; // ESpeak
     unsigned hyphens : 2; // Hyphens
     unsigned textEmphasisFill : 1; // TextEmphasisFill
     unsigned textEmphasisMark : 3; // TextEmphasisMark