[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 4beeebf5e7622ec736734d8fce0db4805580498f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 19:56:38 2011 +0000

    2011-01-22  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Transparent windows with compositing WebKit2 content show garbage
            https://bugs.webkit.org/show_bug.cgi?id=52966
            <rdar://problem/8765051>
    
            * UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm:
            (WebKit::LayerBackedDrawingAreaProxy::paint):
            If the WKView should draw transparent background, do so.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76453 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 79eb450..d0f7682 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Sam Weinig.
 
+        Transparent windows with compositing WebKit2 content show garbage
+        https://bugs.webkit.org/show_bug.cgi?id=52966
+        <rdar://problem/8765051>
+
+        * UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm:
+        (WebKit::LayerBackedDrawingAreaProxy::paint):
+        If the WKView should draw transparent background, do so.
+
+2011-01-22  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Add an asynchronous WKPageForceRepaint
         https://bugs.webkit.org/show_bug.cgi?id=52964
         <rdar://problem/8898527>
diff --git a/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp b/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
index ffa91de..9ed7844 100644
--- a/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
+++ b/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
@@ -55,7 +55,7 @@ LayerBackedDrawingAreaProxy::~LayerBackedDrawingAreaProxy()
 {
 }
 
-#if !PLATFORM(WIN)
+#if !PLATFORM(WIN) && !PLATFORM(MAC)
 bool LayerBackedDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
 {
     return true;
diff --git a/Source/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm b/Source/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
index 8159f96..8436fec 100644
--- a/Source/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
+++ b/Source/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
@@ -89,4 +89,19 @@ void LayerBackedDrawingAreaProxy::detachCompositingContext()
     m_compositingRootLayer = 0;
 }
 
+bool LayerBackedDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
+{
+    WebPageProxy* webPageProxy = page();
+    if (webPageProxy->drawsBackground() && webPageProxy->drawsTransparentBackground()) {
+        CGContextSaveGState(context);
+        CGContextSetBlendMode(context, kCGBlendModeCopy);
+        CGContextSetFillColorWithColor(context, CGColorGetConstantColor(kCGColorClear));
+        CGContextFillRect(context, rect);
+        
+        CGContextRestoreGState(context);
+    }
+
+    return true;
+}
+    
 } // namespace WebKit

-- 
WebKit Debian packaging