Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1250342 patch 2: Rename NS_STYLE_TEXT_ALIGN_TRUE to NS_STYLE_TEXT_ALIGN_UNSAFE. r=mats

Browse Source 
MozReview-Commit-ID: LuHepP37jtr
This commit is contained in:
L. David Baron 2016-02-24 10:40:30 -08:00
parent b6111122f6
commit 96d86ab5e7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/style/nsCSSParser.cpp
View File

@ -14895,14 +14895,14 @@ CSSParserImpl::ParseTextAlign(nsCSSValue& aValue, const KTableEntry aTable[])
nsCSSValue right;
if (ParseSingleTokenVariant(right, VARIANT_KEYWORD, aTable)) {
// 'true' must be combined with some other value than 'true'.
if (left.GetIntValue() == NS_STYLE_TEXT_ALIGN_TRUE &&
right.GetIntValue() == NS_STYLE_TEXT_ALIGN_TRUE) {
if (left.GetIntValue() == NS_STYLE_TEXT_ALIGN_UNSAFE &&
right.GetIntValue() == NS_STYLE_TEXT_ALIGN_UNSAFE) {
return false;
}
aValue.SetPairValue(left, right);
} else {
// Single value 'true' is not allowed.
if (left.GetIntValue() == NS_STYLE_TEXT_ALIGN_TRUE) {
if (left.GetIntValue() == NS_STYLE_TEXT_ALIGN_UNSAFE) {
return false;
}
aValue = left;

4
layout/style/nsCSSProps.cpp
View File

@ -1959,7 +1959,7 @@ KTableEntry nsCSSProps::kTextAlignKTable[] = {
{ eCSSKeyword__moz_left, NS_STYLE_TEXT_ALIGN_MOZ_LEFT },
{ eCSSKeyword_start, NS_STYLE_TEXT_ALIGN_DEFAULT },
{ eCSSKeyword_end, NS_STYLE_TEXT_ALIGN_END },
{ eCSSKeyword_unsafe, NS_STYLE_TEXT_ALIGN_TRUE },
{ eCSSKeyword_unsafe, NS_STYLE_TEXT_ALIGN_UNSAFE },
{ eCSSKeyword_match_parent, NS_STYLE_TEXT_ALIGN_MATCH_PARENT },
{ eCSSKeyword_UNKNOWN, -1 }
};
@ -1972,7 +1972,7 @@ KTableEntry nsCSSProps::kTextAlignLastKTable[] = {
{ eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY },
{ eCSSKeyword_start, NS_STYLE_TEXT_ALIGN_DEFAULT },
{ eCSSKeyword_end, NS_STYLE_TEXT_ALIGN_END },
{ eCSSKeyword_unsafe, NS_STYLE_TEXT_ALIGN_TRUE },
{ eCSSKeyword_unsafe, NS_STYLE_TEXT_ALIGN_UNSAFE },
{ eCSSKeyword_UNKNOWN, -1 }
};

4
layout/style/nsRuleNode.cpp
View File

@ -4396,7 +4396,7 @@ nsRuleNode::ComputeTextData(void* aStartStruct,
const nsCSSValuePair& textAlignValuePair = textAlignValue->GetPairValue();
textAlignValue = &textAlignValuePair.mXValue;
if (eCSSUnit_Enumerated == textAlignValue->GetUnit()) {
if (textAlignValue->GetIntValue() == NS_STYLE_TEXT_ALIGN_TRUE) {
if (textAlignValue->GetIntValue() == NS_STYLE_TEXT_ALIGN_UNSAFE) {
textAlignValue = &textAlignValuePair.mYValue;
}
} else if (eCSSUnit_String == textAlignValue->GetUnit()) {
@ -4421,7 +4421,7 @@ nsRuleNode::ComputeTextData(void* aStartStruct,
const nsCSSValuePair& textAlignLastValuePair = textAlignLastValue->GetPairValue();
textAlignLastValue = &textAlignLastValuePair.mXValue;
if (eCSSUnit_Enumerated == textAlignLastValue->GetUnit()) {
if (textAlignLastValue->GetIntValue() == NS_STYLE_TEXT_ALIGN_TRUE) {
if (textAlignLastValue->GetIntValue() == NS_STYLE_TEXT_ALIGN_UNSAFE) {
textAlignLastValue = &textAlignLastValuePair.mYValue;
}
}

2
layout/style/nsStyleConsts.h
View File

@ -809,7 +809,7 @@ enum class FillMode : uint32_t;
// NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT is only used in data structs; it
// is never present in stylesheets or computed data.
#define NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT 11
#define NS_STYLE_TEXT_ALIGN_TRUE 12
#define NS_STYLE_TEXT_ALIGN_UNSAFE 12
#define NS_STYLE_TEXT_ALIGN_MATCH_PARENT 13
// Note: make sure that the largest NS_STYLE_TEXT_ALIGN_* value is smaller than
// the smallest NS_STYLE_VERTICAL_ALIGN_* value below!