Bug 1049551 - Add a tab delay spinner that's visible if we switch tabs before the content has been drawn r=dao
--- a/browser/base/content/tabbrowser.css
+++ b/browser/base/content/tabbrowser.css
@@ -69,8 +69,18 @@ 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] {
+ opacity: 0;
+}
+
+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,16 +131,20 @@
<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>
@@ -3223,16 +3227,41 @@
</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><
