mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1277433 - Part 5: Replace eStyleAnimType_EnumU8 to eStyleAnimType_Discrete. r=birtles 

MozReview-Commit-ID: IeQQ9rdcWD2

--HG--
extra : rebase_source : 5ffaec107853a42bf2b8c637e60707ca62cd3a92
This commit is contained in:
Daisuke Akatsuka 2016-08-16 14:30:16 +09:00
Родитель b179aa1d62
Коммит 2ce1433b3f
2 изменённых файлов: 56 добавлений и 50 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
layout/style/StyleAnimationValue.cpp
Просмотреть файл

@ -4221,6 +4221,12 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
return true; return true;
} }
case eStyleAnimType_Discrete: { case eStyleAnimType_Discrete: {
if (aProperty == eCSSProperty_visibility) {
aComputedValue.SetIntValue(
static_cast<const nsStyleVisibility*>(styleStruct)->mVisible,
eUnit_Visibility);
return true;
}
auto cssValue = MakeUnique<nsCSSValue>(eCSSUnit_Unset); auto cssValue = MakeUnique<nsCSSValue>(eCSSUnit_Unset);
aStyleContext->RuleNode()->GetDiscretelyAnimatedCSSValue(aProperty, aStyleContext->RuleNode()->GetDiscretelyAnimatedCSSValue(aProperty,
cssValue.get()); cssValue.get());

100
layout/style/nsCSSPropList.h
Просмотреть файл

@ -1434,8 +1434,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kFillRuleKTable, kFillRuleKTable,
offsetof(nsStyleSVG, mClipRule), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_COLOR( CSS_PROP_COLOR(
color, color,
color, color,
@ -1468,8 +1468,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kColorInterpolationKTable, kColorInterpolationKTable,
offsetof(nsStyleSVG, mColorInterpolation), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_SVG( CSS_PROP_SVG(
color-interpolation-filters, color-interpolation-filters,
color_interpolation_filters, color_interpolation_filters,
@ -1478,8 +1478,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kColorInterpolationKTable, kColorInterpolationKTable,
offsetof(nsStyleSVG, mColorInterpolationFilters), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_COLUMN( CSS_PROP_COLUMN(
-moz-column-count, -moz-column-count,
_moz_column_count, _moz_column_count,
@ -1673,8 +1673,8 @@ CSS_PROP_SVGRESET(
"", "",
VARIANT_HK, VARIANT_HK,
kDominantBaselineKTable, kDominantBaselineKTable,
offsetof(nsStyleSVGReset, mDominantBaseline), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TABLEBORDER( CSS_PROP_TABLEBORDER(
empty-cells, empty-cells,
empty_cells, empty_cells,
@ -1713,8 +1713,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kFillRuleKTable, kFillRuleKTable,
offsetof(nsStyleSVG, mFillRule), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_EFFECTS( CSS_PROP_EFFECTS(
filter, filter,
filter, filter,
@ -1756,8 +1756,8 @@ CSS_PROP_POSITION(
"", "",
VARIANT_HK, VARIANT_HK,
kFlexDirectionKTable, kFlexDirectionKTable,
offsetof(nsStylePosition, mFlexDirection), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_SHORTHAND( CSS_PROP_SHORTHAND(
flex-flow, flex-flow,
flex_flow, flex_flow,
@ -1800,8 +1800,8 @@ CSS_PROP_POSITION(
"", "",
VARIANT_HK, VARIANT_HK,
kFlexWrapKTable, kFlexWrapKTable,
offsetof(nsStylePosition, mFlexWrap), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_DISPLAY( CSS_PROP_DISPLAY(
float, float,
float, float,
@ -1950,8 +1950,8 @@ CSS_PROP_FONT(
"", "",
VARIANT_HK | VARIANT_SYSFONT, VARIANT_HK | VARIANT_SYSFONT,
kFontStyleKTable, kFontStyleKTable,
offsetof(nsStyleFont, mFont.style), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_FONT( CSS_PROP_FONT(
font-synthesis, font-synthesis,
font_synthesis, font_synthesis,
@ -2308,8 +2308,8 @@ CSS_PROP_VISIBILITY(
"", "",
VARIANT_HK, VARIANT_HK,
kImageRenderingKTable, kImageRenderingKTable,
offsetof(nsStyleVisibility, mImageRendering), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_UIRESET( CSS_PROP_UIRESET(
ime-mode, ime-mode,
ime_mode, ime_mode,
@ -2809,8 +2809,8 @@ CSS_PROP_SVGRESET(
"layout.css.masking.enabled", "layout.css.masking.enabled",
VARIANT_HK, VARIANT_HK,
kMaskTypeKTable, kMaskTypeKTable,
offsetof(nsStyleSVGReset, mMaskType), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND #ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_FONT( CSS_PROP_FONT(
@ -3508,8 +3508,8 @@ CSS_PROP_USERINTERFACE(
"", "",
VARIANT_HK, VARIANT_HK,
kPointerEventsKTable, kPointerEventsKTable,
offsetof(nsStyleUserInterface, mPointerEvents), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_DISPLAY( CSS_PROP_DISPLAY(
position, position,
position, position,
@ -3568,8 +3568,8 @@ CSS_PROP_TEXT(
"", "",
VARIANT_HK, VARIANT_HK,
kRubyAlignKTable, kRubyAlignKTable,
offsetof(nsStyleText, mRubyAlign), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TEXT( CSS_PROP_TEXT(
ruby-position, ruby-position,
ruby_position, ruby_position,
@ -3578,8 +3578,8 @@ CSS_PROP_TEXT(
"", "",
VARIANT_HK, VARIANT_HK,
kRubyPositionKTable, kRubyPositionKTable,
offsetof(nsStyleText, mRubyPosition), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND #ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_FONT( CSS_PROP_FONT(
@ -3729,8 +3729,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kShapeRenderingKTable, kShapeRenderingKTable,
offsetof(nsStyleSVG, mShapeRendering), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND #ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL #ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_TABLE( CSS_PROP_TABLE(
@ -3818,8 +3818,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kStrokeLinecapKTable, kStrokeLinecapKTable,
offsetof(nsStyleSVG, mStrokeLinecap), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_SVG( CSS_PROP_SVG(
stroke-linejoin, stroke-linejoin,
stroke_linejoin, stroke_linejoin,
@ -3828,8 +3828,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kStrokeLinejoinKTable, kStrokeLinejoinKTable,
offsetof(nsStyleSVG, mStrokeLinejoin), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_SVG( CSS_PROP_SVG(
stroke-miterlimit, stroke-miterlimit,
stroke_miterlimit, stroke_miterlimit,
@ -3930,8 +3930,8 @@ CSS_PROP_SVG(
"", "",
VARIANT_HK, VARIANT_HK,
kTextAnchorKTable, kTextAnchorKTable,
offsetof(nsStyleSVG, mTextAnchor), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TEXT( CSS_PROP_TEXT(
text-combine-upright, text-combine-upright,
text_combine_upright, text_combine_upright,
@ -3941,8 +3941,8 @@ CSS_PROP_TEXT(
"layout.css.text-combine-upright.enabled", "layout.css.text-combine-upright.enabled",
0, 0,
kTextCombineUprightKTable, kTextCombineUprightKTable,
offsetof(nsStyleText, mTextCombineUpright), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_SHORTHAND( CSS_PROP_SHORTHAND(
text-decoration, text-decoration,
text_decoration, text_decoration,
@ -3973,8 +3973,8 @@ CSS_PROP_TEXTRESET(
"", "",
0, 0,
kTextDecorationLineKTable, kTextDecorationLineKTable,
offsetof(nsStyleTextReset, mTextDecorationLine), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TEXTRESET( CSS_PROP_TEXTRESET(
text-decoration-style, text-decoration-style,
text_decoration_style, text_decoration_style,
@ -4061,8 +4061,8 @@ CSS_PROP_VISIBILITY(
"layout.css.vertical-text.enabled", "layout.css.vertical-text.enabled",
VARIANT_HK, VARIANT_HK,
kTextOrientationKTable, kTextOrientationKTable,
offsetof(nsStyleVisibility, mTextOrientation), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TEXTRESET( CSS_PROP_TEXTRESET(
text-overflow, text-overflow,
text_overflow, text_overflow,
@ -4083,8 +4083,8 @@ CSS_PROP_TEXT(
"", "",
VARIANT_HK, VARIANT_HK,
kTextRenderingKTable, kTextRenderingKTable,
offsetof(nsStyleText, mTextRendering), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TEXT( CSS_PROP_TEXT(
text-shadow, text-shadow,
text_shadow, text_shadow,
@ -4374,8 +4374,8 @@ CSS_PROP_SVGRESET(
"", "",
VARIANT_HK, VARIANT_HK,
kVectorEffectKTable, kVectorEffectKTable,
offsetof(nsStyleSVGReset, mVectorEffect), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
// NOTE: vertical-align is only supposed to apply to :first-letter when // NOTE: vertical-align is only supposed to apply to :first-letter when
// 'float' is 'none', but we don't worry about that since it has no // 'float' is 'none', but we don't worry about that since it has no
// effect otherwise // effect otherwise
@ -4402,8 +4402,8 @@ CSS_PROP_VISIBILITY(
"", "",
VARIANT_HK, VARIANT_HK,
kVisibilityKTable, kVisibilityKTable,
offsetof(nsStyleVisibility, mVisible), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) // reflow for collapse eStyleAnimType_Discrete) // reflow for collapse
CSS_PROP_TEXT( CSS_PROP_TEXT(
white-space, white-space,
white_space, white_space,
@ -4473,8 +4473,8 @@ CSS_PROP_TEXT(
"", "",
VARIANT_HK, VARIANT_HK,
kWordBreakKTable, kWordBreakKTable,
offsetof(nsStyleText, mWordBreak), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_TEXT( CSS_PROP_TEXT(
word-spacing, word-spacing,
word_spacing, word_spacing,
@ -4508,8 +4508,8 @@ CSS_PROP_VISIBILITY(
"layout.css.vertical-text.enabled", "layout.css.vertical-text.enabled",
VARIANT_HK, VARIANT_HK,
kWritingModeKTable, kWritingModeKTable,
offsetof(nsStyleVisibility, mWritingMode), CSS_PROP_NO_OFFSET,
eStyleAnimType_EnumU8) eStyleAnimType_Discrete)
CSS_PROP_POSITION( CSS_PROP_POSITION(
z-index, z-index,
z_index, z_index,