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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 18:27:26 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3d3114316624684dd4eccd2e263622d8c89dd8f8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 11 03:00:41 2010 +0000

    2010-12-10  Vincent Scheib  <scheib at chromium.org>
    
            Reviewed by James Robinson.
    
            Shader::loadShader() must initialize variable passed to getShaderiv
            https://bugs.webkit.org/show_bug.cgi?id=50842
    
            Test: fast/canvas/canvas-largedraws.html
    
            * platform/graphics/gpu/Shader.cpp:
            (WebCore::Shader::loadShader):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 60ba3c3..0fc2db5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by James Robinson.
 
+        Shader::loadShader() must initialize variable passed to getShaderiv
+        https://bugs.webkit.org/show_bug.cgi?id=50842
+
+        Test: fast/canvas/canvas-largedraws.html
+
+        * platform/graphics/gpu/Shader.cpp:
+        (WebCore::Shader::loadShader):
+
+2010-12-10  Vincent Scheib  <scheib at chromium.org>
+
+        Reviewed by James Robinson.
+
         Texture::updateSubRect should pass IntRect by reference
         https://bugs.webkit.org/show_bug.cgi?id=50845
 
diff --git a/WebCore/platform/graphics/gpu/Shader.cpp b/WebCore/platform/graphics/gpu/Shader.cpp
index 120c652..6978322 100644
--- a/WebCore/platform/graphics/gpu/Shader.cpp
+++ b/WebCore/platform/graphics/gpu/Shader.cpp
@@ -65,7 +65,7 @@ unsigned Shader::loadShader(GraphicsContext3D* context, unsigned type, const cha
     String shaderSourceStr(shaderSource);
     context->shaderSource(shader, shaderSourceStr);
     context->compileShader(shader);
-    int compileStatus;
+    int compileStatus = 0;
     context->getShaderiv(shader, GraphicsContext3D::COMPILE_STATUS, &compileStatus);
     if (!compileStatus) {
         String infoLog = context->getShaderInfoLog(shader);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list