From 840596b54d54d5f3685b492d72fc36032285303f Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Fri, 6 Nov 1998 00:56:28 +0000 Subject: [PATCH] removed char* apis fixed ! important property ordering fixed CSSOM access to ! important properties git-svn-id: svn://10.0.0.236/trunk@14176 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/style/src/nsCSSDeclaration.cpp | 42 ++++++++----------- .../content/html/style/src/nsCSSStruct.cpp | 42 ++++++++----------- .../html/style/src/nsCSSDeclaration.cpp | 42 ++++++++----------- mozilla/layout/style/nsCSSDeclaration.cpp | 42 ++++++++----------- mozilla/layout/style/nsCSSStruct.cpp | 42 ++++++++----------- 5 files changed, 90 insertions(+), 120 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index 717bc22d94c..6bd2bf672fe 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -600,19 +600,17 @@ public: nsresult GetData(const nsID& aSID, nsCSSStruct** aData); nsresult EnsureData(const nsID& aSID, nsCSSStruct** aData); - nsresult AppendValue(const char* aProperty, const nsCSSValue& aValue); nsresult AppendValue(PRInt32 aProperty, const nsCSSValue& aValue); - nsresult SetValueImportant(const char* aProperty); nsresult SetValueImportant(PRInt32 aProperty); nsresult AppendComment(const nsString& aComment); - nsresult GetValue(const char* aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsString& aValue); nsresult GetValue(const nsString& aProperty, nsString& aValue); nsresult GetImportantValues(nsICSSDeclaration*& aResult); - nsresult GetValueIsImportant(const char *aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(const nsString& aProperty, PRBool& aIsImportant); PRBool AppendValueToString(PRInt32 aProperty, nsString& aResult); PRBool AppendValueToString(PRInt32 aProperty, const nsCSSValue& aValue, nsString& aResult); @@ -763,11 +761,6 @@ nsresult CSSDeclarationImpl::EnsureData(const nsID& aSID, nsCSSStruct** aDataPtr return NS_OK; } -nsresult CSSDeclarationImpl::AppendValue(const char* aProperty, const nsCSSValue& aValue) -{ - return AppendValue(nsCSSProps::LookupName(aProperty), aValue); -} - #define CSS_ENSURE(data) \ if (nsnull == m##data) { \ m##data = new nsCSS##data(); \ @@ -1261,19 +1254,10 @@ nsresult CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aV mOrder->AppendElement((void*)aProperty); } } - if (nsnull != mImportant) { // remove from important - nsCSSValue null; - mImportant->AppendValue(aProperty, null); - } } return result; } -nsresult CSSDeclarationImpl::SetValueImportant(const char* aProperty) -{ - return SetValueImportant(nsCSSProps::LookupName(aProperty)); -} - #define CSS_ENSURE_IMPORTANT(data) \ if (nsnull == mImportant->m##data) { \ mImportant->m##data = new nsCSS##data(); \ @@ -1935,11 +1919,6 @@ nsresult CSSDeclarationImpl::AppendComment(const nsString& aComment) return result; } -nsresult CSSDeclarationImpl::GetValue(const char* aProperty, nsCSSValue& aValue) -{ - return GetValue(nsCSSProps::LookupName(aProperty), aValue); -} - nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) { nsresult result = NS_OK; @@ -2596,6 +2575,12 @@ PRBool CSSDeclarationImpl::AppendValueToString(PRInt32 aProperty, const nsCSSVal nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsString& aValue) { + PRBool isImportant = PR_FALSE; + GetValueIsImportant(aProperty, isImportant); + if (PR_TRUE == isImportant) { + return mImportant->GetValue(aProperty, aValue); + } + aValue.Truncate(0); // shorthands @@ -2864,7 +2849,16 @@ nsresult CSSDeclarationImpl::GetImportantValues(nsICSSDeclaration*& aResult) return NS_OK; } -nsresult CSSDeclarationImpl::GetValueIsImportant(const char *aProperty, +nsresult CSSDeclarationImpl::GetValueIsImportant(const nsString& aProperty, + PRBool& aIsImportant) +{ + char prop[50]; + aProperty.ToCString(prop, sizeof(prop)); + PRInt32 propID = nsCSSProps::LookupName(prop); + return GetValueIsImportant(propID, aIsImportant); +} + +nsresult CSSDeclarationImpl::GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant) { nsCSSValue val; diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index 717bc22d94c..6bd2bf672fe 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/content/html/style/src/nsCSSStruct.cpp @@ -600,19 +600,17 @@ public: nsresult GetData(const nsID& aSID, nsCSSStruct** aData); nsresult EnsureData(const nsID& aSID, nsCSSStruct** aData); - nsresult AppendValue(const char* aProperty, const nsCSSValue& aValue); nsresult AppendValue(PRInt32 aProperty, const nsCSSValue& aValue); - nsresult SetValueImportant(const char* aProperty); nsresult SetValueImportant(PRInt32 aProperty); nsresult AppendComment(const nsString& aComment); - nsresult GetValue(const char* aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsString& aValue); nsresult GetValue(const nsString& aProperty, nsString& aValue); nsresult GetImportantValues(nsICSSDeclaration*& aResult); - nsresult GetValueIsImportant(const char *aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(const nsString& aProperty, PRBool& aIsImportant); PRBool AppendValueToString(PRInt32 aProperty, nsString& aResult); PRBool AppendValueToString(PRInt32 aProperty, const nsCSSValue& aValue, nsString& aResult); @@ -763,11 +761,6 @@ nsresult CSSDeclarationImpl::EnsureData(const nsID& aSID, nsCSSStruct** aDataPtr return NS_OK; } -nsresult CSSDeclarationImpl::AppendValue(const char* aProperty, const nsCSSValue& aValue) -{ - return AppendValue(nsCSSProps::LookupName(aProperty), aValue); -} - #define CSS_ENSURE(data) \ if (nsnull == m##data) { \ m##data = new nsCSS##data(); \ @@ -1261,19 +1254,10 @@ nsresult CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aV mOrder->AppendElement((void*)aProperty); } } - if (nsnull != mImportant) { // remove from important - nsCSSValue null; - mImportant->AppendValue(aProperty, null); - } } return result; } -nsresult CSSDeclarationImpl::SetValueImportant(const char* aProperty) -{ - return SetValueImportant(nsCSSProps::LookupName(aProperty)); -} - #define CSS_ENSURE_IMPORTANT(data) \ if (nsnull == mImportant->m##data) { \ mImportant->m##data = new nsCSS##data(); \ @@ -1935,11 +1919,6 @@ nsresult CSSDeclarationImpl::AppendComment(const nsString& aComment) return result; } -nsresult CSSDeclarationImpl::GetValue(const char* aProperty, nsCSSValue& aValue) -{ - return GetValue(nsCSSProps::LookupName(aProperty), aValue); -} - nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) { nsresult result = NS_OK; @@ -2596,6 +2575,12 @@ PRBool CSSDeclarationImpl::AppendValueToString(PRInt32 aProperty, const nsCSSVal nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsString& aValue) { + PRBool isImportant = PR_FALSE; + GetValueIsImportant(aProperty, isImportant); + if (PR_TRUE == isImportant) { + return mImportant->GetValue(aProperty, aValue); + } + aValue.Truncate(0); // shorthands @@ -2864,7 +2849,16 @@ nsresult CSSDeclarationImpl::GetImportantValues(nsICSSDeclaration*& aResult) return NS_OK; } -nsresult CSSDeclarationImpl::GetValueIsImportant(const char *aProperty, +nsresult CSSDeclarationImpl::GetValueIsImportant(const nsString& aProperty, + PRBool& aIsImportant) +{ + char prop[50]; + aProperty.ToCString(prop, sizeof(prop)); + PRInt32 propID = nsCSSProps::LookupName(prop); + return GetValueIsImportant(propID, aIsImportant); +} + +nsresult CSSDeclarationImpl::GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant) { nsCSSValue val; diff --git a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp index 717bc22d94c..6bd2bf672fe 100644 --- a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp @@ -600,19 +600,17 @@ public: nsresult GetData(const nsID& aSID, nsCSSStruct** aData); nsresult EnsureData(const nsID& aSID, nsCSSStruct** aData); - nsresult AppendValue(const char* aProperty, const nsCSSValue& aValue); nsresult AppendValue(PRInt32 aProperty, const nsCSSValue& aValue); - nsresult SetValueImportant(const char* aProperty); nsresult SetValueImportant(PRInt32 aProperty); nsresult AppendComment(const nsString& aComment); - nsresult GetValue(const char* aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsString& aValue); nsresult GetValue(const nsString& aProperty, nsString& aValue); nsresult GetImportantValues(nsICSSDeclaration*& aResult); - nsresult GetValueIsImportant(const char *aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(const nsString& aProperty, PRBool& aIsImportant); PRBool AppendValueToString(PRInt32 aProperty, nsString& aResult); PRBool AppendValueToString(PRInt32 aProperty, const nsCSSValue& aValue, nsString& aResult); @@ -763,11 +761,6 @@ nsresult CSSDeclarationImpl::EnsureData(const nsID& aSID, nsCSSStruct** aDataPtr return NS_OK; } -nsresult CSSDeclarationImpl::AppendValue(const char* aProperty, const nsCSSValue& aValue) -{ - return AppendValue(nsCSSProps::LookupName(aProperty), aValue); -} - #define CSS_ENSURE(data) \ if (nsnull == m##data) { \ m##data = new nsCSS##data(); \ @@ -1261,19 +1254,10 @@ nsresult CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aV mOrder->AppendElement((void*)aProperty); } } - if (nsnull != mImportant) { // remove from important - nsCSSValue null; - mImportant->AppendValue(aProperty, null); - } } return result; } -nsresult CSSDeclarationImpl::SetValueImportant(const char* aProperty) -{ - return SetValueImportant(nsCSSProps::LookupName(aProperty)); -} - #define CSS_ENSURE_IMPORTANT(data) \ if (nsnull == mImportant->m##data) { \ mImportant->m##data = new nsCSS##data(); \ @@ -1935,11 +1919,6 @@ nsresult CSSDeclarationImpl::AppendComment(const nsString& aComment) return result; } -nsresult CSSDeclarationImpl::GetValue(const char* aProperty, nsCSSValue& aValue) -{ - return GetValue(nsCSSProps::LookupName(aProperty), aValue); -} - nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) { nsresult result = NS_OK; @@ -2596,6 +2575,12 @@ PRBool CSSDeclarationImpl::AppendValueToString(PRInt32 aProperty, const nsCSSVal nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsString& aValue) { + PRBool isImportant = PR_FALSE; + GetValueIsImportant(aProperty, isImportant); + if (PR_TRUE == isImportant) { + return mImportant->GetValue(aProperty, aValue); + } + aValue.Truncate(0); // shorthands @@ -2864,7 +2849,16 @@ nsresult CSSDeclarationImpl::GetImportantValues(nsICSSDeclaration*& aResult) return NS_OK; } -nsresult CSSDeclarationImpl::GetValueIsImportant(const char *aProperty, +nsresult CSSDeclarationImpl::GetValueIsImportant(const nsString& aProperty, + PRBool& aIsImportant) +{ + char prop[50]; + aProperty.ToCString(prop, sizeof(prop)); + PRInt32 propID = nsCSSProps::LookupName(prop); + return GetValueIsImportant(propID, aIsImportant); +} + +nsresult CSSDeclarationImpl::GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant) { nsCSSValue val; diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index 717bc22d94c..6bd2bf672fe 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -600,19 +600,17 @@ public: nsresult GetData(const nsID& aSID, nsCSSStruct** aData); nsresult EnsureData(const nsID& aSID, nsCSSStruct** aData); - nsresult AppendValue(const char* aProperty, const nsCSSValue& aValue); nsresult AppendValue(PRInt32 aProperty, const nsCSSValue& aValue); - nsresult SetValueImportant(const char* aProperty); nsresult SetValueImportant(PRInt32 aProperty); nsresult AppendComment(const nsString& aComment); - nsresult GetValue(const char* aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsString& aValue); nsresult GetValue(const nsString& aProperty, nsString& aValue); nsresult GetImportantValues(nsICSSDeclaration*& aResult); - nsresult GetValueIsImportant(const char *aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(const nsString& aProperty, PRBool& aIsImportant); PRBool AppendValueToString(PRInt32 aProperty, nsString& aResult); PRBool AppendValueToString(PRInt32 aProperty, const nsCSSValue& aValue, nsString& aResult); @@ -763,11 +761,6 @@ nsresult CSSDeclarationImpl::EnsureData(const nsID& aSID, nsCSSStruct** aDataPtr return NS_OK; } -nsresult CSSDeclarationImpl::AppendValue(const char* aProperty, const nsCSSValue& aValue) -{ - return AppendValue(nsCSSProps::LookupName(aProperty), aValue); -} - #define CSS_ENSURE(data) \ if (nsnull == m##data) { \ m##data = new nsCSS##data(); \ @@ -1261,19 +1254,10 @@ nsresult CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aV mOrder->AppendElement((void*)aProperty); } } - if (nsnull != mImportant) { // remove from important - nsCSSValue null; - mImportant->AppendValue(aProperty, null); - } } return result; } -nsresult CSSDeclarationImpl::SetValueImportant(const char* aProperty) -{ - return SetValueImportant(nsCSSProps::LookupName(aProperty)); -} - #define CSS_ENSURE_IMPORTANT(data) \ if (nsnull == mImportant->m##data) { \ mImportant->m##data = new nsCSS##data(); \ @@ -1935,11 +1919,6 @@ nsresult CSSDeclarationImpl::AppendComment(const nsString& aComment) return result; } -nsresult CSSDeclarationImpl::GetValue(const char* aProperty, nsCSSValue& aValue) -{ - return GetValue(nsCSSProps::LookupName(aProperty), aValue); -} - nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) { nsresult result = NS_OK; @@ -2596,6 +2575,12 @@ PRBool CSSDeclarationImpl::AppendValueToString(PRInt32 aProperty, const nsCSSVal nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsString& aValue) { + PRBool isImportant = PR_FALSE; + GetValueIsImportant(aProperty, isImportant); + if (PR_TRUE == isImportant) { + return mImportant->GetValue(aProperty, aValue); + } + aValue.Truncate(0); // shorthands @@ -2864,7 +2849,16 @@ nsresult CSSDeclarationImpl::GetImportantValues(nsICSSDeclaration*& aResult) return NS_OK; } -nsresult CSSDeclarationImpl::GetValueIsImportant(const char *aProperty, +nsresult CSSDeclarationImpl::GetValueIsImportant(const nsString& aProperty, + PRBool& aIsImportant) +{ + char prop[50]; + aProperty.ToCString(prop, sizeof(prop)); + PRInt32 propID = nsCSSProps::LookupName(prop); + return GetValueIsImportant(propID, aIsImportant); +} + +nsresult CSSDeclarationImpl::GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant) { nsCSSValue val; diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index 717bc22d94c..6bd2bf672fe 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/layout/style/nsCSSStruct.cpp @@ -600,19 +600,17 @@ public: nsresult GetData(const nsID& aSID, nsCSSStruct** aData); nsresult EnsureData(const nsID& aSID, nsCSSStruct** aData); - nsresult AppendValue(const char* aProperty, const nsCSSValue& aValue); nsresult AppendValue(PRInt32 aProperty, const nsCSSValue& aValue); - nsresult SetValueImportant(const char* aProperty); nsresult SetValueImportant(PRInt32 aProperty); nsresult AppendComment(const nsString& aComment); - nsresult GetValue(const char* aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsCSSValue& aValue); nsresult GetValue(PRInt32 aProperty, nsString& aValue); nsresult GetValue(const nsString& aProperty, nsString& aValue); nsresult GetImportantValues(nsICSSDeclaration*& aResult); - nsresult GetValueIsImportant(const char *aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant); + nsresult GetValueIsImportant(const nsString& aProperty, PRBool& aIsImportant); PRBool AppendValueToString(PRInt32 aProperty, nsString& aResult); PRBool AppendValueToString(PRInt32 aProperty, const nsCSSValue& aValue, nsString& aResult); @@ -763,11 +761,6 @@ nsresult CSSDeclarationImpl::EnsureData(const nsID& aSID, nsCSSStruct** aDataPtr return NS_OK; } -nsresult CSSDeclarationImpl::AppendValue(const char* aProperty, const nsCSSValue& aValue) -{ - return AppendValue(nsCSSProps::LookupName(aProperty), aValue); -} - #define CSS_ENSURE(data) \ if (nsnull == m##data) { \ m##data = new nsCSS##data(); \ @@ -1261,19 +1254,10 @@ nsresult CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aV mOrder->AppendElement((void*)aProperty); } } - if (nsnull != mImportant) { // remove from important - nsCSSValue null; - mImportant->AppendValue(aProperty, null); - } } return result; } -nsresult CSSDeclarationImpl::SetValueImportant(const char* aProperty) -{ - return SetValueImportant(nsCSSProps::LookupName(aProperty)); -} - #define CSS_ENSURE_IMPORTANT(data) \ if (nsnull == mImportant->m##data) { \ mImportant->m##data = new nsCSS##data(); \ @@ -1935,11 +1919,6 @@ nsresult CSSDeclarationImpl::AppendComment(const nsString& aComment) return result; } -nsresult CSSDeclarationImpl::GetValue(const char* aProperty, nsCSSValue& aValue) -{ - return GetValue(nsCSSProps::LookupName(aProperty), aValue); -} - nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) { nsresult result = NS_OK; @@ -2596,6 +2575,12 @@ PRBool CSSDeclarationImpl::AppendValueToString(PRInt32 aProperty, const nsCSSVal nsresult CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsString& aValue) { + PRBool isImportant = PR_FALSE; + GetValueIsImportant(aProperty, isImportant); + if (PR_TRUE == isImportant) { + return mImportant->GetValue(aProperty, aValue); + } + aValue.Truncate(0); // shorthands @@ -2864,7 +2849,16 @@ nsresult CSSDeclarationImpl::GetImportantValues(nsICSSDeclaration*& aResult) return NS_OK; } -nsresult CSSDeclarationImpl::GetValueIsImportant(const char *aProperty, +nsresult CSSDeclarationImpl::GetValueIsImportant(const nsString& aProperty, + PRBool& aIsImportant) +{ + char prop[50]; + aProperty.ToCString(prop, sizeof(prop)); + PRInt32 propID = nsCSSProps::LookupName(prop); + return GetValueIsImportant(propID, aIsImportant); +} + +nsresult CSSDeclarationImpl::GetValueIsImportant(PRInt32 aProperty, PRBool& aIsImportant) { nsCSSValue val;