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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit c29fd401115e9e72aef10ead942137f37ee24804
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 22:01:29 2010 +0000

    2010-10-29  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            TextureMapperGL get the driver info log but do not use it
            https://bugs.webkit.org/show_bug.cgi?id=48247
    
            Remove the call to glGetProgramInfoLog().
    
            * platform/graphics/opengl/TextureMapperGL.cpp:
            (WebCore::TexmapShaderInfo::createShaderProgram):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9276937..f0e7586 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-29  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        TextureMapperGL get the driver info log but do not use it
+        https://bugs.webkit.org/show_bug.cgi?id=48247
+
+        Remove the call to glGetProgramInfoLog().
+
+        * platform/graphics/opengl/TextureMapperGL.cpp:
+        (WebCore::TexmapShaderInfo::createShaderProgram):
+
 2010-10-29  Benjamin Kalman  <kalman at google.com>
 
         Reviewed by Tony Chang.
diff --git a/WebCore/platform/graphics/opengl/TextureMapperGL.cpp b/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
index 966656b..6527ce4 100644
--- a/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
+++ b/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
@@ -167,9 +167,6 @@ static struct TexmapShaderInfo {
         GL_CMD(glBindAttribLocation(programID, 0, "InVertex"))
         GL_CMD(glLinkProgram(programID))
         programs[index].id = programID;
-        char infoLog[1024];
-        int len;
-        GL_CMD(glGetProgramInfoLog(programID, 1024, &len, infoLog));
     }
 
     ProgramInfo programs[NumPrograms];

-- 
WebKit Debian packaging