Commit b0b5519b authored by binji@chromium.org's avatar binji@chromium.org

[NaCl SDK] Fix running .pexe in Release mode.

(NOTE: this fixes the NaCl SDK waterfall)

A bug in common.js was causing the embed to load .pexe with
application/x-nacl, which produces a bizarre failure message:

NaCl module load failed: manifest: program property 'portable' does not have required key: 'url'.

BUG=none
R=noelallen@chromium.org

Review URL: https://codereview.chromium.org/22777002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216889 0039d316-1c4b-4281-b951-d872f2087c98
parent 71980fdf
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
// string. // string.
var isTest = false; var isTest = false;
// Set to true when loading a "Release" NaCl module, false when loading a
// "Debug" NaCl module.
var isRelease = false;
// Javascript module pattern: // Javascript module pattern:
// see http://en.wikipedia.org/wiki/Unobtrusive_JavaScript#Namespaces // see http://en.wikipedia.org/wiki/Unobtrusive_JavaScript#Namespaces
// In essence, we define an anonymous function which is immediately called and // In essence, we define an anonymous function which is immediately called and
...@@ -22,11 +26,10 @@ var common = (function() { ...@@ -22,11 +26,10 @@ var common = (function() {
* Return the mime type for NaCl plugin. * Return the mime type for NaCl plugin.
* *
* @param {string} tool The name of the toolchain, e.g. "glibc", "newlib" etc. * @param {string} tool The name of the toolchain, e.g. "glibc", "newlib" etc.
* @param {bool} isRelease True if this is a release build.
* @return {string} The mime-type for the kind of NaCl plugin matching * @return {string} The mime-type for the kind of NaCl plugin matching
* the given toolchain. * the given toolchain.
*/ */
function mimeTypeForTool(tool, isRelease) { function mimeTypeForTool(tool) {
// For NaCl modules use application/x-nacl. // For NaCl modules use application/x-nacl.
var mimetype = 'application/x-nacl'; var mimetype = 'application/x-nacl';
if (isHostToolchain(tool)) { if (isHostToolchain(tool)) {
...@@ -293,8 +296,8 @@ var common = (function() { ...@@ -293,8 +296,8 @@ var common = (function() {
// status message indicating that the module is still loading. Otherwise, // status message indicating that the module is still loading. Otherwise,
// do not change the status message. // do not change the status message.
updateStatus('Page loaded.'); updateStatus('Page loaded.');
var isRelease = path.toLowerCase().indexOf('release') != -1; isRelease = path.toLowerCase().indexOf('release') != -1;
if (!browserSupportsNaCl(tool, isRelease)) { if (!browserSupportsNaCl(tool)) {
updateStatus( updateStatus(
'Browser does not support NaCl (' + tool + '), or NaCl is disabled'); 'Browser does not support NaCl (' + tool + '), or NaCl is disabled');
} else if (common.naclModule == null) { } else if (common.naclModule == null) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment