From 5e80b096eff16925655d2cceb7a76da5b34f456f Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 30 Oct 2000 09:24:11 +0000
Subject: [PATCH] Fix for 57139, a=ben

git-svn-id: svn://10.0.0.236/trunk@81999 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/xul/content/src/nsXULElement.cpp | 16 ++++++----------
 mozilla/rdf/content/src/nsXULElement.cpp         | 16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index a1d44c2dd8c..1e62e0adc30 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -603,6 +603,12 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result)
       else
         return NS_NOINTERFACE;
     }
+    /*else if (mScriptObject && mDocument) {
+        nsCOMPtr<nsIBindingManager> manager;
+        mDocument->GetBindingManager(getter_AddRefs(manager));
+        return manager->GetBindingImplementation(NS_STATIC_CAST(nsIStyledContent*, this), mScriptObject, 
+                                                 iid, result);
+    }*/
     else {
         *result = nsnull;
         return NS_NOINTERFACE;
@@ -3899,16 +3905,6 @@ nsXULElement::GetMappedAttributeImpact(const nsIAtom* aAttribute,
         // "style" attribute anyway.
         aHint = NS_STYLE_HINT_FRAMECHANGE;
     }
-    else if (NodeInfo()->Equals(nsXULAtoms::treeitem)) {
-        // Force a framechange if the 'open' atom changes on a <treeitem>
-        if (nsXULAtoms::open == aAttribute)
-            aHint = NS_STYLE_HINT_FRAMECHANGE;
-    }
-    else if (NodeInfo()->Equals(nsXULAtoms::treecol)) {
-        // Ignore 'width' and 'hidden' on a <treecol>
-        if (nsXULAtoms::width == aAttribute || nsXULAtoms::hidden == aAttribute)
-            aHint = NS_STYLE_HINT_REFLOW;
-    }
     else if (NodeInfo()->Equals(nsXULAtoms::window)) {
         // Ignore 'width' and 'height' on a <window>
         if (nsXULAtoms::width == aAttribute || nsXULAtoms::height == aAttribute)
diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp
index a1d44c2dd8c..1e62e0adc30 100644
--- a/mozilla/rdf/content/src/nsXULElement.cpp
+++ b/mozilla/rdf/content/src/nsXULElement.cpp
@@ -603,6 +603,12 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result)
       else
         return NS_NOINTERFACE;
     }
+    /*else if (mScriptObject && mDocument) {
+        nsCOMPtr<nsIBindingManager> manager;
+        mDocument->GetBindingManager(getter_AddRefs(manager));
+        return manager->GetBindingImplementation(NS_STATIC_CAST(nsIStyledContent*, this), mScriptObject, 
+                                                 iid, result);
+    }*/
     else {
         *result = nsnull;
         return NS_NOINTERFACE;
@@ -3899,16 +3905,6 @@ nsXULElement::GetMappedAttributeImpact(const nsIAtom* aAttribute,
         // "style" attribute anyway.
         aHint = NS_STYLE_HINT_FRAMECHANGE;
     }
-    else if (NodeInfo()->Equals(nsXULAtoms::treeitem)) {
-        // Force a framechange if the 'open' atom changes on a <treeitem>
-        if (nsXULAtoms::open == aAttribute)
-            aHint = NS_STYLE_HINT_FRAMECHANGE;
-    }
-    else if (NodeInfo()->Equals(nsXULAtoms::treecol)) {
-        // Ignore 'width' and 'hidden' on a <treecol>
-        if (nsXULAtoms::width == aAttribute || nsXULAtoms::hidden == aAttribute)
-            aHint = NS_STYLE_HINT_REFLOW;
-    }
     else if (NodeInfo()->Equals(nsXULAtoms::window)) {
         // Ignore 'width' and 'height' on a <window>
         if (nsXULAtoms::width == aAttribute || nsXULAtoms::height == aAttribute)