From cee590e6c824c03971386ff7099187242e8ce7d7 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 1 Dec 2007 02:23:27 +0000
Subject: [PATCH] Backing out patches for bugs 405069 and 346079 to track down
 perf regression.

git-svn-id: svn://10.0.0.236/trunk@240184 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/components/search/content/search.xml        | 5 -----
 mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/mozilla/browser/components/search/content/search.xml b/mozilla/browser/components/search/content/search.xml
index 4e2fd1673aa..3995234f7ea 100644
--- a/mozilla/browser/components/search/content/search.xml
+++ b/mozilla/browser/components/search/content/search.xml
@@ -25,7 +25,6 @@
 #   Gavin Sharp (v3) <gavin@gavinsharp.com>
 #   Ben Goodger <beng@google.com>
 #   Pamela Greene <pamg.bugs@gmail.com>
-#   Michael Ventnor <m.ventnor@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -549,10 +548,6 @@
       ]]></handler>
 
       <handler event="popupshowing" action="this.rebuildPopupDynamic();"/>
-
-      <handler event="DOMMouseScroll"
-               phase="capturing"
-               action="this.selectEngine(event, (event.detail > 0));"/>
     </handlers>
   </binding>
 
diff --git a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
index 1449e7d9b88..3276742213a 100644
--- a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -578,8 +578,7 @@ txXPathNodeUtils::appendNodeValue(const txXPathNode& aNode, nsAString& aResult)
     }
 
     if (aNode.isDocument() ||
-        aNode.mNode->IsNodeOfType(nsINode::eELEMENT) ||
-        aNode.mNode->IsNodeOfType(nsINode::eDOCUMENT_FRAGMENT)) {
+        aNode.mNode->IsNodeOfType(nsINode::eELEMENT)) {
         nsContentUtils::AppendNodeTextContent(aNode.mNode, PR_TRUE, aResult);
 
         return;