mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Changed ParseValue() to return a PRBool result
This commit is contained in:
parent
f84ba1b8e7
commit
b491633bcf
@ -1376,33 +1376,48 @@ nsHTMLTagContent::ValueOrPercentToString(const nsHTMLValue& aValue,
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
PRBool
|
||||
nsHTMLTagContent::ParseValue(const nsString& aString, PRInt32 aMin,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit)
|
||||
{
|
||||
PRInt32 ec, val = aString.ToInteger(&ec);
|
||||
if (val < aMin) val = aMin;
|
||||
if (eHTMLUnit_Pixel == aValueUnit) {
|
||||
aResult.SetPixelValue(val);
|
||||
}
|
||||
else {
|
||||
aResult.SetIntValue(val, aValueUnit);
|
||||
if (NS_OK == ec) {
|
||||
if (val < aMin) val = aMin;
|
||||
if (eHTMLUnit_Pixel == aValueUnit) {
|
||||
aResult.SetPixelValue(val);
|
||||
}
|
||||
else {
|
||||
aResult.SetIntValue(val, aValueUnit);
|
||||
}
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
// Illegal values are mapped to empty
|
||||
aResult.SetEmptyValue();
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
void nsHTMLTagContent::ParseValue(const nsString& aString, PRInt32 aMin,
|
||||
PRInt32 aMax,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit)
|
||||
PRBool
|
||||
nsHTMLTagContent::ParseValue(const nsString& aString, PRInt32 aMin,
|
||||
PRInt32 aMax,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit)
|
||||
{
|
||||
PRInt32 ec, val = aString.ToInteger(&ec);
|
||||
if (val < aMin) val = aMin;
|
||||
if (val > aMax) val = aMax;
|
||||
if (eHTMLUnit_Pixel == aValueUnit) {
|
||||
aResult.SetPixelValue(val);
|
||||
}
|
||||
else {
|
||||
aResult.SetIntValue(val, aValueUnit);
|
||||
if (NS_OK == ec) {
|
||||
if (val < aMin) val = aMin;
|
||||
if (val > aMax) val = aMax;
|
||||
if (eHTMLUnit_Pixel == aValueUnit) {
|
||||
aResult.SetPixelValue(val);
|
||||
}
|
||||
else {
|
||||
aResult.SetIntValue(val, aValueUnit);
|
||||
}
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
// Illegal values are mapped to empty
|
||||
aResult.SetEmptyValue();
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
PRBool nsHTMLTagContent::ParseImageProperty(nsIAtom* aAttribute,
|
||||
|
@ -175,11 +175,11 @@ public:
|
||||
static PRBool ValueOrPercentToString(const nsHTMLValue& aValue,
|
||||
nsString& aResult);
|
||||
|
||||
static void ParseValue(const nsString& aString, PRInt32 aMin,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit);
|
||||
static PRBool ParseValue(const nsString& aString, PRInt32 aMin,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit);
|
||||
|
||||
static void ParseValue(const nsString& aString, PRInt32 aMin, PRInt32 aMax,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit);
|
||||
static PRBool ParseValue(const nsString& aString, PRInt32 aMin, PRInt32 aMax,
|
||||
nsHTMLValue& aResult, nsHTMLUnit aValueUnit);
|
||||
|
||||
static PRBool ParseColor(const nsString& aString, nsHTMLValue& aResult);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user