Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client_sdk / src / resources / common.js

diff --git a/src/native_client_sdk/src/resources/common.js b/src/native_client_sdk/src/resources/common.js
index a108fad..a700015 100644 (file)
--- a/src/native_client_sdk/src/resources/common.js
+++ b/src/native_client_sdk/src/resources/common.js
@@ -39,7 +39,7 @@ var common = (function() {
         mimetype = 'application/x-ppapi-release';
       else
         mimetype = 'application/x-ppapi-debug';
-    } else if (tool == 'pnacl' && isRelease) {
+    } else if (tool == 'pnacl') {
       mimetype = 'application/x-pnacl';
     }
     return mimetype;
@@ -147,6 +147,11 @@ var common = (function() {
     var listenerDiv = document.getElementById('listener');
     listenerDiv.appendChild(moduleEl);
 
+    // Request the offsetTop property to force a relayout. As of Apr 10, 2014
+    // this is needed if the module is being loaded on a Chrome App's
+    // background page (see crbug.com/350445).
+    moduleEl.offsetTop;
+
     // Host plugins don't send a moduleDidLoad message. We'll fake it here.
     var isHost = isHostToolchain(tool);
     if (isHost) {