author | Xidorn Quan <me@upsuper.org> |
Sun, 29 Apr 2018 09:03:31 +1000 | |
changeset 416187 | ee0ac8a8f46e105098f953bab0bf08a17fb12fa7 |
parent 416186 | 2265aba376c02ec003824714824f57cf1f4996cf |
child 416188 | fb87372128d5fcd92e5ddc0e7d55211c0f4035d7 |
push id | 33918 |
push user | nerli@mozilla.com |
push date | Sun, 29 Apr 2018 09:47:13 +0000 |
treeherder | mozilla-central@afbec7f03bd8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | emilio |
bugs | 1434130 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
layout/style/nsCSSProps.cpp | file | annotate | diff | comparison | revisions | |
layout/style/nsCSSProps.h | file | annotate | diff | comparison | revisions |
--- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -62,44 +62,16 @@ static const char* const kCSSRawFontDesc }; static const char* const kCSSRawCounterDescs[] = { #define CSS_COUNTER_DESC(name_, method_) #name_, #include "nsCSSCounterDescList.h" #undef CSS_COUNTER_DESC }; -static const char* const kCSSRawPredefinedCounterStyles[] = { - "none", - // 6 Simple Predefined Counter Styles - // 6.1 Numeric - "decimal", "decimal-leading-zero", "arabic-indic", "armenian", - "upper-armenian", "lower-armenian", "bengali", "cambodian", "khmer", - "cjk-decimal", "devanagari", "georgian", "gujarati", "gurmukhi", "hebrew", - "kannada", "lao", "malayalam", "mongolian", "myanmar", "oriya", "persian", - "lower-roman", "upper-roman", "tamil", "telugu", "thai", "tibetan", - // 6.2 Alphabetic - "lower-alpha", "lower-latin", "upper-alpha", "upper-latin", - "cjk-earthly-branch", "cjk-heavenly-stem", "lower-greek", - "hiragana", "hiragana-iroha", "katakana", "katakana-iroha", - // 6.3 Symbolic - "disc", "circle", "square", "disclosure-open", "disclosure-closed", - // 7 Complex Predefined Counter Styles - // 7.1 Longhand East Asian Counter Styles - // 7.1.1 Japanese - "japanese-informal", "japanese-formal", - // 7.1.2 Korean - "korean-hangul-formal", "korean-hanja-informal", "korean-hanja-formal", - // 7.1.3 Chinese - "simp-chinese-informal", "simp-chinese-formal", - "trad-chinese-informal", "trad-chinese-formal", "cjk-ideographic", - // 7.2 Ethiopic Numeric Counter Style - "ethiopic-numeric" -}; - // We need eCSSAliasCount so we can make gAliases nonzero size when there // are no aliases. enum { eCSSAliasCount = eCSSProperty_COUNT_with_aliases - eCSSProperty_COUNT }; // The names are in kCSSRawProperties. static nsCSSPropertyID gAliases[eCSSAliasCount != 0 ? eCSSAliasCount : 1] = { @@ -387,23 +359,16 @@ nsCSSProps::GetStringValue(nsCSSCounterD if (gCounterDescTable) { return gCounterDescTable->GetStringValue(int32_t(aCounterDesc)); } else { static nsDependentCString sNullStr(""); return sNullStr; } } -const char* const* -nsCSSProps::GetListStyleTypes(int32_t *aLength) -{ - *aLength = ArrayLength(kCSSRawPredefinedCounterStyles); - return kCSSRawPredefinedCounterStyles; -} - /***************************************************************************/ const KTableEntry nsCSSProps::kAnimationDirectionKTable[] = { { eCSSKeyword_normal, static_cast<uint32_t>(dom::PlaybackDirection::Normal) }, { eCSSKeyword_reverse, static_cast<uint32_t>(dom::PlaybackDirection::Reverse) }, { eCSSKeyword_alternate, static_cast<uint32_t>(dom::PlaybackDirection::Alternate) }, { eCSSKeyword_alternate_reverse, static_cast<uint32_t>(dom::PlaybackDirection::Alternate_reverse) }, { eCSSKeyword_UNKNOWN, -1 }
--- a/layout/style/nsCSSProps.h +++ b/layout/style/nsCSSProps.h @@ -253,20 +253,16 @@ public: { return true; } return false; } public: - // Return an array of possible list style types, and the length of - // the array. - static const char* const* GetListStyleTypes(int32_t *aLength); - // Storing the enabledstate_ value in an nsCSSPropertyID variable is a small hack // to avoid needing a separate variable declaration for its real type // (CSSEnabledState), which would then require using a block and // therefore a pair of macros by consumers for the start and end of the loop. #define CSSPROPS_FOR_SHORTHAND_SUBPROPERTIES(it_, prop_, enabledstate_) \ for (const nsCSSPropertyID *it_ = nsCSSProps::SubpropertyEntryFor(prop_), \ es_ = (nsCSSPropertyID)((enabledstate_) | \ CSSEnabledState(0)); \