Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: samples/shader-test.html

Issue 155154: Fix for shader-test.html and IE... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samples/shader-test.html
===================================================================
--- samples/shader-test.html (revision 20010)
+++ samples/shader-test.html (working copy)
@@ -317,7 +317,8 @@
g_currentTimeParam = paramObject.createParam('timeParam','ParamFloat');
// Load effects and fill out options.
- options = ''
+ options = '<select id="shaderSelect" name="shaderSelect"' +
+ ' onChange="changeShader()">'
for(var s = 0; s < g_shaders.length; s++) {
g_effects[s] = g_pack.createObject('Effect');
var shaderString = 'shaders/' + g_shaders[s].file + '.shader';
@@ -325,7 +326,8 @@
options += '<option value="' + s + '"' + (s == 0 ? ' selected' : '') +
'>' + g_shaders[s].name + '</option>';
}
- document.getElementById('shaderSelect').innerHTML = options;
+ options += '</select>';
+ document.getElementById('shaderDiv').innerHTML = options;
var rampWidth = 64;
var texture = g_pack.createTexture2D(
@@ -406,7 +408,6 @@
<div id="o3d" style="width: 100%; height: 80%;"></div>
<!-- End of O3D plugin -->
<p>
-<select id='shaderSelect' name='shaderSelect' onChange='changeShader()'>
-</select>
+<div id='shaderDiv'></div>
</body>
</html>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698