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

Bug 822343 - Downloads view takes far too long to render. Part 4 - Cache the download state so command-updating doesn't check the file size over and over. r=mconley.

Browse Source
This commit is contained in:
Asaf Romano 2012-12-22 22:13:25 +02:00
parent 1dd66aa5fc
commit 238bd8a48a
1 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
browser/components/downloads/content/allDownloadsViewOverlay.js
View File

@ -96,7 +96,7 @@ DownloadElementShell.prototype = {
}
else if (this._placesNode) {
this._wasInProgress = false;
this._wasDone = this._state == nsIDM.DOWNLOAD_FINISHED;
this._wasDone = this.getDownloadState(true) == nsIDM.DOWNLOAD_FINISHED;
}
this._updateStatusUI();
@ -115,7 +115,7 @@ DownloadElementShell.prototype = {
this._placesNode = aNode;
if (!this._dataItem && this._placesNode) {
this._wasInProgress = false;
this._wasDone = this._state == nsIDM.DOWNLOAD_FINISHED;
this._wasDone = this.getDownloadState(true) == nsIDM.DOWNLOAD_FINISHED;
this._updateStatusUI();
}
}
@ -216,42 +216,53 @@ DownloadElementShell.prototype = {
// The target's file size in bytes. If there's no target file, or If we
// cannot determine its size, 0 is returned.
get _fileSize() {
if (!this._file || !this._file.exists())
return 0;
try {
return this._file.fileSize;
}
catch(ex) {
Cu.reportError(ex);
return 0;
if (!("__fileSize" in this)) {
if (!this._file || !this._file.exists())
this.__fileSize = 0;
try {
this.__fileSize = this._file.fileSize;
}
catch(ex) {
Cu.reportError(ex);
this.__fileSize = 0;
}
}
return this.__fileSize;
},
/**
* Get the state of the download
* @param [optional] aForceUpdate
* Whether to force update the cached download state. Default: false.
*/
// The download state (see nsIDownloadManager).
get _state() {
if (this._dataItem)
return this._dataItem.state;
let state = -1;
try {
return this._getAnnotation(DOWNLOAD_STATE_ANNO);
}
catch (ex) {
// The state annotation didn't exist in past releases.
if (!this._file) {
state = nsIDM.DOWNLOAD_FAILED;
}
else if (this._file.exists()) {
state = this._fileSize > 0 ?
nsIDM.DOWNLOAD_FINISHED : nsIDM.DOWNLOAD_FAILED;
getDownloadState: function DES_getDownloadState(aForceUpdate = false) {
if (aForceUpdate || !("_state" in this)) {
if (this._dataItem) {
this._state = this._dataItem.state;
}
else {
// XXXmano I'm not sure if this right. We should probably show no
// status text at all in this case.
state = nsIDM.DOWNLOAD_CANCELED;
try {
this._state = this._getAnnotation(DOWNLOAD_STATE_ANNO);
}
catch (ex) {
// The state annotation didn't exist in past releases.
if (!this._file) {
this._state = nsIDM.DOWNLOAD_FAILED;
}
else if (this._file.exists()) {
this._state = this._fileSize > 0 ?
nsIDM.DOWNLOAD_FINISHED : nsIDM.DOWNLOAD_FAILED;
}
else {
// XXXmano I'm not sure if this right. We should probably show no
// status text at all in this case.
this._state = nsIDM.DOWNLOAD_CANCELED;
}
}
}
}
return state;
return this._state;
},
// The status text for the download
@ -292,7 +303,7 @@ DownloadElementShell.prototype = {
return s.statusSeparator(fullHost, fullDate);
}
switch (this._state) {
switch (this.getDownloadState()) {
case nsIDM.DOWNLOAD_FAILED:
return s.stateFailed;
case nsIDM.DOWNLOAD_CANCELED:
@ -331,7 +342,7 @@ DownloadElementShell.prototype = {
// appropriate buttons and context menu items), the status text label,
// and the progress meter.
_updateDownloadStatusUI: function DES__updateDownloadStatusUI() {
this._element.setAttribute("state", this._state);
this._element.setAttribute("state", this.getDownloadState(true));
this._element.setAttribute("status", this._statusText);
// For past-downloads, we're done. For session-downloads, we may also need
@ -429,7 +440,7 @@ DownloadElementShell.prototype = {
case "downloadsCmd_open": {
return this._file.exists() &&
((this._dataItem && this._dataItem.openable) ||
(this._state == nsIDM.DOWNLOAD_FINISHED));
(this.getDownloadState() == nsIDM.DOWNLOAD_FINISHED));
}
case "downloadsCmd_show": {
return this._getTargetFileOrPartFileIfExists() != null;
@ -547,7 +558,7 @@ DownloadElementShell.prototype = {
}
return "";
}
let command = getDefaultCommandForState(this._state);
let command = getDefaultCommandForState(this.getDownloadState());
if (this.isCommandEnabled(command))
this.doCommand(command);
}
@ -1079,7 +1090,7 @@ DownloadsPlacesView.prototype = {
// Set the state attribute so that only the appropriate items are displayed.
let contextMenu = document.getElementById("downloadsContextMenu");
contextMenu.setAttribute("state", element._shell._state);
contextMenu.setAttribute("state", element._shell.getDownloadState());
return true;
},