Bug 635362 - Assertion fails when closing group item [r=ian, a=beltzner]
authorTim Taubert <tim.taubert@gmx.de>
Tue, 22 Feb 2011 21:37:38 +0100
changeset 63008 f685908ac8f9f9431edeebe17e6d4cf5f5ae6b06
parent 63007 0f879ec8b3d29eff358fab2b3d5d390d9eb7f6da
child 63009 d6975e3ecb4e80d5b89800a2bc2dbefb5ed7ed46
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersian, beltzner
bugs635362
milestone2.0b13pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 635362 - Assertion fails when closing group item [r=ian, a=beltzner]
browser/base/content/tabview/groupitems.js
browser/base/content/test/tabview/browser_tabview_bug616729.js
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1089,17 +1089,17 @@ GroupItem.prototype = Utils.extend(new I
       // if a blank tab is selected while restoring a tab the blank tab gets
       // removed. we need to keep the group alive for the restored tab.
       if (item.tab._tabViewTabIsRemovedAfterRestore)
         options.dontClose = true;
 
       let closed = options.dontClose ? false : this.closeIfEmpty();
       if (closed)
         this._makeClosestTabActive();
-      else if (!options.dontArrage)
+      else if (!options.dontArrange)
         this.arrange({animate: !options.immediately});
 
       this._sendToSubscribers("childRemoved",{ groupItemId: this.id, item: item });
     } catch(e) {
       Utils.log(e);
     }
   },
 
--- a/browser/base/content/test/tabview/browser_tabview_bug616729.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug616729.js
@@ -1,66 +1,26 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is a test for bug 616729.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Tim Taubert <tim.taubert@gmx.de>
- *
- * 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
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
   let cw;
 
   let createGroupItem = function () {
-    let bounds = new cw.Rect(20, 20, 400, 200);
-    let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
-    cw.GroupItems.setActiveGroupItem(groupItem);
-
-    for (let i=0; i<5; i++)
-      gBrowser.loadOneTab('about:blank', {inBackground: true});
-
-    return groupItem;
+    return createGroupItemWithBlankTabs(window, 400, 200, 0, 5);
   }
 
   let assertCorrectItemOrder = function (items) {
     for (let i=1; i<items.length; i++) {
       if (items[i-1].tab._tPos > items[i].tab._tPos) {
         ok(false, 'tabs were correctly reordered');
-        break;
+        return;
       }
     }
+    ok(true, 'tabs were correctly reordered');
   }
 
   let testVariousTabOrders = function () {
     let groupItem = createGroupItem();
     let [tab1, tab2, tab3, tab4, tab5] = groupItem.getChildren();
 
     // prepare tests
     let tests = [];
@@ -127,29 +87,21 @@ function test() {
 
       groupItem.add(child, {index: 1});
       groupItem.reorderTabsBasedOnTabItemOrder();
 
       assertCorrectItemOrder(groupItem.getChildren());
       assertCorrectItemOrder(groupItem2.getChildren());
 
       // cleanup
-      groupItem.addSubscriber(groupItem, 'groupHidden', function () {
-        groupItem.removeSubscriber(groupItem, 'groupHidden');
-        groupItem.closeHidden();
-        groupItem2.closeAll();
+      closeGroupItem(groupItem, function () {
+        closeGroupItem(groupItem2, function () {
+          hideTabView(finish);
+        });
       });
-
-      groupItem2.addSubscriber(groupItem, 'groupHidden', function () {
-        groupItem2.removeSubscriber(groupItem, 'groupHidden');
-        groupItem2.closeHidden();
-        hideTabView(finish);
-      });
-
-      groupItem.closeAll();
     });
   }
 
   waitForExplicitFinish();
 
   showTabView(function () {
     cw = TabView.getContentWindow();
     afterAllTabsLoaded(testVariousTabOrders);