mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Fix bug 77110. Make us treat wrap="physical" like NS 4.x and IE do, not
as it was originally (in NS 2.x) intended. r=timeless, sr=attinasi, a=blizzard
This commit is contained in:
parent
6d86bed09e
commit
24928e712a
@ -76,7 +76,9 @@ static NS_DEFINE_IID(kViewCID, NS_VIEW_CID);
|
|||||||
#define kTextControl_Wrap_Soft "SOFT"
|
#define kTextControl_Wrap_Soft "SOFT"
|
||||||
#define kTextControl_Wrap_Virtual "VIRTUAL" // "virtual" is a synonym for "soft"
|
#define kTextControl_Wrap_Virtual "VIRTUAL" // "virtual" is a synonym for "soft"
|
||||||
#define kTextControl_Wrap_Hard "HARD"
|
#define kTextControl_Wrap_Hard "HARD"
|
||||||
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" is a synonym for "hard"
|
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" should be a synonym
|
||||||
|
// for "hard" but NS 4.x and IE make
|
||||||
|
// it a synonym for "soft"
|
||||||
#define kTextControl_Wrap_Off "OFF"
|
#define kTextControl_Wrap_Off "OFF"
|
||||||
|
|
||||||
|
|
||||||
@ -206,8 +208,7 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
|
|||||||
|
|
||||||
nsAutoString wrapHard; wrapHard.AssignWithConversion(kTextControl_Wrap_Hard);
|
nsAutoString wrapHard; wrapHard.AssignWithConversion(kTextControl_Wrap_Hard);
|
||||||
nsAutoString wrapPhysical; wrapPhysical.AssignWithConversion(kTextControl_Wrap_Physical);
|
nsAutoString wrapPhysical; wrapPhysical.AssignWithConversion(kTextControl_Wrap_Physical);
|
||||||
if (wrap.EqualsIgnoreCase(wrapHard) ||
|
if (wrap.EqualsIgnoreCase(wrapHard)) {
|
||||||
wrap.EqualsIgnoreCase(wrapPhysical)) {
|
|
||||||
aWrapProp = eHTMLTextWrap_Hard;
|
aWrapProp = eHTMLTextWrap_Hard;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -215,7 +216,8 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
|
|||||||
nsAutoString wrapSoft; wrapSoft.AssignWithConversion(kTextControl_Wrap_Soft);
|
nsAutoString wrapSoft; wrapSoft.AssignWithConversion(kTextControl_Wrap_Soft);
|
||||||
nsAutoString wrapVirtual; wrapVirtual.AssignWithConversion(kTextControl_Wrap_Virtual);
|
nsAutoString wrapVirtual; wrapVirtual.AssignWithConversion(kTextControl_Wrap_Virtual);
|
||||||
if (wrap.EqualsIgnoreCase(wrapSoft) ||
|
if (wrap.EqualsIgnoreCase(wrapSoft) ||
|
||||||
wrap.EqualsIgnoreCase(wrapVirtual)) {
|
wrap.EqualsIgnoreCase(wrapVirtual) ||
|
||||||
|
wrap.EqualsIgnoreCase(wrapPhysical)) {
|
||||||
aWrapProp = eHTMLTextWrap_Soft;
|
aWrapProp = eHTMLTextWrap_Soft;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,9 @@ static NS_DEFINE_IID(kViewCID, NS_VIEW_CID);
|
|||||||
#define kTextControl_Wrap_Soft "SOFT"
|
#define kTextControl_Wrap_Soft "SOFT"
|
||||||
#define kTextControl_Wrap_Virtual "VIRTUAL" // "virtual" is a synonym for "soft"
|
#define kTextControl_Wrap_Virtual "VIRTUAL" // "virtual" is a synonym for "soft"
|
||||||
#define kTextControl_Wrap_Hard "HARD"
|
#define kTextControl_Wrap_Hard "HARD"
|
||||||
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" is a synonym for "hard"
|
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" should be a synonym
|
||||||
|
// for "hard" but NS 4.x and IE make
|
||||||
|
// it a synonym for "soft"
|
||||||
#define kTextControl_Wrap_Off "OFF"
|
#define kTextControl_Wrap_Off "OFF"
|
||||||
|
|
||||||
|
|
||||||
@ -206,8 +208,7 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
|
|||||||
|
|
||||||
nsAutoString wrapHard; wrapHard.AssignWithConversion(kTextControl_Wrap_Hard);
|
nsAutoString wrapHard; wrapHard.AssignWithConversion(kTextControl_Wrap_Hard);
|
||||||
nsAutoString wrapPhysical; wrapPhysical.AssignWithConversion(kTextControl_Wrap_Physical);
|
nsAutoString wrapPhysical; wrapPhysical.AssignWithConversion(kTextControl_Wrap_Physical);
|
||||||
if (wrap.EqualsIgnoreCase(wrapHard) ||
|
if (wrap.EqualsIgnoreCase(wrapHard)) {
|
||||||
wrap.EqualsIgnoreCase(wrapPhysical)) {
|
|
||||||
aWrapProp = eHTMLTextWrap_Hard;
|
aWrapProp = eHTMLTextWrap_Hard;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -215,7 +216,8 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
|
|||||||
nsAutoString wrapSoft; wrapSoft.AssignWithConversion(kTextControl_Wrap_Soft);
|
nsAutoString wrapSoft; wrapSoft.AssignWithConversion(kTextControl_Wrap_Soft);
|
||||||
nsAutoString wrapVirtual; wrapVirtual.AssignWithConversion(kTextControl_Wrap_Virtual);
|
nsAutoString wrapVirtual; wrapVirtual.AssignWithConversion(kTextControl_Wrap_Virtual);
|
||||||
if (wrap.EqualsIgnoreCase(wrapSoft) ||
|
if (wrap.EqualsIgnoreCase(wrapSoft) ||
|
||||||
wrap.EqualsIgnoreCase(wrapVirtual)) {
|
wrap.EqualsIgnoreCase(wrapVirtual) ||
|
||||||
|
wrap.EqualsIgnoreCase(wrapPhysical)) {
|
||||||
aWrapProp = eHTMLTextWrap_Soft;
|
aWrapProp = eHTMLTextWrap_Soft;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user