[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[zmo at google.com]

The following commit has been merged in the debian/experimental branch:
commit cdd23dfa435fbed4b0f28339e6c53addd6a84d57
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 18:52:53 2011 +0000

    2011-01-07  Zhenyao Mo  <zmo at google.com>
    
            Unreviewed, build fix.
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::copyTexSubImage2D):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3e3dc32..7b09a98 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-07  Zhenyao Mo  <zmo at google.com>
+
+        Unreviewed, build fix.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::copyTexSubImage2D):
+
 2011-01-06  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 206b1b2..1330b1f 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -750,8 +750,8 @@ void WebGLRenderingContext::copyTexSubImage2D(unsigned long target, long level,
         if (clip2D(x, y, width, height, getBoundFramebufferWidth(), getBoundFramebufferHeight(), &clippedX, &clippedY, &clippedWidth, &clippedHeight)) {
             unsigned long format = tex->getInternalFormat(target, level);
             unsigned long type = tex->getType(target, level);
-            unsigned long componentsPerPixel = 0;
-            unsigned long bytesPerComponent = 0;
+            unsigned int componentsPerPixel = 0;
+            unsigned int bytesPerComponent = 0;
             bool valid = m_context->computeFormatAndTypeParameters(format, type, &componentsPerPixel, &bytesPerComponent);
             if (!valid) {
                 m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);

-- 
WebKit Debian packaging