Bug 781053 - Part 3 - Force the throbber into it's own layer. r=roc
authorMatt Woodrow <mwoodrow@mozilla.com>
Tue, 25 Sep 2012 08:31:48 +1200
changeset 108578 921fe135bf2c24a3595dd72ff95352a6ac7637ff
parent 108577 ed784e42dfe9bc0dd4de0e7d836b7febec0c71e8
child 108579 e98e2d0aef4dcf2bb2824e760c80189a6fba7963
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersroc
bugs781053
milestone18.0a1
Bug 781053 - Part 3 - Force the throbber into it's own layer. r=roc
browser/base/content/tabbrowser.xml
layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -3953,17 +3953,18 @@
                     class="tab-background-middle"/>
           <xul:hbox xbl:inherits="pinned,selected,titlechanged"
                     class="tab-background-end"/>
         </xul:hbox>
         <xul:hbox xbl:inherits="pinned,selected,titlechanged"
                   class="tab-content" align="center">
           <xul:image xbl:inherits="fadein,pinned,busy,progress,selected"
                      class="tab-throbber"
-                     role="presentation"/>
+                     role="presentation"
+                     layer="true" />
           <xul:image xbl:inherits="validate,src=image,fadein,pinned,selected"
                      class="tab-icon-image"
                      role="presentation"/>
           <xul:label flex="1"
                      xbl:inherits="value=label,crop,accesskey,fadein,pinned,selected"
                      class="tab-text tab-label"
                      role="presentation"/>
           <xul:toolbarbutton anonid="close-button"
--- a/layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
+++ b/layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul
@@ -38,17 +38,17 @@
                   .getService(Components.interfaces.nsIWindowMediator)
                   .getMostRecentWindow("navigator:browser")
                   .maximize();
       }
 
       var initialCount = win.mozPaintCount;
 
       function nextStep() {
-        if (win.mozPaintCount == initialCount) {
+        if (win.mozPaintCount == initialCount || win.isMozAfterPaintPending) {
           SimpleTest.info("Waiting for mozPaintCount (= " + initialCount + ") to increase" + testInfo());
           // Do not use SimpleTest.executeSoon() here: give a little more time.
           setTimeout(nextStep, 100);
           return;
         }
 
         isnot(win.mozPaintCount, initialCount, "mozPaintCount has increased" + testInfo());