mozilla-central: changeset 173123:f66e3ccb0c419a538cab1200ce16670e31ed007b

☠☠ backed out by ac800841c853 ☠ ☠
author	Gijs Kruitbosch <gijskruitbosch@gmail.com>
	Tue, 11 Mar 2014 18:16:21 +0000
changeset 173123	f66e3ccb0c419a538cab1200ce16670e31ed007b
parent 173122	e1f1f275f9021b76c20a3b3d5ab09de1a654f4c1
child 173124	512f9b89f5ccf7f69ac5a7a64bc5a13c93895b53
push id	26391
push user	cbook@mozilla.com
push date	Wed, 12 Mar 2014 11:20:34 +0000
treeherder	mozilla-central@a56837cfc67c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jaws
bugs	981418
milestone	30.0a1
first release with	nightly linux32 46041cc216fd / 30.0a1 / 20140313030202 / files nightly linux64 46041cc216fd / 30.0a1 / 20140313030202 / files nightly mac 46041cc216fd / 30.0a1 / 20140313030202 / files nightly win32 46041cc216fd / 30.0a1 / 20140313030202 / files nightly win64 46041cc216fd / 30.0a1 / 20140313030202 / files
last release without	nightly linux32 41d962d23e81 / 30.0a1 / 20140311030201 / files nightly linux64 41d962d23e81 / 30.0a1 / 20140311030201 / files nightly mac 41d962d23e81 / 30.0a1 / 20140311030201 / files nightly win32 41d962d23e81 / 30.0a1 / 20140311030201 / files nightly win64 41d962d23e81 / 30.0a1 / 20140311030201 / files

--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -320,25 +320,32 @@
           this.ignoreMutations = true;
           this._mainView.style.height =
             this.getBoundingClientRect().height + "px";
           this.ignoreMutations = false;
         ]]></body>
       </method>
       <method name="_syncContainerWithSubView">
         <body><![CDATA[
-          if (!this.ignoreMutations && this.showingSubView) {
+          // Need to nullcheck this._currentSubView because we could be called from a
+          // setTimeout from the overflow handler, which means the view might
+          // have been removed at this point.
+          if (!this.ignoreMutations && this._currentSubView && this.showingSubView) {
             let newHeight = this._heightOfSubview(this._currentSubView, this._subViews);
             this._viewContainer.style.height = newHeight + "px";
           }
         ]]></body>
       </method>
       <method name="_syncContainerWithMainView">
         <body><![CDATA[
-          if (!this.ignoreMutations && !this.showingSubView && !this._transitioning) {
+          // Need to nullcheck _mainView because we could be called from a
+          // setTimeout from the overflow handler, which means the view might
+          // have been removed at this point.
+          if (!this.ignoreMutations && this._mainView &&
+              !this.showingSubView && !this._transitioning) {
             let height;
             if (this.showingSubViewAsMainView) {
               height = this._heightOfSubview(this._mainView);
             } else {
               height = this._mainView.scrollHeight;
             }
             this._viewContainer.style.height = height + "px";
           }