wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 54346920e122

Browse Source
This commit is contained in:
Tim Taubert 2011-11-30 21:19:25 +01:00
parent 3ed437e7c4
commit 3f8333242e
8 changed files with 52 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/components/tabview/content.js
View File

@ -74,21 +74,12 @@ let WindowEventHandler = {
// as quick as possible, switch the selected tab and hide the tabview
// before the modal dialog is shown
sendSyncMessage("Panorama:DOMWillOpenModalDialog");
},
// ----------
// Function: onMozAfterPaint
// Sends an asynchronous message when the "onMozAfterPaint" event
// is fired.
onMozAfterPaint: function WEH_onMozAfterPaint(event) {
sendAsyncMessage("Panorama:MozAfterPaint");
}
};
// add event listeners
addEventListener("DOMContentLoaded", WindowEventHandler.onDOMContentLoaded, false);
addEventListener("DOMWillOpenModalDialog", WindowEventHandler.onDOMWillOpenModalDialog, false);
addEventListener("MozAfterPaint", WindowEventHandler.onMozAfterPaint, false);
// ----------
// WindowMessageHandler
@ -99,8 +90,8 @@ let WindowMessageHandler = {
// Function: isDocumentLoaded
// Checks if the currently active document is loaded.
isDocumentLoaded: function WMH_isDocumentLoaded(cx) {
let readyState = content.document.readyState;
let isLoaded = (readyState != "uninitalized" && !webProgress.isLoadingDocument);
let isLoaded = (content.document.readyState == "complete" &&
!webProgress.isLoadingDocument);
sendAsyncMessage(cx.name, {isLoaded: isLoaded});
}
@ -196,4 +187,3 @@ let WebProgressListener = {
// add web progress listener
webProgress.addProgressListener(WebProgressListener, Ci.nsIWebProgress.NOTIFY_STATE_WINDOW);

101
browser/components/tabview/tabitems.js
View File

@ -794,7 +794,6 @@ let TabItems = {
tempCanvas: null,
_reconnectingPaused: false,
tabItemPadding: {},
_mozAfterPaintHandler: null,
// ----------
// Function: toString
@ -826,10 +825,6 @@ let TabItems = {
this.tempCanvas.width = 150;
this.tempCanvas.height = 112;
let mm = gWindow.messageManager;
this._mozAfterPaintHandler = this.onMozAfterPaint.bind(this);
mm.addMessageListener("Panorama:MozAfterPaint", this._mozAfterPaintHandler);
// When a tab is opened, create the TabItem
this._eventListeners.open = function (event) {
let tab = event.target;
@ -879,9 +874,6 @@ let TabItems = {
// ----------
// Function: uninit
uninit: function TabItems_uninit() {
let mm = gWindow.messageManager;
mm.removeMessageListener("Panorama:MozAfterPaint", this._mozAfterPaintHandler);
for (let name in this._eventListeners) {
AllTabs.unregister(name, this._eventListeners[name]);
}
@ -920,33 +912,20 @@ let TabItems = {
return this._fragment;
},
// Function: _isComplete
// Checks whether the xul:tab has fully loaded and calls a callback with a
// boolean indicates whether the tab is loaded or not.
_isComplete: function TabItems__isComplete(tab, callback) {
Utils.assertThrow(tab, "tab");
let mm = tab.linkedBrowser.messageManager;
let message = "Panorama:isDocumentLoaded";
mm.addMessageListener(message, function onMessage(cx) {
mm.removeMessageListener(cx.name, onMessage);
callback(cx.json.isLoaded);
});
mm.sendAsyncMessage(message);
},
// ----------
// Function: _onMozAfterPaint
// Called when a web page is painted.
onMozAfterPaint: function TabItems_onMozAfterPaint(cx) {
let index = gBrowser.browsers.indexOf(cx.target);
if (index == -1)
return;
let tab = gBrowser.tabs[index];
if (!tab.pinned)
this.update(tab);
// Function: isComplete
// Return whether the xul:tab has fully loaded.
isComplete: function TabItems_isComplete(tab) {
// If our readyState is complete, but we're showing about:blank,
// and we're not loading about:blank, it means we haven't really
// started loading. This can happen to the first few tabs in a
// page.
Utils.assertThrow(tab, "tab");
return (
tab.linkedBrowser.contentDocument.readyState == 'complete' &&
!(tab.linkedBrowser.contentDocument.URL == 'about:blank' &&
tab._tabViewTabItem.url != 'about:blank')
);
},
// ----------
@ -1030,41 +1009,35 @@ let TabItems = {
}
// ___ Make sure the tab is complete and ready for updating.
let self = this;
let updateCanvas = function TabItems__update_updateCanvas(tabItem) {
// ___ thumbnail
let $canvas = tabItem.$canvas;
if (!tabItem.canvasSizeForced) {
let w = $canvas.width();
let h = $canvas.height();
if (w != tabItem.$canvas[0].width || h != tabItem.$canvas[0].height) {
tabItem.$canvas[0].width = w;
tabItem.$canvas[0].height = h;
}
if (!this.isComplete(tab) && (!options || !options.force)) {
// If it's incomplete, stick it on the end of the queue
this._tabsWaitingForUpdate.push(tab);
return;
}
// ___ thumbnail
let $canvas = tabItem.$canvas;
if (!tabItem.canvasSizeForced) {
let w = $canvas.width();
let h = $canvas.height();
if (w != tabItem.$canvas[0].width || h != tabItem.$canvas[0].height) {
tabItem.$canvas[0].width = w;
tabItem.$canvas[0].height = h;
}
}
self._lastUpdateTime = Date.now();
tabItem._lastTabUpdateTime = self._lastUpdateTime;
this._lastUpdateTime = Date.now();
tabItem._lastTabUpdateTime = this._lastUpdateTime;
tabItem.tabCanvas.paint();
tabItem.saveThumbnail();
tabItem.tabCanvas.paint();
tabItem.saveThumbnail();
// ___ cache
if (tabItem.isShowingCachedData())
tabItem.hideCachedData();
// ___ cache
if (tabItem.isShowingCachedData())
tabItem.hideCachedData();
// ___ notify subscribers that a full update has completed.
tabItem._sendToSubscribers("updated");
};
if (options && options.force)
updateCanvas(tabItem);
else
this._isComplete(tab, function TabItems__update_isComplete(isComplete) {
if (isComplete)
updateCanvas(tabItem);
else
self._tabsWaitingForUpdate.push(tab);
});
// ___ notify subscribers that a full update has completed.
tabItem._sendToSubscribers("updated");
} catch(e) {
Utils.log(e);
}

1
browser/components/tabview/test/Makefile.in
View File

@ -151,7 +151,6 @@ _BROWSER_FILES = \
browser_tabview_bug655269.js \
browser_tabview_bug656778.js \
browser_tabview_bug656913.js \
browser_tabview_bug659594.js \
browser_tabview_bug662266.js \
browser_tabview_bug663421.js \
browser_tabview_bug665502.js \

15
browser/components/tabview/test/browser_tabview_bug594958.js
View File

@ -54,17 +54,10 @@ function test() {
let test = tests.shift();
let tab = win.gBrowser.tabs[0];
let mm = tab.linkedBrowser.messageManager;
mm.addMessageListener("Panorama:DOMContentLoaded", function onLoad(cx) {
mm.removeMessageListener(cx.name, onLoad);
let tabItem = tab._tabViewTabItem;
tabItem.addSubscriber("updated", function onUpdated() {
tabItem.removeSubscriber("updated", onUpdated);
checkUrl(test);
});
});
tab.linkedBrowser.addEventListener('load', function onLoad() {
tab.linkedBrowser.removeEventListener('load', onLoad, true);
checkUrl(test);
}, true);
tab.linkedBrowser.loadURI(test.url);
}

11
browser/components/tabview/test/browser_tabview_bug597248.js
View File

@ -134,13 +134,10 @@ function updateAndCheck() {
let tabItems = contentWindow.TabItems.getItems();
tabItems.forEach(function(tabItem) {
tabItem.addSubscriber("updated", function onUpdated() {
tabItem.removeSubscriber("updated", onUpdated);
ok(!tabItem.isShowingCachedData(),
"Tab item is not showing cached data anymore. " +
tabItem.tab.linkedBrowser.currentURI.spec);
});
contentWindow.TabItems.update(tabItem.tab);
contentWindow.TabItems._update(tabItem.tab);
ok(!tabItem.isShowingCachedData(),
"Tab item is not showing cached data anymore. " +
tabItem.tab.linkedBrowser.currentURI.spec);
});
// clean up and finish

39
browser/components/tabview/test/browser_tabview_bug659594.js
View File

@ -1,39 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
function test() {
waitForExplicitFinish();
newWindowWithTabView(function(win) {
let numTabsToUpdate = 2;
showTabView(function() {
let contentWindow = win.TabView.getContentWindow();
let groupItem = contentWindow.GroupItems.groupItems[0];
groupItem.getChildren().forEach(function(tabItem) {
tabItem.addSubscriber("updated", function onUpdated() {
tabItem.removeSubscriber("updated", onUpdated);
if (--numTabsToUpdate == 0)
finish();
});
contentWindow.TabItems.update(tabItem.tab);
});
}, win);
}, function(win) {
BrowserOffline.toggleOfflineStatus();
ok(Services.io.offline, "It is now offline");
let originalTab = win.gBrowser.tabs[0];
originalTab.linkedBrowser.loadURI("http://www.example.com/foo");
win.gBrowser.addTab("http://www.example.com/bar");
registerCleanupFunction(function () {
if (Services.io.offline)
BrowserOffline.toggleOfflineStatus();
win.close();
});
});
}

3
browser/components/tabview/test/browser_tabview_expander.js
View File

@ -26,13 +26,14 @@ function onTabViewWindowLoaded(win) {
// procreate!
contentWindow.UI.setActive(group);
for (var i=0; i<7; i++) {
win.gBrowser.loadOneTab('http://example.com#' + i, {inBackground: true});
win.gBrowser.loadOneTab('about:blank#' + i, {inBackground: true});
}
let children = group.getChildren();
// Wait until they all update because, once updated, they will notice that they
// don't have favicons and this will change their styling at some unknown time.
afterAllTabItemsUpdated(function() {
ok(!group.shouldStack(group._children.length), "The group should not stack.");
is(expander[0].style.display, "none", "The expander is hidden.");

16
browser/components/tabview/test/head.js
View File

@ -69,23 +69,13 @@ function closeGroupItem(groupItem, callback) {
function afterAllTabItemsUpdated(callback, win) {
win = win || window;
let tabItems = win.document.getElementById("tab-view").contentWindow.TabItems;
let counter = 0;
for (let a = 0; a < win.gBrowser.tabs.length; a++) {
let tabItem = win.gBrowser.tabs[a]._tabViewTabItem;
if (tabItem) {
let tab = win.gBrowser.tabs[a];
counter++;
tabItem.addSubscriber("updated", function onUpdated() {
tabItem.removeSubscriber("updated", onUpdated);
if (--counter == 0)
callback();
});
tabItems.update(tab);
}
if (tabItem)
tabItems._update(win.gBrowser.tabs[a]);
}
if (counter == 0)
callback();
callback();
}
// ---------