Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce code duplication between assignment operator and copy constructor and improve assignment operator. b=288707 r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@171530 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2005-04-03 16:47:01 +00:00
parent 810cc2cc22
commit 8bf49cdf38
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/layout/style/nsCSSValue.cpp
View File

@@ -159,33 +159,9 @@ nsCSSValue::~nsCSSValue()
nsCSSValue& nsCSSValue::operator=(const nsCSSValue& aCopy)
{
Reset();
mUnit = aCopy.mUnit;
if ((eCSSUnit_String <= mUnit) && (mUnit <= eCSSUnit_Attr)) {
if (nsnull != aCopy.mValue.mString) {
mValue.mString = nsCRT::strdup(aCopy.mValue.mString);
}
}
else if ((eCSSUnit_Integer <= mUnit) && (mUnit <= eCSSUnit_Enumerated)) {
mValue.mInt = aCopy.mValue.mInt;
}
else if (eCSSUnit_Color == mUnit){
mValue.mColor = aCopy.mValue.mColor;
}
else if (eCSSUnit_Array <= mUnit && mUnit <= eCSSUnit_Counters) {
mValue.mArray = aCopy.mValue.mArray;
mValue.mArray->AddRef();
}
else if (eCSSUnit_URL == mUnit){
mValue.mURL = aCopy.mValue.mURL;
mValue.mURL->AddRef();
}
else if (eCSSUnit_Image == mUnit){
mValue.mImage = aCopy.mValue.mImage;
mValue.mImage->AddRef();
}
else {
mValue.mFloat = aCopy.mValue.mFloat;
if (this != &aCopy) {
Reset();
new (this) nsCSSValue(aCopy);
}
return *this;
}