summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js
diff options
context:
space:
mode:
authorSvenn-Arne Dragly <s@dragly.com>2016-02-25 15:36:22 +0100
committerMorten Johan Sørvig <morten.sorvig@qt.io>2016-05-02 21:35:56 +0000
commitf4f5219f0017d36e1b14fc4b88e9006b59c75b3f (patch)
tree2857566989115502c2be5846b6adfffb76825ee7 /src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js
parent375adf412f44466a9ef588529ebbf7f102878919 (diff)
Update support for Emscripten
Change-Id: I5d696f0dbc188acb4faad83240f7b1aa7177dc48 Reviewed-by: Svenn-Arne Dragly <s@dragly.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js')
-rw-r--r--src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js b/src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js
index af40696cc8..58f532c054 100644
--- a/src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js
+++ b/src/plugins/platforms/pepper/3rdparty/pepper.js/url_loader.js
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+var ENVIRONMENT_IS_PTHREAD; // is set to true in pthread-main.js if we are in a worker
+if(!ENVIRONMENT_IS_PTHREAD) {
+
(function() {
// Canonicalize the URL using the DOM.
@@ -369,3 +372,5 @@
]);
})();
+
+}