[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[oliver at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9f9053a0988e816023d77347f7398441f82daab7
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 00:58:16 2010 +0000

    2010-10-11  Oliver Hunt  <oliver at apple.com>
    
            Reviewed by Adam Barth.
    
            Make fast/canvas/webgl/glsl-conformance pass again
            https://bugs.webkit.org/show_bug.cgi?id=47525
    
            Remove incorrect call to glGetShaderiv, so it is only
            called in the case where we don't have our own simulated
            log.
    
            * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
            (WebCore::GraphicsContext3D::getShaderInfoLog):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 49a4f09..91ca374 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-11  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Adam Barth.
+
+        Make fast/canvas/webgl/glsl-conformance pass again
+        https://bugs.webkit.org/show_bug.cgi?id=47525
+
+        Remove incorrect call to glGetShaderiv, so it is only
+        called in the case where we don't have our own simulated
+        log.
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::getShaderInfoLog):
+
 2010-10-11  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
index d78a956..daf3b12 100644
--- a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+++ b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
@@ -1227,10 +1227,6 @@ String GraphicsContext3D::getShaderInfoLog(Platform3DObject shader)
     ASSERT(shader);
 
     makeContextCurrent();
-    GLint length;
-    ::glGetShaderiv((GLuint) shader, GL_INFO_LOG_LENGTH, &length);
-    if (!length)
-        return "";
 
     HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
 
@@ -1253,10 +1249,8 @@ String GraphicsContext3D::getShaderInfoLog(Platform3DObject shader)
          String s(info);
          fastFree(info);
          return s;
-     }
-     else {
+     } else
          return entry.log;
-     }
 }
 
 String GraphicsContext3D::getShaderSource(Platform3DObject shader)

-- 
WebKit Debian packaging