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

Remove static constructor for nsStyleColor. r=disttsc@bart.nl sr=brendan@mozilla.org b=67341

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@87446 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2001-02-20 13:44:43 +00:00
parent db431b7f8a
commit a1ecca2ca4
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/content/base/src/nsSelection.cpp
View File

@@ -437,7 +437,7 @@ public:
static nsIAtom *sCellAtom;
static nsIAtom *sTbodyAtom;
static PRInt32 sInstanceCount;
static nsStyleColor sTableStyleColor;
static nsStyleColor *sTableStyleColor;
};
class nsSelectionIterator : public nsIBidirectionalEnumerator
@@ -620,7 +620,7 @@ nsIAtom *nsSelection::sRowAtom = 0;
nsIAtom *nsSelection::sCellAtom = 0;
nsIAtom *nsSelection::sTbodyAtom = 0;
PRInt32 nsSelection::sInstanceCount = 0;
nsStyleColor nsSelection::sTableStyleColor;
nsStyleColor *nsSelection::sTableStyleColor = 0;
static PRInt8
GetIndexFromSelectionType(SelectionType aType)
@@ -843,15 +843,16 @@ nsSelection::nsSelection()
sRowAtom = NS_NewAtom("tr");
sCellAtom = NS_NewAtom("td");
sTbodyAtom = NS_NewAtom("tbody");
sTableStyleColor.mColor = NS_RGB(128,0,0);
sTableStyleColor.mBackgroundColor = NS_RGB(128,0,0);
sTableStyleColor.mOpacity= (float)1;
sTableStyleColor.mBackgroundAttachment=0;
sTableStyleColor.mBackgroundFlags=NS_STYLE_BG_IMAGE_NONE;
sTableStyleColor.mBackgroundRepeat=1;
sTableStyleColor.mBackgroundXPosition=0;
sTableStyleColor.mBackgroundYPosition=0;
sTableStyleColor.mCursor=1;
sTableStyleColor = new nsStyleColor();
sTableStyleColor->mColor = NS_RGB(128,0,0);
sTableStyleColor->mBackgroundColor = NS_RGB(128,0,0);
sTableStyleColor->mOpacity= (float)1;
sTableStyleColor->mBackgroundAttachment=0;
sTableStyleColor->mBackgroundFlags=NS_STYLE_BG_IMAGE_NONE;
sTableStyleColor->mBackgroundRepeat=1;
sTableStyleColor->mBackgroundXPosition=0;
sTableStyleColor->mBackgroundYPosition=0;
sTableStyleColor->mCursor=1;
}
mHint = HINTLEFT;
sInstanceCount ++;
@@ -898,6 +899,7 @@ nsSelection::~nsSelection()
NS_IF_RELEASE(sRowAtom);
NS_IF_RELEASE(sCellAtom);
NS_IF_RELEASE(sTbodyAtom);
delete sTableStyleColor;
}
PRInt32 i;
for (i = 0;i<nsISelectionController::NUM_SELECTIONTYPES;i++){
@@ -1909,7 +1911,7 @@ nsSelection::GetTableCellSelectionStyleColor(const nsStyleColor **aStyleColor)
{
if (!aStyleColor)
return NS_ERROR_NULL_POINTER;
*aStyleColor = &sTableStyleColor;
*aStyleColor = sTableStyleColor;
return NS_OK;
}

26
mozilla/layout/generic/nsSelection.cpp
View File

@@ -437,7 +437,7 @@ public:
static nsIAtom *sCellAtom;
static nsIAtom *sTbodyAtom;
static PRInt32 sInstanceCount;
static nsStyleColor sTableStyleColor;
static nsStyleColor *sTableStyleColor;
};
class nsSelectionIterator : public nsIBidirectionalEnumerator
@@ -620,7 +620,7 @@ nsIAtom *nsSelection::sRowAtom = 0;
nsIAtom *nsSelection::sCellAtom = 0;
nsIAtom *nsSelection::sTbodyAtom = 0;
PRInt32 nsSelection::sInstanceCount = 0;
nsStyleColor nsSelection::sTableStyleColor;
nsStyleColor *nsSelection::sTableStyleColor = 0;
static PRInt8
GetIndexFromSelectionType(SelectionType aType)
@@ -843,15 +843,16 @@ nsSelection::nsSelection()
sRowAtom = NS_NewAtom("tr");
sCellAtom = NS_NewAtom("td");
sTbodyAtom = NS_NewAtom("tbody");
sTableStyleColor.mColor = NS_RGB(128,0,0);
sTableStyleColor.mBackgroundColor = NS_RGB(128,0,0);
sTableStyleColor.mOpacity= (float)1;
sTableStyleColor.mBackgroundAttachment=0;
sTableStyleColor.mBackgroundFlags=NS_STYLE_BG_IMAGE_NONE;
sTableStyleColor.mBackgroundRepeat=1;
sTableStyleColor.mBackgroundXPosition=0;
sTableStyleColor.mBackgroundYPosition=0;
sTableStyleColor.mCursor=1;
sTableStyleColor = new nsStyleColor();
sTableStyleColor->mColor = NS_RGB(128,0,0);
sTableStyleColor->mBackgroundColor = NS_RGB(128,0,0);
sTableStyleColor->mOpacity= (float)1;
sTableStyleColor->mBackgroundAttachment=0;
sTableStyleColor->mBackgroundFlags=NS_STYLE_BG_IMAGE_NONE;
sTableStyleColor->mBackgroundRepeat=1;
sTableStyleColor->mBackgroundXPosition=0;
sTableStyleColor->mBackgroundYPosition=0;
sTableStyleColor->mCursor=1;
}
mHint = HINTLEFT;
sInstanceCount ++;
@@ -898,6 +899,7 @@ nsSelection::~nsSelection()
NS_IF_RELEASE(sRowAtom);
NS_IF_RELEASE(sCellAtom);
NS_IF_RELEASE(sTbodyAtom);
delete sTableStyleColor;
}
PRInt32 i;
for (i = 0;i<nsISelectionController::NUM_SELECTIONTYPES;i++){
@@ -1909,7 +1911,7 @@ nsSelection::GetTableCellSelectionStyleColor(const nsStyleColor **aStyleColor)
{
if (!aStyleColor)
return NS_ERROR_NULL_POINTER;
*aStyleColor = &sTableStyleColor;
*aStyleColor = sTableStyleColor;
return NS_OK;
}