From 79276e57e9b4b570a685978ba2d176f0cb4efb54 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Wed, 13 Oct 2010 11:56:05 +0000
Subject: [PATCH] update for changes introduced by Bug 602964 - return to using
 non deterministic throbbers (remove progress line / bar implementation)
 https://bugzilla.mozilla.org/show_bug.cgi?id=602964

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@7281 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/res/tabFx2Compatible.css | 20 +++++++++----------
 content/treestyletab/res/tabFx2Compatible.xml | 10 ++++------
 content/treestyletab/res/tabFx2Compatible.xul |  6 +++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/content/treestyletab/res/tabFx2Compatible.css b/content/treestyletab/res/tabFx2Compatible.css
index 3c68bc6a..0c89a6a1 100644
--- a/content/treestyletab/res/tabFx2Compatible.css
+++ b/content/treestyletab/res/tabFx2Compatible.css
@@ -4,7 +4,7 @@
  Usage:
    <?xul-overlay href="tabFx2Compatible.xul"?>
 
- license: The MIT License, Copyright (c) 2009-2010 SHIMODA "Piro" Hiroshi
+ license: The MIT License, Copyright (c) 2009-2011 SHIMODA "Piro" Hiroshi
    http://www.cozmixng.org/repos/piro/fx3-compatibility-lib/trunk/license.txt
  original:
    http://www.cozmixng.org/repos/piro/fx3-compatibility-lib/trunk/tabFx2Compatible.xul
@@ -14,46 +14,46 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-:root[tabFx2Compatible="10"]
+:root[tabFx2Compatible="11"]
   .tabbrowser-tab {
 	-moz-binding: url(tabFx2Compatible.xml#tabbrowser-tab-3) !important;
 }
 
-:root[tabFx2Compatible="10"][tabFx2Compatible-flags~="separate-tabContextMenu"]
+:root[tabFx2Compatible="11"][tabFx2Compatible-flags~="separate-tabContextMenu"]
   .tabbrowser-tab {
 	-moz-binding: url(tabFx2Compatible.xml#tabbrowser-tab-4) !important;
 }
 
-:root[tabFx2Compatible="10"]:not([tabFx2Compatible-flags~="png-throbber"]):not([tabFx2Compatible-flags~="pie"])
+:root[tabFx2Compatible="11"]:not([tabFx2Compatible-flags~="png-throbber"])[tabFx2Compatible-flags~="fx3"]
   .tab-icon-image[busy] {
 	list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif") !important;
 	opacity: 0.6;
 }
 
-:root[tabFx2Compatible="10"][tabFx2Compatible-flags~="png-throbber"]:not([tabFx2Compatible-flags~="pie"])
+:root[tabFx2Compatible="11"][tabFx2Compatible-flags~="png-throbber"][tabFx2Compatible-flags~="fx3"]
   .tab-icon-image[busy] {
 	list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
 
-:root[tabFx2Compatible="10"][tabFx2Compatible-flags~="mac"][tabFx2Compatible-flags~="png-throbber"]
+:root[tabFx2Compatible="11"][tabFx2Compatible-flags~="mac"][tabFx2Compatible-flags~="png-throbber"]
   .tab-icon-image {
 	list-style-image: url("chrome://global/skin/tree/item.png");
 }
 
-:root[tabFx2Compatible="10"][tabFx2Compatible-flags~="mac"]
+:root[tabFx2Compatible="11"][tabFx2Compatible-flags~="mac"]
   .tabbrowser-tab:not(:hover) .tab-icon-image:not([selected="true"]) {
 	opacity: 0.6;
 }
 
-:root[tabFx2Compatible="10"]
+:root[tabFx2Compatible="11"]
   .tabbrowser-tab:focus > .tab-stack {
 	border: 1px dotted -moz-DialogText;
 }
 
 
-:root[tabFx2Compatible="10"]
+:root[tabFx2Compatible="11"]
   .tab-image-left[pinned="true"],
-:root[tabFx2Compatible="10"]
+:root[tabFx2Compatible="11"]
   .tab-image-right[pinned="true"] {
 	display: none !important;
 }
diff --git a/content/treestyletab/res/tabFx2Compatible.xml b/content/treestyletab/res/tabFx2Compatible.xml
index 07daa3ec..22f6a0eb 100644
--- a/content/treestyletab/res/tabFx2Compatible.xml
+++ b/content/treestyletab/res/tabFx2Compatible.xml
@@ -61,11 +61,6 @@
 		<content context="tabContextMenu"
 			closetabtext="&closeTab.label;">
 			<xul:stack class="tab-stack" flex="1">
-				<xul:vbox class="tab-progress-container">
-					<xul:progressmeter xbl:inherits="value=progresspercent,busy,stalled,fadein,selected"
-						class="tab-progress"
-						mode="normal"/>
-				</xul:vbox>
 				<xul:hbox class="tab-content" align="center">
 					<xul:hbox xbl:inherits="fadein,pinned,selected"
 						class="tab-image-left"/>
@@ -74,7 +69,10 @@
 						align="center"
 						class="tab-image-middle">
 						<xul:stack class="tab-icon">
-							<xul:image xbl:inherits="validate,src=image,fadein,pinned,busy,stalled,progress,selected"
+							<xul:image xbl:inherits="fadein,pinned,busy,progress,selected"
+								class="tab-throbber"
+								role="presentation"/>
+							<xul:image xbl:inherits="validate,src=image,fadein,pinned,busy,selected"
 								class="tab-icon-image"
 								role="presentation"/>
 							<xul:image class="tab-extra-status"/>
diff --git a/content/treestyletab/res/tabFx2Compatible.xul b/content/treestyletab/res/tabFx2Compatible.xul
index 1e023f5f..137b5b82 100644
--- a/content/treestyletab/res/tabFx2Compatible.xul
+++ b/content/treestyletab/res/tabFx2Compatible.xul
@@ -19,7 +19,7 @@
 window.addEventListener('DOMContentLoaded', function() {
 	window.removeEventListener('DOMContentLoaded', arguments.callee, true);
 
-	const currentRevision = 10;
+	const currentRevision = 11;
 
 	var b = document.getElementById('content');
 	if (!b || b.localName != 'tabbrowser') return;
@@ -77,10 +77,10 @@ window.addEventListener('DOMContentLoaded', function() {
 				flags.push('mac');
 			if (Comparator.compare(XULAppInfo.version, '3.1') >= 0)
 				flags.push('png-throbber');
-			if (Comparator.compare(XULAppInfo.version, '3.7a1') >= 0)
-				flags.push('pie');
 			if (Comparator.compare(XULAppInfo.version, '4.0b1') >= 0)
 				flags.push('separate-tabContextMenu');
+			else
+				flags.push('fx3');
 			root.setAttribute('tabFx2Compatible-flags', flags.join(' '));
 			break;
 	}