Skip to content

Commit ee522d7

Browse files
authored
Merge pull request #6548 from AnalyticalGraphicsInc/wasm-in-edge
Fix wasm support related test failures
2 parents c3796f7 + 43f17b6 commit ee522d7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Source/Core/FeatureDetection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ define([
288288
* @see {@link https://developer.mozilla.org/en-US/docs/WebAssembly}
289289
*/
290290
FeatureDetection.supportsWebAssembly = function() {
291-
return typeof WebAssembly !== 'undefined' && !FeatureDetection.isEdge;
291+
return typeof WebAssembly !== 'undefined' && !FeatureDetection.isEdge();
292292
};
293293

294294
return FeatureDetection;

Specs/Core/TaskProcessorSpec.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,16 @@ defineSuite([
177177
taskProcessor = new TaskProcessor('returnWasmConfig', 5);
178178
var promise = taskProcessor.initWebAssemblyModule({
179179
modulePath : 'TestWasm/testWasmWrapper',
180-
wasmBinaryFile : binaryUrl
180+
wasmBinaryFile : binaryUrl,
181+
fallbackModulePath : 'TestWasm/testWasmFallback'
181182
});
182183

183184
return promise.then(function(result) {
184185
expect(result).toBeDefined();
185-
expect(result.modulePath).toMatch(/TestWasm\/testWasmWrapper/);
186-
expect(result.wasmBinary).toBeDefined();
186+
if (FeatureDetection.supportsWebAssembly()) {
187+
expect(result.modulePath).toMatch(/TestWasm\/testWasmWrapper/);
188+
expect(result.wasmBinary).toBeDefined();
189+
}
187190
});
188191
});
189192

0 commit comments

Comments
 (0)