Revert "- Undo removing prefixUrl option in memorycheck-with-simple-image demo."

This reverts commit 344ddb924f.
This commit is contained in:
Takuma Kira 2020-04-17 13:48:53 +09:00
parent 344ddb924f
commit c2ed66415f
3 changed files with 21 additions and 21 deletions

View File

@ -196,16 +196,11 @@
return context; return context;
}, },
/** /**
* Free up canvas memory * Destroys ImageTileSource
* (iOS 12 or higher on 2GB RAM device has only 224MB canvas memory,
* and Safari keeps canvas until its height and width will be set to 0).
* @function * @function
*/ */
freeupCanvasMemory: function () { destroy: function () {
for (var i = 0; i < this.levels.length; i++) { this._freeupCanvasMemory();
this.levels[i].context2D.canvas.height = 0;
this.levels[i].context2D.canvas.width = 0;
}
}, },
// private // private
@ -270,7 +265,19 @@
bigContext = smallContext; bigContext = smallContext;
} }
return levels; return levels;
} },
/**
* Free up canvas memory
* (iOS 12 or higher on 2GB RAM device has only 224MB canvas memory,
* and Safari keeps canvas until its height and width will be set to 0).
* @function
*/
_freeupCanvasMemory: function () {
for (var i = 0; i < this.levels.length; i++) {
this.levels[i].context2D.canvas.height = 0;
this.levels[i].context2D.canvas.width = 0;
}
},
}); });
}(OpenSeadragon)); }(OpenSeadragon));

View File

@ -615,17 +615,7 @@ $.TileSource.prototype = {
y >= 0 && y >= 0 &&
x < numTiles.x && x < numTiles.x &&
y < numTiles.y; y < numTiles.y;
}, }
/**
* Destroys TileSource
* @function
*/
destroy: function () {
if ( this.freeupCanvasMemory ) {
this.freeupCanvasMemory();
}
},
}; };

View File

@ -742,7 +742,10 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
return; return;
} }
this.source.destroy(); //TODO: implement destroy and _freeupCanvasMemory method for all child classes of TileSource, then remove if statement wrap below.
if (this.source.destroy) {
this.source.destroy();
}
this.close(); this.close();