split methods, unharcode

src/util/actor.js

@@ -53,7 +53,7 @@ class Actor {
      * @param targetMapId A particular mapId to which to send this message.
      * @private
      */
-    send(type: string, data: mixed, callback: ?Function, targetMapId: ?string): ?Cancelable {
+    send(type: string, data: mixed, callback: ?Function, targetMapId: ?string, mustQueue: ?string): ?Cancelable {
         // We're using a string ID instead of numbers because they are being used as object keys
         // anyway, and thus stringified implicitly. We use random IDs because an actor may receive
         // message from multiple other actors which could run in different execution context. A
@@ -68,6 +68,7 @@ class Actor {
             type,
             hasCallback: !!callback,
             targetMapId,
+            mustQueue,
             sourceMapId: this.mapId,
             data: serialize(data, buffers)
         }, buffers);
@@ -110,7 +111,7 @@ class Actor {
                 cancel();
             }
         } else {
-            if (isWorker() || data.type === 'getResource') {
+            if (isWorker() || data.mustQueue) {
                 // In workers, store the tasks that we need to process before actually processing them. This
                 // is necessary because we want to keep receiving messages, and in particular,
                 // <cancel> messages. Some tasks may take a while in the worker thread, so before
@@ -123,31 +124,33 @@ class Actor {
             } else {
                 // In the main thread, process messages immediately so that other work does not slip in
                 // between getting partial data back from workers.
-                this.process(id, data);
+                this.processTask(id, data);
             }
         }
     }
 
-    process(id: number, task: any) {
-        if (id === undefined && task === undefined) {
-            if (!this.taskQueue.length) {
-                return;
-            }
-            id = this.taskQueue.shift();
-            task = this.tasks[id];
-            delete this.tasks[id];
-            // Schedule another process call if we know there's more to process _before_ invoking the
-            // current task. This is necessary so that processing continues even if the current task
-            // doesn't execute successfully.
-            if (this.taskQueue.length) {
-                this.invoker.trigger();
-            }
-            if (!task) {
-                // If the task ID doesn't have associated task data anymore, it was canceled.
-                return;
-            }
+    process() {
+        if (!this.taskQueue.length) {
+            return;
         }
+        const id = this.taskQueue.shift();
+        const task = this.tasks[id];
+        delete this.tasks[id];
+        // Schedule another process call if we know there's more to process _before_ invoking the
+        // current task. This is necessary so that processing continues even if the current task
+        // doesn't execute successfully.
+        if (this.taskQueue.length) {
+            this.invoker.trigger();
+        }
+        if (!task) {
+            // If the task ID doesn't have associated task data anymore, it was canceled.
+            return;
+        }
+
+        this.processTask(id, task);
+    }
 
+    processTask(id: number, task: any) {
         if (task.type === '<response>') {
             // The done() function in the counterpart has been called, and we are now
             // firing the callback in the originating actor, if there is one.

src/util/ajax.js

@@ -230,7 +230,8 @@ export const makeRequest = function(requestParameters: RequestParameters, callba
             return makeFetchRequest(requestParameters, callback);
         }
         if (isWorker() && self.worker && self.worker.actor) {
-            return self.worker.actor.send('getResource', requestParameters, callback);
+            const queueOnMainThread = true;
+            return self.worker.actor.send('getResource', requestParameters, callback, undefined, queueOnMainThread);
         }
     }
     return makeXMLHttpRequest(requestParameters, callback);