From 6acac9aa1bc5f7588db96a05b735e797f19c8f27 Mon Sep 17 00:00:00 2001
From: "peterl%netscape.com"
 <peterl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 26 Oct 1998 23:20:45 +0000
Subject: [PATCH] moved !important handling into parser

git-svn-id: svn://10.0.0.236/trunk@13509 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp | 6 +-----
 mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp  | 6 +-----
 mozilla/layout/style/nsDOMCSSDeclaration.cpp           | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp
index dedd6fff82e..d698522afc4 100644
--- a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp
+++ b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp
@@ -189,6 +189,7 @@ nsDOMCSSDeclaration::SetProperty(const nsString& aPropertyName,
     declString.SetString(aPropertyName);
     declString.Append(":");
     declString.Append(aValue);
+    declString.Append(aPriority);
 
     nsICSSParser* css;
     result = NS_NewCSSParser(&css);
@@ -196,11 +197,6 @@ nsDOMCSSDeclaration::SetProperty(const nsString& aPropertyName,
       PRInt32 hint;
       result = css->ParseAndAppendDeclaration(declString, nsnull, decl, &hint);
       if (NS_OK == result) {
-        if (aPriority.Equals("!important")) {
-          char prop[50];
-          aPropertyName.ToCString(prop, sizeof(prop));
-          decl->SetValueImportant(prop);
-        }
         result = StylePropertyChanged(aPropertyName, hint);
       }
       NS_RELEASE(css);
diff --git a/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp
index dedd6fff82e..d698522afc4 100644
--- a/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp
+++ b/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp
@@ -189,6 +189,7 @@ nsDOMCSSDeclaration::SetProperty(const nsString& aPropertyName,
     declString.SetString(aPropertyName);
     declString.Append(":");
     declString.Append(aValue);
+    declString.Append(aPriority);
 
     nsICSSParser* css;
     result = NS_NewCSSParser(&css);
@@ -196,11 +197,6 @@ nsDOMCSSDeclaration::SetProperty(const nsString& aPropertyName,
       PRInt32 hint;
       result = css->ParseAndAppendDeclaration(declString, nsnull, decl, &hint);
       if (NS_OK == result) {
-        if (aPriority.Equals("!important")) {
-          char prop[50];
-          aPropertyName.ToCString(prop, sizeof(prop));
-          decl->SetValueImportant(prop);
-        }
         result = StylePropertyChanged(aPropertyName, hint);
       }
       NS_RELEASE(css);
diff --git a/mozilla/layout/style/nsDOMCSSDeclaration.cpp b/mozilla/layout/style/nsDOMCSSDeclaration.cpp
index dedd6fff82e..d698522afc4 100644
--- a/mozilla/layout/style/nsDOMCSSDeclaration.cpp
+++ b/mozilla/layout/style/nsDOMCSSDeclaration.cpp
@@ -189,6 +189,7 @@ nsDOMCSSDeclaration::SetProperty(const nsString& aPropertyName,
     declString.SetString(aPropertyName);
     declString.Append(":");
     declString.Append(aValue);
+    declString.Append(aPriority);
 
     nsICSSParser* css;
     result = NS_NewCSSParser(&css);
@@ -196,11 +197,6 @@ nsDOMCSSDeclaration::SetProperty(const nsString& aPropertyName,
       PRInt32 hint;
       result = css->ParseAndAppendDeclaration(declString, nsnull, decl, &hint);
       if (NS_OK == result) {
-        if (aPriority.Equals("!important")) {
-          char prop[50];
-          aPropertyName.ToCString(prop, sizeof(prop));
-          decl->SetValueImportant(prop);
-        }
         result = StylePropertyChanged(aPropertyName, hint);
       }
       NS_RELEASE(css);