Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

139343, zapping build warnings from computed style. r=bzbarsky,sr=jst

Browse Source
This commit is contained in:
caillon%returnzero.com 2002-04-26 18:10:14 +00:00
parent 8139a913c3
commit 6517a6882c
4 changed files with 106 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/html/style/src/nsComputedDOMStyle.cpp
View File

@ -1785,7 +1785,7 @@ nsComputedDOMStyle::GetLineHeight(nsIFrame *aFrame,
else if (text) {
switch (text->mLineHeight.GetUnit()) {
case eStyleUnit_Percent:
val->SetPercent(text->mLineHeight.GetCoordValue());
val->SetPercent(text->mLineHeight.GetPercentValue());
break;
case eStyleUnit_Factor:
val->SetNumber(text->mLineHeight.GetFactorValue());

59
content/html/style/src/nsROCSSPrimitiveValue.h
View File

@ -71,7 +71,21 @@ public:
mValue.mFloat = aValue;
mType = CSS_NUMBER;
}
void SetNumber(PRInt32 aValue)
{
Reset();
mValue.mFloat = float(aValue);
mType = CSS_NUMBER;
}
void SetNumber(PRUint32 aValue)
{
Reset();
mValue.mFloat = float(aValue);
mType = CSS_NUMBER;
}
void SetPercent(float aValue)
{
Reset();
@ -86,46 +100,77 @@ public:
mType = CSS_PX;
}
void SetTwips(float aValue)
{
Reset();
mValue.mTwips = nscoord(aValue);
mType = CSS_PX;
}
void SetIdent(const nsACString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_IDENT : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_IDENT;
} else {
mType = CSS_UNKNOWN;
}
}
void SetIdent(const nsAString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_IDENT : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_IDENT;
} else {
mType = CSS_UNKNOWN;
}
}
void SetString(const nsACString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_STRING : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_STRING;
} else {
mType = CSS_UNKNOWN;
}
}
void SetString(const nsAString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_STRING : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_STRING;
} else {
mType = CSS_UNKNOWN;
}
}
void SetURI(const nsACString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_URI : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_URI;
} else {
mType = CSS_UNKNOWN;
}
}
void SetURI(const nsAString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_URI : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_URI;
} else {
mType = CSS_UNKNOWN;
}
}
void SetColor(nsIDOMRGBColor* aColor)

2
layout/style/nsComputedDOMStyle.cpp
View File

@ -1785,7 +1785,7 @@ nsComputedDOMStyle::GetLineHeight(nsIFrame *aFrame,
else if (text) {
switch (text->mLineHeight.GetUnit()) {
case eStyleUnit_Percent:
val->SetPercent(text->mLineHeight.GetCoordValue());
val->SetPercent(text->mLineHeight.GetPercentValue());
break;
case eStyleUnit_Factor:
val->SetNumber(text->mLineHeight.GetFactorValue());

59
layout/style/nsROCSSPrimitiveValue.h
View File

@ -71,7 +71,21 @@ public:
mValue.mFloat = aValue;
mType = CSS_NUMBER;
}
void SetNumber(PRInt32 aValue)
{
Reset();
mValue.mFloat = float(aValue);
mType = CSS_NUMBER;
}
void SetNumber(PRUint32 aValue)
{
Reset();
mValue.mFloat = float(aValue);
mType = CSS_NUMBER;
}
void SetPercent(float aValue)
{
Reset();
@ -86,46 +100,77 @@ public:
mType = CSS_PX;
}
void SetTwips(float aValue)
{
Reset();
mValue.mTwips = nscoord(aValue);
mType = CSS_PX;
}
void SetIdent(const nsACString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_IDENT : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_IDENT;
} else {
mType = CSS_UNKNOWN;
}
}
void SetIdent(const nsAString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_IDENT : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_IDENT;
} else {
mType = CSS_UNKNOWN;
}
}
void SetString(const nsACString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_STRING : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_STRING;
} else {
mType = CSS_UNKNOWN;
}
}
void SetString(const nsAString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_STRING : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_STRING;
} else {
mType = CSS_UNKNOWN;
}
}
void SetURI(const nsACString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_URI : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_URI;
} else {
mType = CSS_UNKNOWN;
}
}
void SetURI(const nsAString& aString)
{
Reset();
mValue.mString = ToNewUnicode(aString);
mType = (mValue.mString != nsnull) ? CSS_URI : CSS_UNKNOWN;
if (mValue.mString) {
mType = CSS_URI;
} else {
mType = CSS_UNKNOWN;
}
}
void SetColor(nsIDOMRGBColor* aColor)