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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3552adf5651f041c11bf2431ca94a1566e1ac50d
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 14:18:37 2010 +0000

    Switch back to using kCGImageAlphaPremultipliedFirst when generating pixel dumps on Windows
    
    I changed this behavior in r71418 thinking that it was required for
    getting plugins to show up in pixel dumps. But it doesn't seem to be
    necessary, and was making it impossible to compare new Windows pixel
    dumps with existing Windows or Mac pixel dumps (because ImageDiff won't
    compare an image with alpha to an image without alpha).
    
    Fixes <http://webkit.org/b/49172> REGRESION (r71418): Can't compare
    new Windows pixel results to existing Windows or Mac results
    
    Reviewed by Antti Koivisto.
    
    * DumpRenderTree/win/PixelDumpSupportWin.cpp:
    (createBitmapContextFromWebView): Replaced kCGImageAlphaNoneSkipFirst
    with kCGImageAlphaPremultipliedFirst.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1ae1a4e..b9b0503 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-08  Adam Roben  <aroben at apple.com>
+
+        Switch back to using kCGImageAlphaPremultipliedFirst when generating
+        pixel dumps on Windows
+
+        I changed this behavior in r71418 thinking that it was required for
+        getting plugins to show up in pixel dumps. But it doesn't seem to be
+        necessary, and was making it impossible to compare new Windows pixel
+        dumps with existing Windows or Mac pixel dumps (because ImageDiff won't
+        compare an image with alpha to an image without alpha).
+
+        Fixes <http://webkit.org/b/49172> REGRESION (r71418): Can't compare
+        new Windows pixel results to existing Windows or Mac results
+
+        Reviewed by Antti Koivisto.
+
+        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
+        (createBitmapContextFromWebView): Replaced kCGImageAlphaNoneSkipFirst
+        with kCGImageAlphaPremultipliedFirst.
+
 2010-11-08  Csaba Osztrogonac  <ossy at webkit.org>
 
         Unreviewed, rolling out r71466.
diff --git a/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp b/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
index 6169f0f..752cc39 100644
--- a/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
@@ -73,7 +73,7 @@ PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool inc
 #if PLATFORM(CG)
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
     CGContextRef context = CGBitmapContextCreate(info.bmBits, info.bmWidth, info.bmHeight, 8,
-                                                info.bmWidthBytes, colorSpace.get(), kCGBitmapByteOrder32Host | kCGImageAlphaNoneSkipFirst);
+                                                info.bmWidthBytes, colorSpace.get(), kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
 #elif PLATFORM(CAIRO) 
     cairo_surface_t* image = cairo_image_surface_create_for_data((unsigned char*)info.bmBits, CAIRO_FORMAT_ARGB32, 
                                                       info.bmWidth, info.bmHeight, info.bmWidthBytes); 

-- 
WebKit Debian packaging