Backed out changeset 869f6077817a (bug 1049551) for e10s bc1 bustage
authorWes Kocher <wkocher@mozilla.com>
Tue, 14 Oct 2014 23:36:05 -0700
changeset 210502 d5c1c2837d530539ee8edc2835c61f48009fca0b
parent 210501 e802d78f9459ac85f596bf10597a9cc42955d86c
child 210503 c07de0783e2791c824b026df4b5a978fb773d4cc
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1049551
milestone36.0a1
backs out869f6077817ac69640053331fbeadb0342330781
Backed out changeset 869f6077817a (bug 1049551) for e10s bc1 bustage
browser/base/content/tabbrowser.css
browser/base/content/tabbrowser.xml
toolkit/themes/linux/global/jar.mn
toolkit/themes/osx/global/jar.mn
toolkit/themes/shared/spinner.png
toolkit/themes/windows/global/jar.mn
--- a/browser/base/content/tabbrowser.css
+++ b/browser/base/content/tabbrowser.css
@@ -69,18 +69,8 @@ tabpanels {
  * Optimization for tabs that are restored lazily. We can save a good amount of
  * memory that to-be-restored tabs would otherwise consume simply by setting
  * their browsers to 'display: none' as that will prevent them from having to
  * create a presentation and the like.
  */
 browser[pending] {
   display: none;
 }
-
-browser[pendingpaint] {
-  visibility: hidden;
-}
-
-tabbrowser[pendingpaint] {
-  background-image: url(chrome://global/skin/spinner.png);
-  background-repeat: no-repeat;
-  background-position: center center;
-}
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -131,20 +131,16 @@
       <field name="_previewMode">
         false
       </field>
 
       <field name="_lastFindValue">
         ""
       </field>
 
-      <field name="_contentWaitingCount">
-        0
-      </field>
-
       <property name="_numPinnedTabs" readonly="true">
         <getter><![CDATA[
           for (var i = 0; i < this.tabs.length; i++) {
             if (!this.tabs[i].pinned)
               break;
           }
           return i;
         ]]></getter>
@@ -3225,41 +3221,16 @@
         </body>
       </method>
       <method name="getStripVisibility">
         <body>
           return this.tabContainer.visible;
         </body>
       </method>
 
-      <method name="_showBusySpinnerRemoteBrowser">
-        <parameter name="aBrowser"/>
-        <body><![CDATA[
-          aBrowser.setAttribute("pendingpaint", "true");
-          if (this._contentWaitingCount <= 0) {
-            // We are not currently spinning
-            this.setAttribute("pendingpaint", "true");
-            this._contentWaitingCount = 1;
-          } else {
-            this._contentWaitingCount++;
-          }
-        ]]></body>
-      </method>
-
-      <method name="_hideBusySpinnerRemoteBrowser">
-        <parameter name="aBrowser"/>
-        <body><![CDATA[
-          aBrowser.removeAttribute("pendingpaint");
-          this._contentWaitingCount--;
-          if (this._contentWaitingCount <= 0) {
-            this.removeAttribute("pendingpaint");
-          }
-        ]]></body>
-      </method>
-
       <method name="_prepareForTabSwitch">
         <parameter name="toTab"/>
         <parameter name="fromTab"/>
         <body><![CDATA[
           const kTabSwitchTimeout = 300;
           let toBrowser = this.getBrowserForTab(toTab);
           let fromBrowser = fromTab ? this.getBrowserForTab(fromTab)
                                     : null;
@@ -3288,29 +3259,26 @@
                 // We switched away or closed the browser before we timed
                 // out. We reject, which will cancel the tab switch.
                 aReject();
               }
             };
 
             let timeoutPromise = new Promise((aResolve, aReject) => {
               timeoutId = setTimeout(() => {
-                this._showBusySpinnerRemoteBrowser(toBrowser);
                 attemptTabSwitch(aResolve, aReject);
               }, kTabSwitchTimeout);
             });
 
             let paintPromise = new Promise((aResolve, aReject) => {
-              let onRemotePaint = () => {
+              toBrowser.addEventListener("MozAfterRemotePaint", function onRemotePaint() {
                 toBrowser.removeEventListener("MozAfterRemotePaint", onRemotePaint);
-                this._hideBusySpinnerRemoteBrowser(toBrowser);
                 clearTimeout(timeoutId);
                 attemptTabSwitch(aResolve, aReject);
-              };
-              toBrowser.addEventListener("MozAfterRemotePaint", onRemotePaint);
+              });
               toBrowser.QueryInterface(Ci.nsIFrameLoaderOwner)
                        .frameLoader
                        .requestNotifyAfterRemotePaint();
                // We need to activate the docShell on the tab we're switching
                // to - otherwise, we won't initiate a remote paint request and
                // therefore we won't get the MozAfterRemotePaint event that we're
                // waiting for.
                // Note that this happens, as we require, even if the timeout in the
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -62,9 +62,8 @@ toolkit.jar:
    skin/classic/global/in-content/dropdown@2x.png              (../../shared/in-content/dropdown@2x.png)
    skin/classic/global/in-content/dropdown-disabled.png        (../../shared/in-content/dropdown-disabled.png)
    skin/classic/global/in-content/dropdown-disabled@2x.png     (../../shared/in-content/dropdown-disabled@2x.png)
    skin/classic/global/in-content/help-glyph.png               (../../shared/in-content/help-glyph.png)
    skin/classic/global/in-content/help-glyph@2x.png            (../../shared/in-content/help-glyph@2x.png)
    skin/classic/global/in-content/sorter.png                   (../../shared/in-content/sorter.png)
    skin/classic/global/in-content/sorter@2x.png                (../../shared/in-content/sorter@2x.png)
 +  skin/classic/global/toolbar/spring.png                      (toolbar/spring.png)
-   skin/classic/global/spinner.png                             (../../shared/spinner.png)
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -201,9 +201,8 @@ toolkit.jar:
   skin/classic/global/splitter/grip-top.gif                          (splitter/grip-top.gif)
   skin/classic/global/splitter/grip-left.gif                         (splitter/grip-left.gif)
   skin/classic/global/splitter/grip-right.gif                        (splitter/grip-right.gif)
   skin/classic/global/toolbar/spring.png                             (toolbar/spring.png)
   skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
   skin/classic/global/tree/folder.png                                (tree/folder.png)
   skin/classic/global/tree/folder@2x.png                             (tree/folder@2x.png)
-  skin/classic/global/spinner.png                                    (../../shared/spinner.png)
deleted file mode 100644
index 82bac53254238649a49d41e984d65ee9e41331e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -196,17 +196,16 @@ toolkit.jar:
         skin/classic/global/toolbar/spring.png                   (toolbar/spring.png)
         skin/classic/global/tree/columnpicker.gif                (tree/columnpicker.gif)
         skin/classic/global/tree/sort-asc.png                    (tree/sort-asc.png)
         skin/classic/global/tree/sort-dsc.png                    (tree/sort-dsc.png)
         skin/classic/global/tree/sort-asc-classic.png            (tree/sort-asc-classic.png)
         skin/classic/global/tree/sort-dsc-classic.png            (tree/sort-dsc-classic.png)
         skin/classic/global/tree/twisty-clsd.png                 (tree/twisty-clsd.png)
         skin/classic/global/tree/twisty-open.png                 (tree/twisty-open.png)
-        skin/classic/global/spinner.png                          (../../shared/spinner.png)
 
 #ifdef XP_WIN
 toolkit.jar:
 % skin global classic/1.0 %skin/classic/aero/global/ os=WINNT osversion>=6
         skin/classic/aero/global/about.css
         skin/classic/aero/global/aboutCache.css
         skin/classic/aero/global/aboutCacheEntry.css
         skin/classic/aero/global/aboutMemory.css