Minor WebGL 2 bug fixes for gl-object-get-calls test to pass

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 2401 matching lines @@
     if (isContextLost() || !validateWebGLObject("getUniformBlockIndex", program))
         return 0;
     if (!validateString("getUniformBlockIndex", uniformBlockName))
         return 0;
 
     return webContext()->getUniformBlockIndex(objectOrZero(program), uniformBlockName.utf8().data());
 }
 
 bool WebGL2RenderingContextBase::validateUniformBlockIndex(const char* functionName, WebGLProgram* program, GLuint blockIndex)
 {
+    ASSERT(program);
+    if (!program->linkStatus()) {
+        synthesizeGLError(GL_INVALID_OPERATION, functionName, "program not linked");
+        return false;
+    }
     GLint activeUniformBlocks = 0;
     webContext()->getProgramiv(objectOrZero(program), GL_ACTIVE_UNIFORM_BLOCKS, &activeUniformBlocks);
     if (blockIndex >= static_cast<GLuint>(activeUniformBlocks)) {
         synthesizeGLError(GL_INVALID_VALUE, functionName, "invalid uniform block index");
         return false;
     }
     return true;
 }
 
 ScriptValue WebGL2RenderingContextBase::getActiveUniformBlockParameter(ScriptState* scriptState, WebGLProgram* program, GLuint uniformBlockIndex, GLenum pname)
@@ skipping 704 matching lines @@
     if (!framebufferBinding) {
         // We can use m_requestedAttribs because in WebGL 2, they are required to be honored.
         bool hasDepth = m_requestedAttributes.depth();
         bool hasStencil = m_requestedAttributes.stencil();
         bool hasAlpha = m_requestedAttributes.alpha();
         bool missingImage = (attachment == GL_DEPTH && !hasDepth)
             || (attachment == GL_STENCIL && !hasStencil);
         if (missingImage) {
             switch (pname) {
             case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE:
-                return WebGLAny(scriptState, GL_FRAMEBUFFER_DEFAULT);
+                return WebGLAny(scriptState, GL_NONE);
             default:
-                synthesizeGLError(GL_INVALID_ENUM, kFunctionName, "invalid parameter name");
+                synthesizeGLError(GL_INVALID_OPERATION, kFunctionName, "invalid parameter name");
                 return ScriptValue::createNull(scriptState);
             }
         }
         switch (pname) {
         case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE:
             return WebGLAny(scriptState, GL_FRAMEBUFFER_DEFAULT);
         case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
         case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
             {
@@ skipping 290 matching lines @@
     params.alignment = m_unpackAlignment;
     params.rowLength = m_unpackRowLength;
     params.imageHeight = m_unpackImageHeight;
     params.skipPixels = m_unpackSkipPixels;
     params.skipRows = m_unpackSkipRows;
     params.skipImages = m_unpackSkipImages;
     return params;
 }
 
 } // namespace blink