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

Shrink nsROCSSPrimitiveValue and add support for CSS_NUMBER type. Bug

Browse Source 
129469, r=caillon, sr=jst, a=roc+moz
This commit is contained in:
bzbarsky%mit.edu 2002-03-08 19:04:15 +00:00
parent 6dc708c085
commit 478aa74f47
6 changed files with 184 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,8 +323,7 @@ static const nsCSSProperty queryableProperties[] = {
eCSSProperty_text_transform,
eCSSProperty_letter_spacing,
eCSSProperty_word_spacing,
eCSSProperty_white_space,
eCSSProperty_white_space
};
nsresult
@ -1046,9 +1045,7 @@ nsComputedDOMStyle::GetFontWeight(nsIFrame *aFrame,
val->SetString(str_weight);
}
else {
nsAutoString num_weight;
num_weight.AppendInt(font->mFont.weight, 10);
val->SetString(num_weight);
val->SetNumber(font->mFont.weight);
}
}
else {
@ -1490,14 +1487,12 @@ nsComputedDOMStyle::GetZIndex(nsIFrame *aFrame,
NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
const nsStylePosition* position = nsnull;
nsAutoString zindex;
GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position, aFrame);
if (position) {
switch (position->mZIndex.GetUnit()) {
case eStyleUnit_Integer:
zindex.AppendInt(position->mZIndex.GetIntValue(), 10);
val->SetString(zindex);
val->SetNumber(position->mZIndex.GetIntValue());
break;
case eStyleUnit_Auto:
val->SetString(NS_LITERAL_STRING("auto"));

75
content/html/style/src/nsROCSSPrimitiveValue.cpp
View File

@ -44,14 +44,16 @@
#include "nsContentUtils.h"
nsROCSSPrimitiveValue::nsROCSSPrimitiveValue(nsISupports *aOwner, float aT2P)
: mType(CSS_PX), mTwips(0), mString(), mFloat(0), mOwner(aOwner), mT2P(aT2P)
: mType(CSS_PX), mOwner(aOwner), mT2P(aT2P)
{
mValue.mTwips = 0;
NS_INIT_REFCNT();
}
nsROCSSPrimitiveValue::~nsROCSSPrimitiveValue()
{
Reset();
}
@ -81,58 +83,64 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
switch (mType) {
case CSS_PX :
{
float val = NSTwipsToFloatPixels(mTwips, mT2P);
float val = NSTwipsToFloatPixels(mValue.mTwips, mT2P);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("px"));
break;
}
case CSS_CM :
{
float val = NS_TWIPS_TO_CENTIMETERS(mTwips);
float val = NS_TWIPS_TO_CENTIMETERS(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("cm"));
break;
}
case CSS_MM :
{
float val = NS_TWIPS_TO_MILLIMETERS(mTwips);
float val = NS_TWIPS_TO_MILLIMETERS(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("mm"));
break;
}
case CSS_IN :
{
float val = NS_TWIPS_TO_INCHES(mTwips);
float val = NS_TWIPS_TO_INCHES(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("in"));
break;
}
case CSS_PT :
{
float val = NSTwipsToFloatPoints(mTwips);
float val = NSTwipsToFloatPoints(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("pt"));
break;
}
case CSS_STRING :
{
tmpStr.Append(mString);
tmpStr.Append(mValue.mString);
break;
}
case CSS_PERCENTAGE :
{
tmpStr.AppendFloat(mFloat * 100);
tmpStr.AppendFloat(mValue.mFloat * 100);
tmpStr.Append(PRUnichar('%'));
break;
}
case CSS_NUMBER :
{
tmpStr.AppendFloat(mValue.mFloat);
break;
}
case CSS_RECT :
{
NS_ASSERTION(mValue.mRect, "mValue.mRect should never be null");
NS_NAMED_LITERAL_STRING(comma, ", ");
nsCOMPtr<nsIDOMCSSPrimitiveValue> sideCSSValue;
nsAutoString sideValue;
tmpStr = NS_LITERAL_STRING("rect(");
// get the top
result = mRect->GetTop(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetTop(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -140,7 +148,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
break;
tmpStr.Append(sideValue + comma);
// get the right
result = mRect->GetRight(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetRight(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -148,7 +156,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
break;
tmpStr.Append(sideValue + comma);
// get the bottom
result = mRect->GetBottom(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetBottom(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -156,7 +164,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
break;
tmpStr.Append(sideValue + comma);
// get the left
result = mRect->GetLeft(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetLeft(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -167,7 +175,6 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
}
case CSS_PC :
case CSS_UNKNOWN :
case CSS_NUMBER :
case CSS_EMS :
case CSS_EXS :
case CSS_DEG :
@ -183,6 +190,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
case CSS_ATTR :
case CSS_COUNTER :
case CSS_RGBCOLOR :
NS_ERROR("We have a bogus value set. This should not happen");
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
@ -235,32 +243,44 @@ nsROCSSPrimitiveValue::GetFloatValue(PRUint16 aUnitType, float* aReturn)
NS_ENSURE_ARG_POINTER(aReturn);
*aReturn = 0;
if (mType == CSS_STRING) {
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
switch(aUnitType) {
case CSS_PX :
*aReturn = NSTwipsToFloatPixels(mTwips, mT2P);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NSTwipsToFloatPixels(mValue.mTwips, mT2P);
break;
case CSS_CM :
*aReturn = NS_TWIPS_TO_CENTIMETERS(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NS_TWIPS_TO_CENTIMETERS(mValue.mTwips);
break;
case CSS_MM :
*aReturn = NS_TWIPS_TO_MILLIMETERS(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NS_TWIPS_TO_MILLIMETERS(mValue.mTwips);
break;
case CSS_IN :
*aReturn = NS_TWIPS_TO_INCHES(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NS_TWIPS_TO_INCHES(mValue.mTwips);
break;
case CSS_PT :
*aReturn = NSTwipsToFloatPoints(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NSTwipsToFloatPoints(mValue.mTwips);
break;
case CSS_PERCENTAGE :
*aReturn = mFloat * 100;
if (mType != CSS_PERCENTAGE)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = mValue.mFloat * 100;
break;
case CSS_NUMBER :
if (mType != CSS_NUMBER)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = mValue.mFloat;
break;
case CSS_PC :
case CSS_UNKNOWN :
case CSS_NUMBER :
case CSS_EMS :
case CSS_EXS :
case CSS_DEG :
@ -300,7 +320,7 @@ nsROCSSPrimitiveValue::GetStringValue(nsAWritableString& aReturn)
aReturn.Truncate();
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
aReturn.Assign(mString);
aReturn.Assign(mValue.mString);
return NS_OK;
}
@ -315,11 +335,12 @@ nsROCSSPrimitiveValue::GetCounterValue(nsIDOMCounter** aReturn)
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetRectValue(nsIDOMRect** aReturn)
{
if (mType != CSS_RECT || !mRect) {
if (mType != CSS_RECT) {
*aReturn = nsnull;
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
return CallQueryInterface(mRect, aReturn);
NS_ASSERTION(mValue.mRect, "mValue.mRect should never be null");
return CallQueryInterface(mValue.mRect, aReturn);
}

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

@ -64,43 +64,74 @@ public:
nsROCSSPrimitiveValue(nsISupports *aOwner, float aP2T);
virtual ~nsROCSSPrimitiveValue();
void SetNumber(float aValue)
{
Reset();
mValue.mFloat = aValue;
mType = CSS_NUMBER;
}
void SetPercent(float aValue)
{
mFloat = aValue;
Reset();
mValue.mFloat = aValue;
mType = CSS_PERCENTAGE;
}
void SetTwips(nscoord aValue)
{
mTwips = aValue;
Reset();
mValue.mTwips = aValue;
mType = CSS_PX;
}
void SetString(const nsACString& aString)
{
CopyASCIItoUCS2(aString, mString);
Reset();
mValue.mString = ToNewUnicode(aString);
mType = CSS_STRING;
}
void SetString(const nsAString& aString)
{
mString.Assign(aString);
Reset();
mValue.mString = ToNewUnicode(aString);
mType = CSS_STRING;
}
void SetRect(nsIDOMRect* aRect)
{
mRect = aRect;
NS_PRECONDITION(aRect, "Null rect being set!");
Reset();
mValue.mRect = aRect;
NS_ADDREF(mValue.mRect);
mType = CSS_RECT;
}
void Reset(void)
{
if (mType == CSS_STRING) {
NS_ASSERTION(mValue.mString, "Null string should never happen");
nsMemory::Free(mValue.mString);
mValue.mString = nsnull;
}
else if (mType == CSS_RECT) {
NS_ASSERTION(mValue.mRect, "Null Rect should never happen");
NS_RELEASE(mValue.mRect);
mValue.mRect = nsnull;
}
}
private:
PRUint16 mType;
nscoord mTwips;
nsCOMPtr<nsIDOMRect> mRect;
nsString mString;
float mFloat;
union {
nscoord mTwips;
float mFloat;
nsIDOMRect* mRect;
PRUnichar* mString;
} mValue;
nsISupports *mOwner;
float mT2P;

11
layout/style/nsComputedDOMStyle.cpp
View File

@ -323,8 +323,7 @@ static const nsCSSProperty queryableProperties[] = {
eCSSProperty_text_transform,
eCSSProperty_letter_spacing,
eCSSProperty_word_spacing,
eCSSProperty_white_space,
eCSSProperty_white_space
};
nsresult
@ -1046,9 +1045,7 @@ nsComputedDOMStyle::GetFontWeight(nsIFrame *aFrame,
val->SetString(str_weight);
}
else {
nsAutoString num_weight;
num_weight.AppendInt(font->mFont.weight, 10);
val->SetString(num_weight);
val->SetNumber(font->mFont.weight);
}
}
else {
@ -1490,14 +1487,12 @@ nsComputedDOMStyle::GetZIndex(nsIFrame *aFrame,
NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
const nsStylePosition* position = nsnull;
nsAutoString zindex;
GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position, aFrame);
if (position) {
switch (position->mZIndex.GetUnit()) {
case eStyleUnit_Integer:
zindex.AppendInt(position->mZIndex.GetIntValue(), 10);
val->SetString(zindex);
val->SetNumber(position->mZIndex.GetIntValue());
break;
case eStyleUnit_Auto:
val->SetString(NS_LITERAL_STRING("auto"));

75
layout/style/nsROCSSPrimitiveValue.cpp
View File

@ -44,14 +44,16 @@
#include "nsContentUtils.h"
nsROCSSPrimitiveValue::nsROCSSPrimitiveValue(nsISupports *aOwner, float aT2P)
: mType(CSS_PX), mTwips(0), mString(), mFloat(0), mOwner(aOwner), mT2P(aT2P)
: mType(CSS_PX), mOwner(aOwner), mT2P(aT2P)
{
mValue.mTwips = 0;
NS_INIT_REFCNT();
}
nsROCSSPrimitiveValue::~nsROCSSPrimitiveValue()
{
Reset();
}
@ -81,58 +83,64 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
switch (mType) {
case CSS_PX :
{
float val = NSTwipsToFloatPixels(mTwips, mT2P);
float val = NSTwipsToFloatPixels(mValue.mTwips, mT2P);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("px"));
break;
}
case CSS_CM :
{
float val = NS_TWIPS_TO_CENTIMETERS(mTwips);
float val = NS_TWIPS_TO_CENTIMETERS(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("cm"));
break;
}
case CSS_MM :
{
float val = NS_TWIPS_TO_MILLIMETERS(mTwips);
float val = NS_TWIPS_TO_MILLIMETERS(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("mm"));
break;
}
case CSS_IN :
{
float val = NS_TWIPS_TO_INCHES(mTwips);
float val = NS_TWIPS_TO_INCHES(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("in"));
break;
}
case CSS_PT :
{
float val = NSTwipsToFloatPoints(mTwips);
float val = NSTwipsToFloatPoints(mValue.mTwips);
tmpStr.AppendFloat(val);
tmpStr.Append(NS_LITERAL_STRING("pt"));
break;
}
case CSS_STRING :
{
tmpStr.Append(mString);
tmpStr.Append(mValue.mString);
break;
}
case CSS_PERCENTAGE :
{
tmpStr.AppendFloat(mFloat * 100);
tmpStr.AppendFloat(mValue.mFloat * 100);
tmpStr.Append(PRUnichar('%'));
break;
}
case CSS_NUMBER :
{
tmpStr.AppendFloat(mValue.mFloat);
break;
}
case CSS_RECT :
{
NS_ASSERTION(mValue.mRect, "mValue.mRect should never be null");
NS_NAMED_LITERAL_STRING(comma, ", ");
nsCOMPtr<nsIDOMCSSPrimitiveValue> sideCSSValue;
nsAutoString sideValue;
tmpStr = NS_LITERAL_STRING("rect(");
// get the top
result = mRect->GetTop(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetTop(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -140,7 +148,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
break;
tmpStr.Append(sideValue + comma);
// get the right
result = mRect->GetRight(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetRight(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -148,7 +156,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
break;
tmpStr.Append(sideValue + comma);
// get the bottom
result = mRect->GetBottom(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetBottom(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -156,7 +164,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
break;
tmpStr.Append(sideValue + comma);
// get the left
result = mRect->GetLeft(getter_AddRefs(sideCSSValue));
result = mValue.mRect->GetLeft(getter_AddRefs(sideCSSValue));
if (NS_FAILED(result))
break;
result = sideCSSValue->GetCssText(sideValue);
@ -167,7 +175,6 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
}
case CSS_PC :
case CSS_UNKNOWN :
case CSS_NUMBER :
case CSS_EMS :
case CSS_EXS :
case CSS_DEG :
@ -183,6 +190,7 @@ nsROCSSPrimitiveValue::GetCssText(nsAWritableString& aCssText)
case CSS_ATTR :
case CSS_COUNTER :
case CSS_RGBCOLOR :
NS_ERROR("We have a bogus value set. This should not happen");
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
@ -235,32 +243,44 @@ nsROCSSPrimitiveValue::GetFloatValue(PRUint16 aUnitType, float* aReturn)
NS_ENSURE_ARG_POINTER(aReturn);
*aReturn = 0;
if (mType == CSS_STRING) {
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
switch(aUnitType) {
case CSS_PX :
*aReturn = NSTwipsToFloatPixels(mTwips, mT2P);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NSTwipsToFloatPixels(mValue.mTwips, mT2P);
break;
case CSS_CM :
*aReturn = NS_TWIPS_TO_CENTIMETERS(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NS_TWIPS_TO_CENTIMETERS(mValue.mTwips);
break;
case CSS_MM :
*aReturn = NS_TWIPS_TO_MILLIMETERS(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NS_TWIPS_TO_MILLIMETERS(mValue.mTwips);
break;
case CSS_IN :
*aReturn = NS_TWIPS_TO_INCHES(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NS_TWIPS_TO_INCHES(mValue.mTwips);
break;
case CSS_PT :
*aReturn = NSTwipsToFloatPoints(mTwips);
if (mType != CSS_PX)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = NSTwipsToFloatPoints(mValue.mTwips);
break;
case CSS_PERCENTAGE :
*aReturn = mFloat * 100;
if (mType != CSS_PERCENTAGE)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = mValue.mFloat * 100;
break;
case CSS_NUMBER :
if (mType != CSS_NUMBER)
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
*aReturn = mValue.mFloat;
break;
case CSS_PC :
case CSS_UNKNOWN :
case CSS_NUMBER :
case CSS_EMS :
case CSS_EXS :
case CSS_DEG :
@ -300,7 +320,7 @@ nsROCSSPrimitiveValue::GetStringValue(nsAWritableString& aReturn)
aReturn.Truncate();
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
aReturn.Assign(mString);
aReturn.Assign(mValue.mString);
return NS_OK;
}
@ -315,11 +335,12 @@ nsROCSSPrimitiveValue::GetCounterValue(nsIDOMCounter** aReturn)
NS_IMETHODIMP
nsROCSSPrimitiveValue::GetRectValue(nsIDOMRect** aReturn)
{
if (mType != CSS_RECT || !mRect) {
if (mType != CSS_RECT) {
*aReturn = nsnull;
return NS_ERROR_DOM_INVALID_ACCESS_ERR;
}
return CallQueryInterface(mRect, aReturn);
NS_ASSERTION(mValue.mRect, "mValue.mRect should never be null");
return CallQueryInterface(mValue.mRect, aReturn);
}

51
layout/style/nsROCSSPrimitiveValue.h
View File

@ -64,43 +64,74 @@ public:
nsROCSSPrimitiveValue(nsISupports *aOwner, float aP2T);
virtual ~nsROCSSPrimitiveValue();
void SetNumber(float aValue)
{
Reset();
mValue.mFloat = aValue;
mType = CSS_NUMBER;
}
void SetPercent(float aValue)
{
mFloat = aValue;
Reset();
mValue.mFloat = aValue;
mType = CSS_PERCENTAGE;
}
void SetTwips(nscoord aValue)
{
mTwips = aValue;
Reset();
mValue.mTwips = aValue;
mType = CSS_PX;
}
void SetString(const nsACString& aString)
{
CopyASCIItoUCS2(aString, mString);
Reset();
mValue.mString = ToNewUnicode(aString);
mType = CSS_STRING;
}
void SetString(const nsAString& aString)
{
mString.Assign(aString);
Reset();
mValue.mString = ToNewUnicode(aString);
mType = CSS_STRING;
}
void SetRect(nsIDOMRect* aRect)
{
mRect = aRect;
NS_PRECONDITION(aRect, "Null rect being set!");
Reset();
mValue.mRect = aRect;
NS_ADDREF(mValue.mRect);
mType = CSS_RECT;
}
void Reset(void)
{
if (mType == CSS_STRING) {
NS_ASSERTION(mValue.mString, "Null string should never happen");
nsMemory::Free(mValue.mString);
mValue.mString = nsnull;
}
else if (mType == CSS_RECT) {
NS_ASSERTION(mValue.mRect, "Null Rect should never happen");
NS_RELEASE(mValue.mRect);
mValue.mRect = nsnull;
}
}
private:
PRUint16 mType;
nscoord mTwips;
nsCOMPtr<nsIDOMRect> mRect;
nsString mString;
float mFloat;
union {
nscoord mTwips;
float mFloat;
nsIDOMRect* mRect;
PRUnichar* mString;
} mValue;
nsISupports *mOwner;
float mT2P;