Backed out changeset 4e9389db3a5a (bug 1219788) for causing M(JP) LSAN permaleaks. a=backout
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 01 Jan 2016 20:21:59 -0500
changeset 278242 ce643acfab14d95bea2fb6c4f56477413514b686
parent 278241 dd6de89a16f2c1b36d429b6a5cf1ebb5477a6b60
child 278243 d3866546b914f8cd523abcc9684687771a82c016
child 278246 68fedf40cc75714593c1157e051fb212aa4c3cf2
child 278247 38691f12bf563dbaad18f7fb05698614b006d79e
push id69704
push userryanvm@gmail.com
push dateSat, 02 Jan 2016 01:43:23 +0000
treeherdermozilla-inbound@ce643acfab14 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1219788
milestone46.0a1
backs out4e9389db3a5af29a13e700b29b739055437868d0
first release with
nightly linux32
ce643acfab14 / 46.0a1 / 20160102030217 / files
nightly linux64
ce643acfab14 / 46.0a1 / 20160102030217 / files
nightly mac
ce643acfab14 / 46.0a1 / 20160102030217 / files
nightly win32
ce643acfab14 / 46.0a1 / 20160102030217 / files
nightly win64
ce643acfab14 / 46.0a1 / 20160102030217 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 4e9389db3a5a (bug 1219788) for causing M(JP) LSAN permaleaks. a=backout
browser/base/content/browser-places.js
browser/base/content/browser.js
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1812,49 +1812,8 @@ var BookmarkingUI = {
     if (aNode.getAttribute("label") != this._starButtonLabel)
       aNode.setAttribute("label", this._starButtonLabel);
   },
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsINavBookmarkObserver
   ])
 };
-
-var AutoShowBookmarksToolbar = {
-  init() {
-    PlacesUtils.addLazyBookmarkObserver(this, false);
-  },
-
-  uninit() {
-    PlacesUtils.removeLazyBookmarkObserver(this);
-  },
-
-  onItemAdded(aItemId, aParentId, aIndex, aItemType, aURI, aTitle, aDateAdded,
-              aGuid, aParentGuid) {
-    this._autoshow(aParentGuid);
-  },
-  onBeginUpdateBatch() {},
-  onEndUpdateBatch() {},
-  onItemRemoved() {},
-  onItemChanged() {},
-  onItemVisited() {},
-  onItemMoved(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex, aItemType,
-              aGuid, aOldParentGuid, aNewParentGuid) {
-    this._autoshow(aNewParentGuid);
-  },
-
-  _autoshow(aParentGuid) {
-    if (aParentGuid != PlacesUtils.bookmarks.toolbarGuid)
-      return;
-
-    let toolbar = document.getElementById("PersonalToolbar");
-    if (!toolbar.collapsed)
-      return;
-
-    let placement = CustomizableUI.getPlacementOfWidget("personal-bookmarks");
-    let area = placement && placement.area;
-    if (area != CustomizableUI.AREA_BOOKMARKS)
-      return;
-
-    setToolbarVisibility(toolbar, true);
-  }
-};
-
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1183,17 +1183,16 @@ var gBrowserInit = {
         !focusAndSelectUrlBar()) {
       gBrowser.selectedBrowser.focus();
     }
 
     // Enable/Disable auto-hide tabbar
     gBrowser.tabContainer.updateVisibility();
 
     BookmarkingUI.init();
-    AutoShowBookmarksToolbar.init();
 
     gPrefService.addObserver(gHomeButton.prefDomain, gHomeButton, false);
 
     var homeButton = document.getElementById("home-button");
     gHomeButton.updateTooltip(homeButton);
 
     let safeMode = document.getElementById("helpSafeMode");
     if (Services.appinfo.inSafeMode) {
@@ -1418,16 +1417,18 @@ var gBrowserInit = {
     try {
       gBrowser.removeProgressListener(window.XULBrowserWindow);
       gBrowser.removeTabsProgressListener(window.TabsProgressListener);
     } catch (ex) {
     }
 
     PlacesToolbarHelper.uninit();
 
+    BookmarkingUI.uninit();
+
     TabsInTitlebar.uninit();
 
     ToolbarIconColor.uninit();
 
     TabletModeUpdater.uninit();
 
     gTabletModePageCounter.finish();
 
@@ -1478,18 +1479,16 @@ var gBrowserInit = {
         this.gmpInstallManager.uninit();
       }
 
       BrowserOffline.uninit();
       OfflineApps.uninit();
       IndexedDBPromptHelper.uninit();
       LightweightThemeListener.uninit();
       PanelUI.uninit();
-      BookmarkingUI.uninit();
-      AutoShowBookmarksToolbar.uninit();
     }
 
     // Final window teardown, do this last.
     window.XULBrowserWindow = null;
     window.QueryInterface(Ci.nsIInterfaceRequestor)
           .getInterface(Ci.nsIWebNavigation)
           .QueryInterface(Ci.nsIDocShellTreeItem).treeOwner
           .QueryInterface(Ci.nsIInterfaceRequestor)