summaryrefslogtreecommitdiffstats
path: root/o3d/tests
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 23:54:34 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 23:54:34 +0000
commit8abb4c215291b6b2769893a2d73e4747199a3ffa (patch)
tree6701f4add17537d2470a2b90e27f76c122c72d12 /o3d/tests
parent35a66cf92767d82ba130c85b7e96d8a5b6d6bd2b (diff)
downloadchromium_src-8abb4c215291b6b2769893a2d73e4747199a3ffa.zip
chromium_src-8abb4c215291b6b2769893a2d73e4747199a3ffa.tar.gz
chromium_src-8abb4c215291b6b2769893a2d73e4747199a3ffa.tar.bz2
Change <script id="o3d" to <script id="o3dscript"
so that document.getElementById('o3d') will work for finding the o3d div. Review URL: http://codereview.chromium.org/159556 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
-rw-r--r--o3d/tests/selenium/tests/base-test.html2
-rw-r--r--o3d/tests/selenium/tests/culling-zsort-test.html2
-rw-r--r--o3d/tests/selenium/tests/drawshapes.html2
-rw-r--r--o3d/tests/selenium/tests/effect-import-test.html2
-rw-r--r--o3d/tests/selenium/tests/event-test.html2
-rw-r--r--o3d/tests/selenium/tests/features-test.html2
-rw-r--r--o3d/tests/selenium/tests/init-status-test.html2
-rw-r--r--o3d/tests/selenium/tests/math-test.html2
-rw-r--r--o3d/tests/selenium/tests/no-rendergraph.html2
-rw-r--r--o3d/tests/selenium/tests/non-cachable-params.html2
-rw-r--r--o3d/tests/selenium/tests/offscreen-test.html2
-rw-r--r--o3d/tests/selenium/tests/ownership-test.html2
-rw-r--r--o3d/tests/selenium/tests/param-array-test.html2
-rw-r--r--o3d/tests/selenium/tests/pixel-perfection.html2
-rw-r--r--o3d/tests/selenium/tests/quaternion-test.html2
-rw-r--r--o3d/tests/selenium/tests/render-test.html2
-rw-r--r--o3d/tests/selenium/tests/serialization-test.html2
-rw-r--r--o3d/tests/selenium/tests/test-test.html2
-rw-r--r--o3d/tests/selenium/tests/texture-set-test.html2
-rw-r--r--o3d/tests/selenium/tests/type-test.html2
-rw-r--r--o3d/tests/selenium/tests/util-test.html2
-rw-r--r--o3d/tests/selenium/tests/v8-test.html2
-rw-r--r--o3d/tests/selenium/tests/version-check-test.html2
-rw-r--r--o3d/tests/selenium/tests/window-overlap-test.html2
-rw-r--r--o3d/tests/selenium/tests/window-overlap-top.html2
25 files changed, 25 insertions, 25 deletions
diff --git a/o3d/tests/selenium/tests/base-test.html b/o3d/tests/selenium/tests/base-test.html
index 0cefe47..c799ec3 100644
--- a/o3d/tests/selenium/tests/base-test.html
+++ b/o3d/tests/selenium/tests/base-test.html
@@ -49,7 +49,7 @@ This tests base.js.
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.test');
o3djs.require('o3djs.util');
diff --git a/o3d/tests/selenium/tests/culling-zsort-test.html b/o3d/tests/selenium/tests/culling-zsort-test.html
index 44b6c20..2fe62ed 100644
--- a/o3d/tests/selenium/tests/culling-zsort-test.html
+++ b/o3d/tests/selenium/tests/culling-zsort-test.html
@@ -46,7 +46,7 @@ Culling and ZSorting Test.
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/drawshapes.html b/o3d/tests/selenium/tests/drawshapes.html
index 3901194..dcd9831 100644
--- a/o3d/tests/selenium/tests/drawshapes.html
+++ b/o3d/tests/selenium/tests/drawshapes.html
@@ -45,7 +45,7 @@ The color is set randomly.
Drawshape stress test for O3D
</title>
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/effect-import-test.html b/o3d/tests/selenium/tests/effect-import-test.html
index fec01dc..06357e0 100644
--- a/o3d/tests/selenium/tests/effect-import-test.html
+++ b/o3d/tests/selenium/tests/effect-import-test.html
@@ -44,7 +44,7 @@ Effect Import Test
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.rendergraph');
o3djs.require('o3djs.camera');
diff --git a/o3d/tests/selenium/tests/event-test.html b/o3d/tests/selenium/tests/event-test.html
index 5b463fd..4e03d6fd 100644
--- a/o3d/tests/selenium/tests/event-test.html
+++ b/o3d/tests/selenium/tests/event-test.html
@@ -44,7 +44,7 @@ This tests the event-handler functions in the event.js library.
<br/>
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.event');
o3djs.require('o3djs.test');
diff --git a/o3d/tests/selenium/tests/features-test.html b/o3d/tests/selenium/tests/features-test.html
index d42c2f9..ea4ec7d 100644
--- a/o3d/tests/selenium/tests/features-test.html
+++ b/o3d/tests/selenium/tests/features-test.html
@@ -47,7 +47,7 @@ Features Test.
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/init-status-test.html b/o3d/tests/selenium/tests/init-status-test.html
index c17e74f..c46a587 100644
--- a/o3d/tests/selenium/tests/init-status-test.html
+++ b/o3d/tests/selenium/tests/init-status-test.html
@@ -46,7 +46,7 @@ Init Status Test.
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/math-test.html b/o3d/tests/selenium/tests/math-test.html
index c96b11d..bba64c0 100644
--- a/o3d/tests/selenium/tests/math-test.html
+++ b/o3d/tests/selenium/tests/math-test.html
@@ -44,7 +44,7 @@ This tests the math utility library.
<br/>
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.math');
o3djs.require('o3djs.test');
diff --git a/o3d/tests/selenium/tests/no-rendergraph.html b/o3d/tests/selenium/tests/no-rendergraph.html
index bf07950..dd20206 100644
--- a/o3d/tests/selenium/tests/no-rendergraph.html
+++ b/o3d/tests/selenium/tests/no-rendergraph.html
@@ -44,7 +44,7 @@ No Rendergraph.
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
// Events
diff --git a/o3d/tests/selenium/tests/non-cachable-params.html b/o3d/tests/selenium/tests/non-cachable-params.html
index 74d2007..14e8fdd 100644
--- a/o3d/tests/selenium/tests/non-cachable-params.html
+++ b/o3d/tests/selenium/tests/non-cachable-params.html
@@ -44,7 +44,7 @@ Non Cachable Params
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/offscreen-test.html b/o3d/tests/selenium/tests/offscreen-test.html
index dcdb78d..e1e3519 100644
--- a/o3d/tests/selenium/tests/offscreen-test.html
+++ b/o3d/tests/selenium/tests/offscreen-test.html
@@ -47,7 +47,7 @@ Offscreen Test.
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/ownership-test.html b/o3d/tests/selenium/tests/ownership-test.html
index 8caeb91..298ef77 100644
--- a/o3d/tests/selenium/tests/ownership-test.html
+++ b/o3d/tests/selenium/tests/ownership-test.html
@@ -42,7 +42,7 @@ Ownership Test
</title>
<!-- Our javascript code -->
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
window.onload = init;
diff --git a/o3d/tests/selenium/tests/param-array-test.html b/o3d/tests/selenium/tests/param-array-test.html
index 3b753a2..a5fd6d8 100644
--- a/o3d/tests/selenium/tests/param-array-test.html
+++ b/o3d/tests/selenium/tests/param-array-test.html
@@ -41,7 +41,7 @@ Param Array Test
Param Array Test.
</title>
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/pixel-perfection.html b/o3d/tests/selenium/tests/pixel-perfection.html
index cbb19c2..18ecb1d 100644
--- a/o3d/tests/selenium/tests/pixel-perfection.html
+++ b/o3d/tests/selenium/tests/pixel-perfection.html
@@ -52,7 +52,7 @@ we have a way to do that.
Pixel Perfection
</title>
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.effect');
o3djs.require('o3djs.material');
o3djs.require('o3djs.math');
diff --git a/o3d/tests/selenium/tests/quaternion-test.html b/o3d/tests/selenium/tests/quaternion-test.html
index 142fb65..0fda49c 100644
--- a/o3d/tests/selenium/tests/quaternion-test.html
+++ b/o3d/tests/selenium/tests/quaternion-test.html
@@ -44,7 +44,7 @@ This tests the quaternion utility library.
<br/>
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.math');
o3djs.require('o3djs.quaternions');
diff --git a/o3d/tests/selenium/tests/render-test.html b/o3d/tests/selenium/tests/render-test.html
index d1a2000..0571ede 100644
--- a/o3d/tests/selenium/tests/render-test.html
+++ b/o3d/tests/selenium/tests/render-test.html
@@ -51,7 +51,7 @@ Render Test.
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/serialization-test.html b/o3d/tests/selenium/tests/serialization-test.html
index 6c5c186..b62d757 100644
--- a/o3d/tests/selenium/tests/serialization-test.html
+++ b/o3d/tests/selenium/tests/serialization-test.html
@@ -48,7 +48,7 @@ This tests deserialization of packs from JSON.
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.io');
o3djs.require('o3djs.serialization');
diff --git a/o3d/tests/selenium/tests/test-test.html b/o3d/tests/selenium/tests/test-test.html
index faa815a..0161ff9 100644
--- a/o3d/tests/selenium/tests/test-test.html
+++ b/o3d/tests/selenium/tests/test-test.html
@@ -44,7 +44,7 @@ This tests the operation of the unit testing library.
<br/>
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.test');
diff --git a/o3d/tests/selenium/tests/texture-set-test.html b/o3d/tests/selenium/tests/texture-set-test.html
index 8bbc3fe..891a08d 100644
--- a/o3d/tests/selenium/tests/texture-set-test.html
+++ b/o3d/tests/selenium/tests/texture-set-test.html
@@ -41,7 +41,7 @@ Texture set test.
Texture Set Test.
</title>
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/type-test.html b/o3d/tests/selenium/tests/type-test.html
index 06edcb3..84eee91 100644
--- a/o3d/tests/selenium/tests/type-test.html
+++ b/o3d/tests/selenium/tests/type-test.html
@@ -43,7 +43,7 @@ Type Test
<!-- Our javascript code -->
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.math');
diff --git a/o3d/tests/selenium/tests/util-test.html b/o3d/tests/selenium/tests/util-test.html
index 1504fd3..0101840 100644
--- a/o3d/tests/selenium/tests/util-test.html
+++ b/o3d/tests/selenium/tests/util-test.html
@@ -49,7 +49,7 @@ This tests util.js.
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.test');
o3djs.require('o3djs.util');
diff --git a/o3d/tests/selenium/tests/v8-test.html b/o3d/tests/selenium/tests/v8-test.html
index 167c8309..0c2dafe 100644
--- a/o3d/tests/selenium/tests/v8-test.html
+++ b/o3d/tests/selenium/tests/v8-test.html
@@ -49,7 +49,7 @@ This tests V8/NPAPI interoperation and the ActiveX bridge.
<script type="text/javascript"
src="../../../samples/o3djs/base.js"></script>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.test');
o3djs.require('o3djs.util');
diff --git a/o3d/tests/selenium/tests/version-check-test.html b/o3d/tests/selenium/tests/version-check-test.html
index ddeef25..fcc3acb 100644
--- a/o3d/tests/selenium/tests/version-check-test.html
+++ b/o3d/tests/selenium/tests/version-check-test.html
@@ -46,7 +46,7 @@ Version Check
src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
// Events
diff --git a/o3d/tests/selenium/tests/window-overlap-test.html b/o3d/tests/selenium/tests/window-overlap-test.html
index 4b3f9c0..8a7910e 100644
--- a/o3d/tests/selenium/tests/window-overlap-test.html
+++ b/o3d/tests/selenium/tests/window-overlap-test.html
@@ -47,7 +47,7 @@ Window Overlap Test
<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>
<!-- Our javascript code -->
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
o3djs.require('o3djs.util');
o3djs.require('o3djs.rendergraph');
diff --git a/o3d/tests/selenium/tests/window-overlap-top.html b/o3d/tests/selenium/tests/window-overlap-top.html
index 3c5cc2d..8243465 100644
--- a/o3d/tests/selenium/tests/window-overlap-top.html
+++ b/o3d/tests/selenium/tests/window-overlap-top.html
@@ -42,7 +42,7 @@ See window-overlap-test.html
<title>
Window Overlap Test Top Window
</title>
-<script type="text/javascript" id="o3d">
+<script type="text/javascript" id="o3dscript">
// Events
// init() once the page has finished loading.
window.onload = init;