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

[zmo at google.com]

The following commit has been merged in the debian/experimental branch:
commit bd76483634b107990f8ee8af3ccd02a9d6bad80c
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 00:34:15 2010 +0000

    2010-08-31  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            gl-teximage.html and tex-image-and-sub-image-2d-with-image.html failed on Chromium Mac bots (10.5)
            https://bugs.webkit.org/show_bug.cgi?id=44993
    
            * platform/graphics/cg/GraphicsContext3DCG.cpp:
            (WebCore::GraphicsContext3D::getImageData): Take into consideration the source image pixel row alignment.
    2010-08-31  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            gl-teximage.html and tex-image-and-sub-image-2d-with-image.html failed on Chromium Mac bots (10.5)
            https://bugs.webkit.org/show_bug.cgi?id=44993
    
            * platform/chromium/test_expectations.txt: Enabling the failing tests with the fix.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66559 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 20eff82..fb113de 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-31  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        gl-teximage.html and tex-image-and-sub-image-2d-with-image.html failed on Chromium Mac bots (10.5)
+        https://bugs.webkit.org/show_bug.cgi?id=44993
+
+        * platform/chromium/test_expectations.txt: Enabling the failing tests with the fix.
+
 2010-08-31  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Dave Hyatt.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 2d45601..f8f49a1 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3165,7 +3165,3 @@ BUGWK44967 MAC : fast/multicol/paginate-block-replaced.html = IMAGE
 // New tests in r66523 and r66516
 BUGWK44996 WIN : inspector/report-API-errors.html = TEXT
 BUGWK44996 WIN : inspector/report-protocol-errors.html = TEXT
-
-// Failing after r44997
-BUGWK44997 MAC : fast/canvas/webgl/gl-teximage.html = TEXT
-BUGWK44997 MAC : fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html = TEXT
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c68636c..a0ad741 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-31  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        gl-teximage.html and tex-image-and-sub-image-2d-with-image.html failed on Chromium Mac bots (10.5)
+        https://bugs.webkit.org/show_bug.cgi?id=44993
+
+        * platform/graphics/cg/GraphicsContext3DCG.cpp:
+        (WebCore::GraphicsContext3D::getImageData): Take into consideration the source image pixel row alignment.
+
 2010-08-31  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp b/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
index 0ff8bea..c4008cc 100644
--- a/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
@@ -140,7 +140,15 @@ bool GraphicsContext3D::getImageData(Image* image,
         return false;
     const UInt8* rgba = CFDataGetBytePtr(pixelData.get());
     outputVector.resize(width * height * 4);
-    bool rt = packPixels(rgba, srcDataFormat, width, height, 0,
+    unsigned int srcUnpackAlignment = 0;
+    size_t bytesPerRow = CGImageGetBytesPerRow(cgImage);
+    unsigned int padding = bytesPerRow - componentsPerPixel * width;
+    if (padding) {
+        srcUnpackAlignment = padding + 1;
+        while (bytesPerRow % srcUnpackAlignment)
+            ++srcUnpackAlignment;
+    }
+    bool rt = packPixels(rgba, srcDataFormat, width, height, srcUnpackAlignment,
                          format, type, neededAlphaOp, outputVector.data());
     return rt;
 }

-- 
WebKit Debian packaging