提交 51e1b37b 编写于 作者: E Eric Seidel

Remove empty-cells

The world may never know what to do with empty cells?

Besides.  This was mislabled as layout, it was clearly a paint
property. :p

R=ianh@google.com

Review URL: https://codereview.chromium.org/1074953004
上级 8b5c8d86
......@@ -111,7 +111,6 @@ static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyColor,
CSSPropertyDirection,
CSSPropertyDisplay,
CSSPropertyEmptyCells,
CSSPropertyFontFamily,
CSSPropertyFontKerning,
CSSPropertyFontSize,
......@@ -1364,8 +1363,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return cssValuePool().createValue(style->direction());
case CSSPropertyDisplay:
return cssValuePool().createValue(style->display());
case CSSPropertyEmptyCells:
return cssValuePool().createValue(style->emptyCells());
case CSSPropertyAlignContent:
return cssValuePool().createValue(style->alignContent());
case CSSPropertyAlignItems:
......
......@@ -717,36 +717,6 @@ template<> inline CSSPrimitiveValue::operator EDisplay() const
return display;
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e)
: CSSValue(PrimitiveClass)
{
m_primitiveUnitType = CSS_VALUE_ID;
switch (e) {
case SHOW:
m_value.valueID = CSSValueShow;
break;
case HIDE:
m_value.valueID = CSSValueHide;
break;
}
}
template<> inline CSSPrimitiveValue::operator EEmptyCell() const
{
ASSERT(isValueID());
switch (m_value.valueID) {
case CSSValueShow:
return SHOW;
case CSSValueHide:
return HIDE;
default:
break;
}
ASSERT_NOT_REACHED();
return SHOW;
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EJustifyContent e)
: CSSValue(PrimitiveClass)
{
......
......@@ -157,9 +157,6 @@ clip animatable, converter=convertClip, custom_all
// LAYOUT
display
// LAYOUT
empty-cells inherited, type_name=EEmptyCell
// LAYOUT
flex-basis animatable, converter=convertLengthOrAuto
......
......@@ -338,8 +338,6 @@ bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, CSSValueID valueID
// table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none
// flex | inline-flex
return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || valueID == CSSValueNone;
case CSSPropertyEmptyCells: // show | hide
return valueID == CSSValueShow || valueID == CSSValueHide;
case CSSPropertyFontStyle: // normal | italic | oblique
return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique;
case CSSPropertyFontStretch: // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded
......@@ -452,7 +450,6 @@ bool isKeywordPropertyID(CSSPropertyID propertyId)
case CSSPropertyBoxSizing:
case CSSPropertyDirection:
case CSSPropertyDisplay:
case CSSPropertyEmptyCells:
case CSSPropertyFontStyle:
case CSSPropertyFontStretch:
case CSSPropertyImageRendering:
......
......@@ -131,8 +131,7 @@ protected:
struct InheritedFlags {
bool operator==(const InheritedFlags& other) const
{
return (_empty_cells == other._empty_cells)
&& (_visibility == other._visibility)
return (_visibility == other._visibility)
&& (_text_align == other._text_align)
&& (m_textUnderline == other.m_textUnderline)
&& (_direction == other._direction)
......@@ -143,7 +142,6 @@ protected:
bool operator!=(const InheritedFlags& other) const { return !(*this == other); }
unsigned _empty_cells : 1; // EEmptyCell
unsigned _visibility : 2; // EVisibility
unsigned _text_align : 4; // ETextAlign
unsigned m_textUnderline : 1;
......@@ -220,7 +218,6 @@ protected:
protected:
void setBitDefaults()
{
inherited_flags._empty_cells = initialEmptyCells();
inherited_flags._visibility = initialVisibility();
inherited_flags._text_align = initialTextAlign();
inherited_flags.m_textUnderline = false;
......@@ -534,7 +531,6 @@ public:
short horizontalBorderSpacing() const;
short verticalBorderSpacing() const;
EEmptyCell emptyCells() const { return static_cast<EEmptyCell>(inherited_flags._empty_cells); }
const Length& marginTop() const { return surround->margin.top(); }
const Length& marginBottom() const { return surround->margin.bottom(); }
......@@ -856,7 +852,6 @@ public:
void setHorizontalBorderSpacing(short);
void setVerticalBorderSpacing(short);
void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
void setHasAspectRatio(bool b) { SET_VAR(rareNonInheritedData, m_hasAspectRatio, b); }
void setAspectRatioDenominator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioDenominator, v); }
......@@ -1038,7 +1033,6 @@ public:
static ObjectFit initialObjectFit() { return ObjectFitFill; }
static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
static EDisplay initialDisplay() { return FLEX; }
static EEmptyCell initialEmptyCells() { return SHOW; }
static EOverflow initialOverflowX() { return OVISIBLE; }
static EOverflow initialOverflowY() { return OVISIBLE; }
static EPosition initialPosition() { return StaticPosition; }
......
......@@ -191,10 +191,6 @@ enum TextUnderlinePosition {
TextUnderlinePositionUnder
};
enum EEmptyCell {
SHOW, HIDE
};
enum EVisibility { VISIBLE, HIDDEN, COLLAPSE };
// The order of this enum must match the order of the display values in CSSValueKeywords.in.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册