Update to v9.3.11, fix chrome hang (#864)

* Fix chrome hang * Update to v9.3.11
DevExpress · Oct 17, 2016 · 776ddb0 · 776ddb0
1 parent de2c759
commit 776ddb0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "testcafe-hammerhead",
   "description": "A powerful web-proxy used as a core for the TestCafe testing framework (https://github.com/DevExpress/testcafe).",
-  "version": "9.3.10",
+  "version": "9.3.11",
   "homepage": "https://github.com/DevExpress/testcafe-hammerhead",
   "bugs": {
     "url": "https://github.com/DevExpress/testcafe-hammerhead/issues"

diff --git a/src/client/sandbox/event/message.js b/src/client/sandbox/event/message.js
@@ -200,12 +200,21 @@ export default class MessageSandbox extends SandboxBase {
             var sendFunc = force => {
                 // NOTE: In IE, this function is called on the timeout despite the fact that the timer has been cleared
                 // in the unload event handler, so we check whether the function is in the queue
-                if (canSendDirectly() && (force || this._removeInternalMsgFromQueue(sendFunc))) {
-                    targetWindow[this.RECEIVE_MSG_FN]({
-                        // NOTE: Cloning a message to prevent this modification.
-                        data:   parseJSON(stringifyJSON(message)),
-                        source: this.window
-                    });
+                if (force || this._removeInternalMsgFromQueue(sendFunc)) {
+                    // NOTE: The 'sendFunc' function may be called on timeout, so we must call 'canSendDirectly' again,
+                    // because the iframe could become cross-domain in the meantime. Unfortunately, Chrome hangs when
+                    // trying to call the 'isCrossDomainWindows' function, so we have to wrap it in 'try/catch'.
+                    try {
+                        targetWindow[this.RECEIVE_MSG_FN]({
+                            // NOTE: Cloning a message to prevent this modification.
+                            data:   parseJSON(stringifyJSON(message)),
+                            source: this.window
+                        });
+                    }
+                        /*eslint-disable no-empty */
+                    catch (e) {
+                    }
+                    /*eslint-enable no-empty */
                 }
             };