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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9e301b58f730dda6b04c476b1b32bd2fa0e65880
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 03:45:40 2010 +0000

    Patch for https://bugs.webkit.org/show_bug.cgi?id=42315
    <rdar://problem/8185281>
    All text in WebKit2 draws with no subpixel antialiasing
    
    Reviewed by Dan Bernstein.
    
    - Change CGBitmapInfo passed to CGBitmapContextCreate and CGImageCreate
      from kCGImageAlphaPremultipliedLast to kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host.
    
    * Shared/mac/UpdateChunk.cpp:
    (WebKit::UpdateChunk::createImage):
    * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
    (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
    * WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp:
    (WebKit::ChunkedUpdateDrawingArea::paintIntoUpdateChunk):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63400 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d01630e..de38009 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-14  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=42315
+        <rdar://problem/8185281>
+        All text in WebKit2 draws with no subpixel antialiasing
+
+        - Change CGBitmapInfo passed to CGBitmapContextCreate and CGImageCreate
+          from kCGImageAlphaPremultipliedLast to kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host.
+
+        * Shared/mac/UpdateChunk.cpp:
+        (WebKit::UpdateChunk::createImage):
+        * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
+        * WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp:
+        (WebKit::ChunkedUpdateDrawingArea::paintIntoUpdateChunk):
+
 2010-07-14  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/WebKit2/Shared/mac/UpdateChunk.cpp b/WebKit2/Shared/mac/UpdateChunk.cpp
index f0d2962..ad77a4d 100644
--- a/WebKit2/Shared/mac/UpdateChunk.cpp
+++ b/WebKit2/Shared/mac/UpdateChunk.cpp
@@ -60,7 +60,7 @@ RetainPtr<CGImageRef> UpdateChunk::createImage()
 {
     RetainPtr<CGDataProviderRef> provider(AdoptCF, CGDataProviderCreateWithData(0, m_data, size(), 0));
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-    RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(m_rect.width(), m_rect.height(), 8, 32, m_rect.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedLast, provider.get(), 0, false, kCGRenderingIntentDefault));
+    RetainPtr<CGImageRef> image(AdoptCF, CGImageCreate(m_rect.width(), m_rect.height(), 8, 32, m_rect.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, provider.get(), 0, false, kCGRenderingIntentDefault));
     
     return image;
 }
diff --git a/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm b/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
index 87a9e79..ef10457 100644
--- a/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
+++ b/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
@@ -47,7 +47,7 @@ void ChunkedUpdateDrawingAreaProxy::ensureBackingStore()
         return;
 
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-    m_bitmapContext.adoptCF(CGBitmapContextCreate(0, m_viewSize.width(), m_viewSize.height(), 8, m_viewSize.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedLast));
+    m_bitmapContext.adoptCF(CGBitmapContextCreate(0, m_viewSize.width(), m_viewSize.height(), 8, m_viewSize.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
     
     // Flip the bitmap context coordinate system.
     CGContextTranslateCTM(m_bitmapContext.get(), 0, m_viewSize.height());
diff --git a/WebKit2/WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp b/WebKit2/WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp
index dec01bf..a59521a 100644
--- a/WebKit2/WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp
+++ b/WebKit2/WebProcess/WebPage/mac/ChunkedUpdateDrawingAreaMac.cpp
@@ -37,7 +37,7 @@ namespace WebKit {
 void ChunkedUpdateDrawingArea::paintIntoUpdateChunk(UpdateChunk* updateChunk)
 {
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-    RetainPtr<CGContextRef> bitmapContext(AdoptCF, CGBitmapContextCreate(updateChunk->data(), updateChunk->rect().width(), updateChunk->rect().height(), 8, updateChunk->rect().width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedLast));
+    RetainPtr<CGContextRef> bitmapContext(AdoptCF, CGBitmapContextCreate(updateChunk->data(), updateChunk->rect().width(), updateChunk->rect().height(), 8, updateChunk->rect().width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
 
     // WebCore expects a flipped coordinate system.
     CGContextTranslateCTM(bitmapContext.get(), 0.0, updateChunk->rect().height());

-- 
WebKit Debian packaging