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

Bug 94243: VoidArray usage patch. a=asa sr=brendan r=waterson r=bienvenu

Browse Source 
r=pierre r=jband/dbradley  Also fixes some whitespace issues.


git-svn-id: svn://10.0.0.236/trunk@101822 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjesup%wgate.com
2001-08-27 06:15:54 +00:00
parent 61cb4c1923
commit 288182f644
17 changed files with 143 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/content/html/style/src/nsCSSStruct.cpp
View File

@@ -1148,7 +1148,7 @@ CSSDeclarationImpl::CSSDeclarationImpl(const CSSDeclarationImpl& aCopy)
}
if (aCopy.mOrder) {
mOrder = new nsVoidArray();
mOrder = new nsAutoVoidArray();
if (mOrder) {
(*mOrder) = *(aCopy.mOrder);
}
@@ -1853,13 +1853,16 @@ CSSDeclarationImpl::AppendValue(nsCSSProperty aProperty, const nsCSSValue& aValu
if (NS_OK == result) {
if (nsnull == mOrder) {
mOrder = new nsVoidArray();
mOrder = new nsAutoVoidArray();
}
if (nsnull != mOrder) {
else {
// order IS important for CSS, so remove and add to the end
PRInt32 index = mOrder->IndexOf((void*)aProperty);
if (-1 != index) {
mOrder->RemoveElementAt(index);
}
}
if (nsnull != mOrder) {
if (eCSSUnit_Null != aValue.GetUnit()) {
mOrder->AppendElement((void*)(PRInt32)aProperty);
}
@@ -1934,13 +1937,16 @@ CSSDeclarationImpl::AppendStructValue(nsCSSProperty aProperty, void* aStruct)
if (NS_OK == result) {
if (nsnull == mOrder) {
mOrder = new nsVoidArray();
mOrder = new nsAutoVoidArray();
}
if (nsnull != mOrder) {
else {
// order IS important for CSS, so remove and add to the end
PRInt32 index = mOrder->IndexOf((void*)(PRInt32)aProperty);
if (-1 != index) {
mOrder->RemoveElementAt(index);
}
}
if (nsnull != mOrder) {
mOrder->AppendElement((void*)(PRInt32)aProperty);
}
}
@@ -3439,7 +3445,7 @@ CSSDeclarationImpl::AppendComment(const nsAReadableString& aComment)
nsresult result = NS_ERROR_OUT_OF_MEMORY;
if (nsnull == mOrder) {
mOrder = new nsVoidArray();
mOrder = new nsAutoVoidArray();
}
if (nsnull == mComments) {
mComments = new nsStringArray();