Merge m-c to fx-team. a=merge

browser/base/content/browser-places.js

@@ -1817,44 +1817,3 @@ var BookmarkingUI = {
     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);
-  }
-};
-

browser/base/content/browser.js

@@ -1188,7 +1188,6 @@ var gBrowserInit = {
     gBrowser.tabContainer.updateVisibility();
 
     BookmarkingUI.init();
-    AutoShowBookmarksToolbar.init();
 
     gPrefService.addObserver(gHomeButton.prefDomain, gHomeButton, false);
 
@@ -1423,6 +1422,8 @@ var gBrowserInit = {
 
     PlacesToolbarHelper.uninit();
 
+    BookmarkingUI.uninit();
+
     TabsInTitlebar.uninit();
 
     ToolbarIconColor.uninit();
@@ -1483,8 +1484,6 @@ var gBrowserInit = {
       IndexedDBPromptHelper.uninit();
       LightweightThemeListener.uninit();
       PanelUI.uninit();
-      BookmarkingUI.uninit();
-      AutoShowBookmarksToolbar.uninit();
     }
 
     // Final window teardown, do this last.

dom/canvas/WebGLContextBuffers.cpp

@@ -179,7 +179,7 @@ WebGLContext::BufferData(GLenum target, WebGLsizeiptr size, GLenum usage)
     boundBuffer->SetByteLength(size);
 
     if (!boundBuffer->ElementArrayCacheBufferData(nullptr, size)) {
-		boundBuffer->SetByteLength(0);
+        boundBuffer->SetByteLength(0);
         return ErrorOutOfMemory("bufferData: out of memory");
     }
 }
@@ -232,7 +232,7 @@ WebGLContext::BufferDataT(GLenum target,
 
     // Warning: Possibly shared memory.  See bug 1225033.
     if (!boundBuffer->ElementArrayCacheBufferData(data.DataAllowShared(), data.LengthAllowShared())) {
-		boundBuffer->SetByteLength(0);
+        boundBuffer->SetByteLength(0);
         return ErrorOutOfMemory("bufferData: out of memory");
 	}
 }