Ticket #1424: html5-timers-managed-v2.patch

html5/js/Protocol.js

@@ -122 +122 @@
         this.websocket.onmessage = function (e) {
                 // push arraybuffer values onto the end
                 me.rQ.push(new Uint8Array(e.data));
+                setTimeout(function() {
+                                me.process_receive_queue();
+                        }, this.process_interval);
         };
         this.start_processing();
 }
@@ -139 +142 @@
 }
 
 XpraProtocol.prototype.start_processing = function() {
-        var me = this;
-        if(this.rQ_interval_id === null){
-                this.rQ_interval_id = setInterval(function(){
-                        if (me.rQ.length > 0) {
-                                me.process_receive_queue();
-                        }
-                }, this.process_interval);
-        }
-
-        if(this.sQ_interval_id === null){
-                this.sQ_interval_id = setInterval(function(){
-                        if(me.sQ.length > 0){
-                                me.process_send_queue();
-                        }
-                }, this.process_interval);
-        }
-
-        if(this.mQ_interval_id === null){
-                this.mQ_interval_id = setInterval(function(){
-                        if(me.mQ.length > 0){
-                                me.process_message_queue();
-                        }
-                }, this.process_interval);
-        }
 }
 XpraProtocol.prototype.stop_processing = function() {
         clearInterval(this.rQ_interval_id);
@@ -349 +328 @@
                         }
                         if (this.is_worker){
                                 this.mQ[this.mQ.length] = packet;
+                                var me = this;
+                                setTimeout(function() {
+                                                me.process_message_queue();
+                                        }, this.process_interval);
                         } else {
                                 this.packet_handler(packet, this.packet_ctx);
                         }
@@ -358 +341 @@
                         //console.error("packet_data="+packet_data);
                 }
         }
-
-        // see if buffer still has unread packets
-        if (this.rQ.length > 0) {
-                this.process_receive_queue();
-        }
 }
 
 XpraProtocol.prototype.process_send_queue = function() {
@@ -426 +404 @@
 
 XpraProtocol.prototype.send = function(packet) {
         this.sQ[this.sQ.length] = packet;
+        this.process_send_queue();
 }
 
 XpraProtocol.prototype.set_packet_handler = function(callback, ctx) {