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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 807c8075a01c11083b9c0b7867402abb64b67285
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 01:41:09 2010 +0000

    2010-08-26  James Robinson  <jamesr at chromium.org>
    
            Fix chromium mac build. Unreviewed.
    
            * platform/graphics/chromium/GLES2Canvas.cpp:
            (WebCore::GLES2Canvas::GLES2Canvas):
            * platform/graphics/chromium/GLES2Texture.cpp:
            (WebCore::GLES2Texture::load):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 62bc715..e5b7db6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-26  James Robinson  <jamesr at chromium.org>
+
+        Fix chromium mac build. Unreviewed.
+
+        * platform/graphics/chromium/GLES2Canvas.cpp:
+        (WebCore::GLES2Canvas::GLES2Canvas):
+        * platform/graphics/chromium/GLES2Texture.cpp:
+        (WebCore::GLES2Texture::load):
+
 2010-08-26  Mark Rowe  <mrowe at apple.com>
 
         Darin pointed out that the braces are unnecessary in an Objective-C interface
diff --git a/WebCore/platform/graphics/chromium/GLES2Canvas.cpp b/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
index 6463f32..450e9fd 100644
--- a/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
+++ b/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
@@ -62,10 +62,10 @@ struct GLES2Canvas::State {
 
 GLES2Canvas::GLES2Canvas(GraphicsContext3D* context, const IntSize& size)
     : m_context(context)
+    , m_state(0)
     , m_quadVertices(0)
     , m_solidFillShader(SolidFillShader::create(context))
     , m_texShader(TexShader::create(context))
-    , m_state(0)
 {
     m_flipMatrix.translate(-1.0f, 1.0f);
     m_flipMatrix.scale(2.0f / size.width(), -2.0f / size.height());
@@ -298,27 +298,6 @@ unsigned GLES2Canvas::getQuadVertices()
     return m_quadVertices;
 }
 
-
-static unsigned loadShader(GraphicsContext3D* context, unsigned type, const char* shaderSource)
-{
-    unsigned shader = context->createShader(type);
-    if (!shader)
-        return 0;
-
-    String shaderSourceStr(shaderSource);
-    context->shaderSource(shader, shaderSourceStr);
-    context->compileShader(shader);
-    int compileStatus;
-    context->getShaderiv(shader, GraphicsContext3D::COMPILE_STATUS, &compileStatus);
-    if (!compileStatus) {
-        String infoLog = context->getShaderInfoLog(shader);
-        LOG_ERROR(infoLog.utf8().data());
-        context->deleteShader(shader);
-        return 0;
-    }
-    return shader;
-}
-
 GLES2Texture* GLES2Canvas::createTexture(NativeImagePtr ptr, GLES2Texture::Format format, int width, int height)
 {
     PassRefPtr<GLES2Texture> texture = m_textures.get(ptr);
diff --git a/WebCore/platform/graphics/chromium/GLES2Texture.cpp b/WebCore/platform/graphics/chromium/GLES2Texture.cpp
index eeeab88..c02e940 100644
--- a/WebCore/platform/graphics/chromium/GLES2Texture.cpp
+++ b/WebCore/platform/graphics/chromium/GLES2Texture.cpp
@@ -136,7 +136,8 @@ static uint32_t* copySubRect(uint32_t* src, int srcX, int srcY, uint32_t* dst, i
 void GLES2Texture::load(void* pixels)
 {
     uint32_t* pixels32 = static_cast<uint32_t*>(pixels);
-    unsigned int glFormat, glType;
+    unsigned int glFormat = 0;
+    unsigned int glType = 0;
     bool swizzle;
     convertFormat(m_context, m_format, &glFormat, &glType, &swizzle);
     if (swizzle) {

-- 
WebKit Debian packaging