Backing out patches for bugs 405069 and 346079 to track down perf regression.

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>
 

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;