зеркало из https://github.com/mozilla/gecko-dev.git
Back out dougt's channel changes
This commit is contained in:
Родитель
db2dbe941c
Коммит
85c3cad8d4
|
@ -195,9 +195,9 @@ nsXULBrowserWindow.prototype =
|
|||
statusTextFld.setAttribute("value", text);
|
||||
},
|
||||
|
||||
onProgress : function (request, current, max)
|
||||
onProgress : function (channel, current, max)
|
||||
{
|
||||
if (!this.useRealProgressFlag && request)
|
||||
if (!this.useRealProgressFlag && channel)
|
||||
return;
|
||||
|
||||
if (!statusMeter)
|
||||
|
@ -216,7 +216,7 @@ nsXULBrowserWindow.prototype =
|
|||
}
|
||||
},
|
||||
|
||||
onStateChange : function(request, state)
|
||||
onStateChange : function(channel, state)
|
||||
{
|
||||
const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
|
||||
|
||||
|
@ -262,9 +262,9 @@ nsXULBrowserWindow.prototype =
|
|||
if (!this.useRealProgressFlag)
|
||||
this.onProgress(null, this.finishedRequests, this.totalRequests);
|
||||
}
|
||||
|
||||
if (state & nsIWebProgressListener.STATE_IS_NETWORK) {
|
||||
var channel = request.QueryInterface(Components.interfaces.nsIChannel);
|
||||
var location = channel.URI.spec;
|
||||
var location = channel.URI.spec;
|
||||
var msg = "";
|
||||
if (location != "about:blank") {
|
||||
// Record page loading time.
|
||||
|
@ -289,8 +289,7 @@ nsXULBrowserWindow.prototype =
|
|||
}
|
||||
else if (state & nsIWebProgressListener.STATE_TRANSFERRING) {
|
||||
if (state & nsIWebProgressListener.STATE_IS_DOCUMENT) {
|
||||
var channel = request.QueryInterface(Components.interfaces.nsIChannel);
|
||||
var ctype=channel.contentType;
|
||||
var ctype=channel.contentType;
|
||||
|
||||
if (ctype != "text/html")
|
||||
this.useRealProgressFlag = true;
|
||||
|
@ -320,7 +319,7 @@ nsXULBrowserWindow.prototype =
|
|||
UpdateBackForwardButtons();
|
||||
},
|
||||
|
||||
onStatus : function(request, status, msg)
|
||||
onStatus : function(channel, status, msg)
|
||||
{
|
||||
this.setOverLink(msg);
|
||||
//this.setDefaultStatus(msg);
|
||||
|
|
Загрузка…
Ссылка в новой задаче