safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed copyrect: although synchronization was properly established, draw jobs were not properly reserved in the destination layer, so draw operations would NOT block (synchronized on source only), resulting in draw race conditions. In a copy, the destination layer should block until the source layer is ready.

Browse Source
This commit is contained in:
Michael Jumper
2011-04-02 23:53:30 -07:00
parent 8a6595e2db
commit 64224d0937
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
guacamole-common-js/src/main/resources/layer.js
View File

@@ -168,22 +168,30 @@ function Layer(width, height) {
}
display.copyRect = function(srcLayer, srcx, srcy, w, h, x, y) {
function scheduleCopyRect() {
reserveJob(function() {
if (autosize != 0) fitRect(x, y, w, h);
displayContext.drawImage(srcLayer, srcx, srcy, w, h, x, y, w, h);
});
function doCopyRect() {
if (autosize != 0) fitRect(x, y, w, h);
displayContext.drawImage(srcLayer, srcx, srcy, w, h, x, y, w, h);
}
// If we ARE the source layer, no need to sync.
// Syncing would result in deadlock.
if (display === srcLayer)
scheduleCopyRect();
reserveJob(doCopyRect);
// Otherwise synchronize copy operation with source layer
else
srcLayer.sync(scheduleCopyRect);
else {
var update = reserveJob(null);
srcLayer.sync(function() {
update.setHandler(doCopyRect);
// As this update originally had no handler and may have blocked
// other updates, handle any blocked updates.
handlePendingUpdates();
});
}
};