openstack
/
deb-novnc
Code Issues Proposed changes

Merge pull request #583 from kanaka/bug/misc-fixes 

Misc Fixes (ImageData Constructor Detection and Firefox Nightly Bug Workaround)
This commit is contained in:
Solly Ross 2016-08-23 16:00:48 -04:00 committed by GitHub
parent 5746ce3239 2a10f1bd56
commit 61e38102c3
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/display.js
View File

@ -17,7 +17,7 @@ var Display;
var SUPPORTS_IMAGEDATA_CONSTRUCTOR = false;
try {
new ImageData(new Uint8ClampedArray(1), 1, 1);
new ImageData(new Uint8ClampedArray(4), 1, 1);
SUPPORTS_IMAGEDATA_CONSTRUCTOR = true;
} catch (ex) {
// ignore failure

9
include/rfb.js
View File

@ -1165,14 +1165,7 @@ var RFB;
this._timing.last_fbu = (new Date()).getTime();
var handler = this._encHandlers[this._FBU.encoding];
try {
//ret = this._encHandlers[this._FBU.encoding]();
ret = handler();
} catch (ex) {
console.log("missed " + this._FBU.encoding + ": " + handler);
ret = this._encHandlers[this._FBU.encoding]();
}
ret = this._encHandlers[this._FBU.encoding]();
now = (new Date()).getTime();
this._timing.cur_fbu += (now - this._timing.last_fbu);