From 694efee08e28a9cfc59e79f6a4711fd6e369af7e Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Thu, 17 Dec 2009 09:37:25 +0000
Subject: [PATCH] =?UTF-8?q?fullScreenCanvas=E5=BB=83=E6=AD=A2=EF=BC=88?=
 =?UTF-8?q?=E3=80=8C=E8=87=AA=E5=8B=95=E3=81=A7=E9=9A=A0=E3=81=99=E3=80=8D?=
 =?UTF-8?q?=E3=81=8C=E3=82=88=E3=82=8A=E9=AB=98=E9=80=9F=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@5532 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/res/fullScreenCanvas.xul | 374 ------------------
 content/treestyletab/treestyletab.xul         |   1 -
 .../treestyletabbrowser_autoHide.js           |  78 ++--
 defaults/preferences/treestyletab.js          |   1 -
 4 files changed, 46 insertions(+), 408 deletions(-)
 delete mode 100644 content/treestyletab/res/fullScreenCanvas.xul

diff --git a/content/treestyletab/res/fullScreenCanvas.xul b/content/treestyletab/res/fullScreenCanvas.xul
deleted file mode 100644
index fdd3d96d..00000000
--- a/content/treestyletab/res/fullScreenCanvas.xul
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Full Screen Canvas
-
- Usage:
-   window.fullScreenCanvas.show();
-   ... // do something
-   window.fullScreenCanvas.hide();
-   var zoom = window.fullScreenCanvas.getZoomForFrame(window.content);
-
- lisence: The MIT License, Copyright (c) 2009 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/fullScreenCanvas.xul
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/x-javascript; version=1.7"><![CDATA[
-
-window.addEventListener('DOMContentLoaded', function() {
-	window.removeEventListener('DOMContentLoaded', arguments.callee, true);
-
-	const currentRevision = 11;
-	var root = document.documentElement;
-
-	var loadedRevision = root.getAttribute('fullScreenCanvas');
-	if (loadedRevision) {
-		loadedRevision = Number(loadedRevision);
-		if (loadedRevision >= currentRevision) {
-			return;
-		}
-		else if (loadedRevision < currentRevision) {
-			root.setAttribute('fullScreenCanvas', currentRevision);
-			window.fullScreenCanvas.destroy();
-		}
-	}
-
-	window.fullScreenCanvas = {
-		show : function(aTargetElement, aCallback, aThis) 
-		{
-			this.doShow(aTargetElement);
-			if (!aCallback) return;
-			if (this.shown) {
-				var self = this;
-				this.panel.addEventListener('popupshown', function() {
-					self.panel.removeEventListener('popupshown', arguments.callee, false);
-					aCallback.call(aThis || window);
-				}, false);
-			}
-			else {
-				aCallback.call(aThis || window);
-			}
-		},
-		doShow : function(aTargetElement) 
-		{
-			if (this.shown) return;
-
-			var color = '-moz-field';
-			var canvas = this.canvas;
-			if (!canvas) return;
-
-			this.shown = true;
-
-			var rootBox = document.documentElement.boxObject;
-			var canvasW = window.innerWidth;
-			var canvasH = window.innerHeight;
-
-			var x, y, w, h;
-			if (aTargetElement && aTargetElement.ownerDocument == document) {
-				let box = aTargetElement.boxObject;
-				x = box.screenX - rootBox.screenX;
-				y = box.screenY - rootBox.screenY;
-				w = box.width;
-				h = box.height;
-			}
-			else {
-				x = y = 0;
-				w = canvasW;
-				h = canvasH;
-			}
-
-			this.panel.style.width = canvas.style.width  = (canvas.width = canvasW)+'px';
-			this.panel.style.height = canvas.style.height = (canvas.height = canvasH)+'px';
-			try {
-				var ctx = canvas.getContext('2d');
-				ctx.clearRect(0, 0, canvasW, canvasH);
-				ctx.save();
-				ctx.translate(x, y);
-				ctx.drawWindow(window, x, y, w, h, color);
-				ctx.restore();
-
-				var browsers = this.browsers;
-				var self = this;
-				browsers.forEach(function(aBrowser) {
-				try {
-					var b = aBrowser;
-					if (b.localName == 'subbrowser') b = b.browser;
-					var TST = b.treeStyleTab;
-					var frame = b.contentWindow;
-					var zoom = self.getZoomForFrame(frame);
-					var x = (b.localName == 'tabbrowser' ? b.mCurrentBrowser : b ).boxObject.x;
-					var y = (b.localName == 'tabbrowser' ? b.mCurrentBrowser : b ).boxObject.y;
-					var w = frame.innerWidth;
-					var h = frame.innerHeight;
-					var dx = 0;
-					var dy = 0;
-					if (
-						TST &&
-						('autoHide' in TST ?
-							(TST.autoHide.enabled && TST.autoHide.shown) :
-							(TST.autoHideEnabled && TST.autoHideShown) // backward compatibility
-						)
-						) {
-						var pos = b.getAttribute(TST.kTABBAR_POSITION);
-						var xOffset = 'autoHide' in TST ? TST.autoHide.XOffset :
-										'autoHideXOffset' in TST ? TST.autoHideXOffset :
-										TST.tabbarWidth ;
-						var yOffset = 'autoHide' in TST ? TST.autoHide.YOffset :
-										'autoHideYOffset' in TST ? TST.autoHideYOffset :
-										TST.tabbarHeight ;
-						switch (pos)
-						{
-							case 'left':
-								dx = xOffset / zoom;
-								w -= xOffset / zoom;
-								break;
-							case 'right':
-								x += xOffset / zoom;
-								w -= xOffset / zoom;
-								break;
-							case 'top':
-								dy = yOffset / zoom;
-								h -= yOffset / zoom;
-								break;
-							case 'bottom':
-								y += yOffset / zoom;
-								h -= yOffset / zoom;
-								break;
-						}
-					}
-					ctx.save();
-					ctx.translate(x, y);
-					ctx.scale(zoom, zoom);
-					ctx.drawWindow(frame, dx+frame.scrollX, dy+frame.scrollY, w, h, color);
-					ctx.restore();
-				}
-				catch(e) {
-				}
-				});
-
-				this.panel.openPopupAtScreen(rootBox.screenX, rootBox.screenY, false);
-			}
-			catch(e) {
-				this.hide();
-			}
-		},
-		shown : false,
-
-		getZoomForFrame : function(aFrame)
-		{
-			const Prefs = Components
-					.classes['@mozilla.org/preferences;1']
-					.getService(Components.interfaces.nsIPrefBranch);
-			try {
-				if (Prefs.getBoolPref('browser.zoom.full')) {
-					var zoom = aFrame
-						.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-						.getInterface(Components.interfaces.nsIWebNavigation)
-						.QueryInterface(Components.interfaces.nsIDocShell)
-						.contentViewer
-						.QueryInterface(Components.interfaces.nsIMarkupDocumentViewer)
-						.fullZoom;
-					return (zoom * 1000 % 1) ? zoom+0.025 : zoom ;
-				}
-			}
-			catch(e) {
-			}
-			return 1;
-		},
-
-		hide : function()
-		{
-			if (!this.shown) return;
-			this.panel.hidePopup();
-			this.shown = false;
-		},
-
-		onClick : function(aEvent)
-		{
-			if (window['piro.sakura.ne.jp'] &&
-				window['piro.sakura.ne.jp'].boxObject)
-				this.setUpClickEvent(aEvent);
-
-			this.hide();
-		},
-
-
-		// resend click event
-		setUpClickEvent : function(aEvent)
-		{
-			var x, y, target;
-			if (!this.browsers.some(function(aBrowser) {
-					var box = (aBrowser.localName == 'tabbrowser' ? aBrowser.mCurrentBrowser : aBrowser )
-								.boxObject;
-					if (!this._isInside(box, aEvent.screenX, aEvent.screenY))
-						return false;
-
-					var frame = this.getFrameElementFromScreenPoint(
-							aBrowser,
-							aEvent.screenX,
-							aEvent.screenY
-						);
-					if (!frame)
-						return false;
-
-					target = frame.contentWindow;
-					var box = this.getBoxObjectFor(frame);
-					x = aEvent.screenX - box.screenX;
-					y = aEvent.screenY - box.screenY;
-					return true;
-				}, this)) {
-				x = aEvent.clientX;
-				y = aEvent.clientY;
-				target = window;
-			}
-
-			var flags = 0;
-			const nsIDOMNSEvent = Components.interfaces.nsIDOMNSEvent;
-			if (aEvent.altKey) flags |= nsIDOMNSEvent.ALT_MASK;
-			if (aEvent.ctrlKey) flags |= nsIDOMNSEvent.CONTROL_MASK;
-			if (aEvent.shiftKey) flags |= nsIDOMNSEvent.SHIFT_MASK;
-			if (aEvent.metaKey) flags |= nsIDOMNSEvent.META_MASK;
-
-			var button = aEvent.button;
-
-			var self = this;
-			this.panel.addEventListener('popuphidden', function() {
-				self.panel.removeEventListener('popuphidden', arguments.callee, false);
-
-				var utils = target
-						.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-						.getInterface(Components.interfaces.nsIDOMWindowUtils);
-				utils.sendMouseEvent('mousedown', x, y, button, 1, flags);
-				utils.sendMouseEvent('mouseup', x, y, button, 1, flags);
-			}, false);
-		},
-
-		getFrameElementFromScreenPoint : function(aCurrent, aScreenX, aScreenY)
-		{
-			var frame = aCurrent.contentWindow;
-			var clientPos = this._getClientPointFromScreenPoint(frame, aScreenX, aScreenY);
-			var elem = frame.document.elementFromPoint(clientPos.x, clientPos.y);
-			if (elem)
-				elem = this._getOriginalTargetFromScreenPoint(elem, aScreenX, aScreenY);
-			if (
-				elem &&
-				/^(i?frame|browser)$/i.test(elem.localName)
-				) {
-				return this.getFrameElementFromScreenPoint(
-						elem,
-						aScreenX + frame.scrollX,
-						aScreenY + frame.scrollY
-					);
-			}
-			return aCurrent;
-		},
-
-		_getClientPointFromScreenPoint : function(aFrame, aScreenX, aScreenY) 
-		{
-			var box = this.getBoxObjectFor(aFrame.document.documentElement);
-			return {
-				x : aScreenX - box.screenX - aFrame.scrollX,
-				y : aScreenY - box.screenY - aFrame.scrollY
-			};
-		},
-
-		_isInside : function(aBox, aScreenX, aScreenY) 
-		{
-			var left   = aBox.screenX;
-			var top    = aBox.screenY;
-			var right  = left + aBox.width;
-			var bottom = top + aBox.height;
-			return !(
-					left   > aScreenX ||
-					right  < aScreenX ||
-					top    > aScreenY ||
-					bottom < aScreenY
-				);
-		},
-
-		_getOriginalTargetFromScreenPoint : function(aElement, aScreenX, aScreenY) 
-		{
-			return this._getOriginalTargetFromScreenPointInternal(aElement, aScreenX, aScreenY) || aElement;
-		},
-		_getOriginalTargetFromScreenPointInternal : function(aElement, aScreenX, aScreenY) 
-		{
-			if (!aElement) return null;
-			var doc = aElement.ownerDocument;
-			var nodes = 'getAnonymousNodes' in doc ? doc.getAnonymousNodes(aElement) : null ;
-			if (!nodes || !nodes.length) nodes = aElement.childNodes;
-			if (!nodes || !nodes.length) return null;
-			for (var i = 0, maxi = nodes.length; i < maxi; i++)
-			{
-				if (nodes[i].nodeType != nodes[i].ELEMENT_NODE ||
-					!this._isInside(this.getBoxObjectFor(nodes[i]), aScreenX, aScreenY))
-					continue;
-				var node = this._getOriginalTargetFromScreenPointInternal(nodes[i], aScreenX, aScreenY);
-				if (node) return node;
-			}
-			return null;
-		},
-
-		getBoxObjectFor : function(aNode)
-		{
-			return window['piro.sakura.ne.jp']
-						.boxObject
-						.getBoxObjectFor(aNode);
-		},
-
-
-		get browsers()
-		{
-			browsers = [].concat(Array.slice(document.getElementsByTagName('tabbrowser')))
-						.concat(Array.slice(document.getElementsByTagName('browser')));
-			if ('SplitBrowser' in window) browsers = browsers.concat(SplitBrowser.browsers);
-			return browsers;
-		},
-
-		get panel()
-		{
-			return document.getElementById('fullScreenCanvas-panel');
-		},
-
-		init : function()
-		{
-			var canvas = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
-			canvas.setAttribute('id', 'fullScreenCanvas-canvas');
-			canvas.setAttribute('width', '0');
-			canvas.setAttribute('height', '0');
-			canvas.setAttribute('style', 'width:0;height:0;');
-			this.canvas = canvas;
-			this.panel.appendChild(canvas);
-		},
-
-		destroy : function()
-		{
-			var range = document.createRange();
-			range.selectNodeContents(this.panel);
-			range.deleteContents();
-			range.detach();
-		}
-	};
-
-	fullScreenCanvas.init();
-}, true);
-
-]]></script>
-
-<window id="main-window">
-	<panel id="fullScreenCanvas-panel"
-		noautohide="true"
-		style="
-			-moz-appearance: none;
-			-moz-border-top-colors: none;
-			-moz-border-right-colors: none;
-			-moz-border-bottom-colors: none;
-			-moz-border-left-colors: none;
-			background: transparent;
-			border: 0 none;
-			padding: 0;
-		"
-		onclick="fullScreenCanvas.onClick(event);"/>
-</window>
-
-</overlay>
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index f8ccd414..fbf86d5c 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -3,7 +3,6 @@
 <?xml-stylesheet href="chrome://treestyletab/skin/treestyletab.css" type="text/css"?>
 <?xml-stylesheet href="chrome://treestyletab-platform/skin/treestyletab.css" type="text/css"?>
 <?xul-overlay href="res/tabFx2Compatible.xul"?>
