Fixes the build for o3d.

TEST=it builds
BUG=none

Review URL: http://codereview.chromium.org/3217016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58073 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 2 deletions

diff --git a/o3d/samples/o3djs/canvas.js b/o3d/samples/o3djs/canvas.js
index 5fe3aa3..2d83718 100644
--- a/o3d/samples/o3djs/canvas.js
+++ b/o3d/samples/o3djs/canvas.js
@@ -112,7 +112,7 @@ o3djs.canvas.create = function(pack, root, viewInfo) {
  *   1. Transforms the shape to screen space via the worldViewProjection matrix.
  *   2. Performs a texture lookup to display the contents of the texture
  *      bound to texSampler0.
- * @type {string}
+ * @return {string} The shader used canvas quads.
  */
 o3djs.canvas.buildShaderString = function() {
   var p = o3djs.effect;
diff --git a/o3d/samples/o3djs/effect.js b/o3d/samples/o3djs/effect.js
index 8351473..76867e8 100644
--- a/o3d/samples/o3djs/effect.js
+++ b/o3d/samples/o3djs/effect.js
@@ -394,6 +394,7 @@ o3djs.effect.setLanguage = function(language) {
  * 'glsl' or 'o3d'.
  */
 o3djs.effect.getLanguage = function() {
+  var language_namespace = o3djs.effect.o3d;
   if (language_namespace == o3djs.effect.glsl) {
     return 'glsl';
   }
diff --git a/o3d/samples/o3djs/texture.js b/o3d/samples/o3djs/texture.js
index c299df0..8bb6680 100644
--- a/o3d/samples/o3djs/texture.js
+++ b/o3d/samples/o3djs/texture.js
@@ -287,7 +287,7 @@ o3djs.texture.createCubeTextureFrom6Bitmaps = function(
       edgeLength, bitmaps[0].format, numMips, false);
   for (var ii = 0; ii < 6; ++ii) {
     var bitmap = bitmaps[ii];
-    texture.setFromBitmap(ii, bitmap);
+    texture.setFromBitmap(/** @type{o3d.TextureCUBE.CubeFace} */ (ii), bitmap);
   }
   texture.generateMips(0, numMips - 1);
   return texture;