summaryrefslogtreecommitdiffstats
path: root/o3d/samples/generate-texture.html
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 21:41:31 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 21:41:31 +0000
commit28b4f9bc980da2e69c3edcee374948bae0c5f8ac (patch)
treeaa761d14dc32d90bc3ced831ccef11bfef0cf22e /o3d/samples/generate-texture.html
parent6f324234680499d621c1277dec1abb08fde3cc0a (diff)
downloadchromium_src-28b4f9bc980da2e69c3edcee374948bae0c5f8ac.zip
chromium_src-28b4f9bc980da2e69c3edcee374948bae0c5f8ac.tar.gz
chromium_src-28b4f9bc980da2e69c3edcee374948bae0c5f8ac.tar.bz2
This change fixes the issue that if you use
o3djs.util.setMainEngine(...V8) in any sample and you use scripts that you don't want run in V8, for example Adsense, Google Analyitics, Wave, Google WebElements then the o3djs would attempt to pull in that javascript and execute it in V8. Specifically this refers to inline <script> tags instead HTML. Not <script src="url"> tags. The solution is we add an id to the tags we want o3djs to pull in. Any script with an id that starts with "o3d" will get pulled in. This CL changes our samples to have that id on their script tags. Review URL: http://codereview.chromium.org/159339 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/generate-texture.html')
-rw-r--r--o3d/samples/generate-texture.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/samples/generate-texture.html b/o3d/samples/generate-texture.html
index b910af3..951f81b 100644
--- a/o3d/samples/generate-texture.html
+++ b/o3d/samples/generate-texture.html
@@ -41,7 +41,7 @@ How to generate a texture.
Generate Texture.
</title>
<script type="text/javascript" src="o3djs/base.js"></script>
-<script type="text/javascript">
+<script type="text/javascript" id="o3d">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');