[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 a1dc8e01ec226085db5b63cb0aac18bc7f139379
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 11 17:54:37 2010 +0000

    Build fix -- I thought i had killed the prior commit in time to allow me to add this
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 172d58d..4de8459 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-10-11  Oliver Hunt  <oliver at apple.com>
 
+        Build fix -- I thought i had killed the prior commit in time to have this be part of the commit.
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::getShaderInfoLog):
+
+2010-10-11  Oliver Hunt  <oliver at apple.com>
+
         Reviewed by Andreas Kling.
 
         Incorrect handling of 0 length logs in GraphicsContext3DOpenGL.cpp
diff --git a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
index a1958ef..d78a956 100644
--- a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+++ b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
@@ -1243,7 +1243,7 @@ String GraphicsContext3D::getShaderInfoLog(Platform3DObject shader)
          GLint length;
          ::glGetShaderiv((GLuint) shader, GL_INFO_LOG_LENGTH, &length);
          if (!length)
-             return;
+             return "";
 
          GLsizei size;
          GLchar* info = (GLchar*) fastMalloc(length);

-- 
WebKit Debian packaging