Backed out changeset 016a7b78157a (bug 903274) for causing bug 960864. a=backout
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 17 Jan 2014 21:42:07 -0500
changeset 175865 c2fef4e82f9894974d8d341239e8b0bb6c87ea53
parent 175864 1f9d7af129608aeadcf7c2720e9da6cee63fd354
child 175866 465686bb6f6af59636052293305920297f6464aa
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs903274, 960864
milestone28.0a2
backs out016a7b78157af10f8f42364d2b6706c52d952abe
Backed out changeset 016a7b78157a (bug 903274) for causing bug 960864. a=backout
browser/components/search/content/search.xml
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -77,32 +77,26 @@
         var os =
                Components.classes["@mozilla.org/observer-service;1"]
                          .getService(Components.interfaces.nsIObserverService);
         os.addObserver(this, "browser-search-engine-modified", false);
 
         this._addedObserver = true;
 
         this.searchService.init((function search_init_cb(aStatus) {
-          // Bail out if the binding's been destroyed
-          if (this._destroyed)
-            return;
-
           if (Components.isSuccessCode(aStatus)) {
             // Refresh the display (updating icon, etc)
             this.updateDisplay();
           } else {
             Components.utils.reportError("Cannot initialize search service, bailing out: " + aStatus);
           }
         }).bind(this));
       ]]></constructor>
 
       <destructor><![CDATA[
-        this._destroyed = true;
-
         if (this._addedObserver) {
           var os = Components.classes["@mozilla.org/observer-service;1"]
                              .getService(Components.interfaces.nsIObserverService);
           os.removeObserver(this, "browser-search-engine-modified");
           this._addedObserver = false;
         }
 
         // Make sure to break the cycle from _textbox to us. Otherwise we leak