-<?xul-overlay href="res/fullScreenCanvas.xul"?>
 <!DOCTYPE overlay SYSTEM "chrome://treestyletab/locale/treestyletab.dtd">
 <overlay id="treestyletab-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/content/treestyletab/treestyletabbrowser_autoHide.js b/content/treestyletab/treestyletabbrowser_autoHide.js
index a41eb273..f05a9c85 100644
--- a/content/treestyletab/treestyletabbrowser_autoHide.js
+++ b/content/treestyletab/treestyletabbrowser_autoHide.js
@@ -416,44 +416,51 @@ TreeStyleTabBrowserAutoHide.prototype = {
  
 	showHideInternal : function(aReason) 
 	{
-		var doShowHide = function() {
-			var sv  = this.mOwner;
-			var b   = sv.mTabBrowser;
-			var pos = b.getAttribute(sv.kTABBAR_POSITION);
+		var viewer = this.getViewerForFrame(window);
+		viewer.hide();
 
-			if (this.shown) { // to be hidden or shrunken
-				this.onHiding();
-				this.showHideReason = aReason || this.kSHOWN_BY_UNKNOWN;
-				this.shown = false;
-			}
-			else { // to be shown or expanded
-				this.onShowing();
-				this.showHideReason = aReason || this.kSHOWN_BY_UNKNOWN;
-				this.shown = true;
-			}
+		var sv  = this.mOwner;
+		var b   = sv.mTabBrowser;
+		var pos = b.getAttribute(sv.kTABBAR_POSITION);
 
-			this.fireStateChangingEvent();
+		if (this.shown) { // to be hidden or shrunken
+			this.onHiding();
+			this.showHideReason = aReason || this.kSHOWN_BY_UNKNOWN;
+			this.shown = false;
+		}
+		else { // to be shown or expanded
+			this.onShowing();
+			this.showHideReason = aReason || this.kSHOWN_BY_UNKNOWN;
+			this.shown = true;
+		}
 
-			window.setTimeout(function(aSelf) {
-				if (aSelf.shown) {
-					sv.mTabBrowser.setAttribute(aSelf.kAUTOHIDE, 'show');
-					aSelf.redrawContentArea();
-				}
-				b.mTabContainer.adjustTabstrip();
-				sv.checkTabsIndentOverflow();
+		this.fireStateChangingEvent();
+
+		window.setTimeout(function(aSelf) {
+			if (aSelf.shown) {
+				sv.mTabBrowser.setAttribute(aSelf.kAUTOHIDE, 'show');
 				aSelf.redrawContentArea();
-				fullScreenCanvas.hide();
+			}
+			b.mTabContainer.adjustTabstrip();
+			sv.checkTabsIndentOverflow();
+			aSelf.redrawContentArea();
 
-				aSelf.fireStateChangeEvent();
-			}, 0, this);
-		};
+			aSelf.fireStateChangeEvent();
 
-		if (this.getTreePref('tabbar.autoHide.useFullScreenCanvas'))
-			fullScreenCanvas.show(document.getElementById('appcontent'), doShowHide, this);
-		else
-			doShowHide.call(this);
+			viewer.show();
+		}, 0, this);
 	},
 	
+	getViewerForFrame : function(aFrame) 
+	{
+		return aFrame
+				.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+				.getInterface(Components.interfaces.nsIWebNavigation)
+				.QueryInterface(Components.interfaces.nsIDocShell)
+				.contentViewer
+				.QueryInterface(Components.interfaces.nsIMarkupDocumentViewer);
+	},
+ 
 	show : function(aReason) 
 	{
 		if (!this.shown)
@@ -585,7 +592,7 @@ TreeStyleTabBrowserAutoHide.prototype = {
 		}
 	},
  
-	get shouldRedraw()
+	get shouldRedraw() 
 	{
 		return this.enabled && this.shown; // && this.mTabBrowser.hasAttribute(this.kTRANSPARENT);
 	},
@@ -603,7 +610,7 @@ TreeStyleTabBrowserAutoHide.prototype = {
 		var browserBox = sv.mTabBrowser.mCurrentBrowser.boxObject;
 		var contentBox = sv.getBoxObjectFor(frame.document.documentElement);
 
-		var zoom = fullScreenCanvas.getZoomForFrame(frame);
+		var zoom = this.getZoomForFrame(frame);
 
 		var x = (pos == 'right') ? browserBox.width - this.XOffset : 0 ;
 		var y = (pos == 'bottom') ? browserBox.height - this.YOffset : 0 ;
@@ -718,6 +725,13 @@ TreeStyleTabBrowserAutoHide.prototype = {
 				parseInt(parseInt(RegExp.$3) * 0.8)
 			].join(',')+')';
 	},
+ 
+	getZoomForFrame : function(aFrame) 
+	{
+		var zoom = this.getViewerForFrame(aFrame)
+			.fullZoom;
+		return (zoom * 1000 % 1) ? zoom+0.025 : zoom ;
+	},
   
 	clearBG : function() 
 	{
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 99e96ad5..1d5da14c 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -24,7 +24,6 @@ pref("extensions.treestyletab.tabbar.autoHide.mode.fullscreen", 1);
 pref("extensions.treestyletab.tabbar.autoHide.delay",      50);
 pref("extensions.treestyletab.tabbar.autoHide.area",       7);
 pref("extensions.treestyletab.tabbar.autoHide.expandArea", false);
-pref("extensions.treestyletab.tabbar.autoHide.useFullScreenCanvas", true);
 // 0 = not transparent, 1 = partial transparent, 2 = completely transparent
 pref("extensions.treestyletab.tabbar.transparent.style", 1);
 pref("extensions.treestyletab.tabbar.transparent.partialTransparency", "0.25");