[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 6b22b7065d118e7498be3b61d60e290e6cc7bda9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 23:40:46 2011 +0000

    2011-01-18  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Pass the web page proxy to BackingStore::create
            https://bugs.webkit.org/show_bug.cgi?id=52673
    
            * UIProcess/BackingStore.cpp:
            (WebKit::BackingStore::create):
            Add WebPageProxy parameter.
    
            (WebKit::BackingStore::BackingStore):
            Add WebPageProxy parameter.
    
            * UIProcess/BackingStore.h:
            Add WebPageProxy member variable.
    
            * UIProcess/DrawingAreaProxyImpl.cpp:
            (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
            Pass the web page proxy when creating the backing store.
    
            * UIProcess/mac/BackingStoreMac.mm:
            (WebKit::BackingStore::backingStoreContext):
            Set the default blend mode.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76077 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 3d3bd87..4ba5f2a 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,30 @@
 2011-01-18  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Dan Bernstein.
+
+        Pass the web page proxy to BackingStore::create
+        https://bugs.webkit.org/show_bug.cgi?id=52673
+
+        * UIProcess/BackingStore.cpp:
+        (WebKit::BackingStore::create):
+        Add WebPageProxy parameter.
+    
+        (WebKit::BackingStore::BackingStore):
+        Add WebPageProxy parameter.
+
+        * UIProcess/BackingStore.h:
+        Add WebPageProxy member variable.
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
+        Pass the web page proxy when creating the backing store.
+
+        * UIProcess/mac/BackingStoreMac.mm:
+        (WebKit::BackingStore::backingStoreContext):
+        Set the default blend mode.
+
+2011-01-18  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Darin Adler.
 
         Factor code to create the backing store bitmap context out into a new function
diff --git a/Source/WebKit2/UIProcess/BackingStore.cpp b/Source/WebKit2/UIProcess/BackingStore.cpp
index 06d66af..765af0a 100644
--- a/Source/WebKit2/UIProcess/BackingStore.cpp
+++ b/Source/WebKit2/UIProcess/BackingStore.cpp
@@ -33,13 +33,14 @@ using namespace WebCore;
 
 namespace WebKit {
 
-PassOwnPtr<BackingStore> BackingStore::create(const IntSize& size)
+PassOwnPtr<BackingStore> BackingStore::create(const IntSize& size, WebPageProxy* webPageProxy)
 {
-    return adoptPtr(new BackingStore(size));
+    return adoptPtr(new BackingStore(size, webPageProxy));
 }
 
-BackingStore::BackingStore(const IntSize& size)
+BackingStore::BackingStore(const IntSize& size, WebPageProxy* webPageProxy)
     : m_size(size)
+    , m_webPageProxy(webPageProxy)
 {
     ASSERT(!m_size.isEmpty());
 }
diff --git a/Source/WebKit2/UIProcess/BackingStore.h b/Source/WebKit2/UIProcess/BackingStore.h
index de9152a..e4ee2a1 100644
--- a/Source/WebKit2/UIProcess/BackingStore.h
+++ b/Source/WebKit2/UIProcess/BackingStore.h
@@ -47,7 +47,7 @@ class BackingStore {
     WTF_MAKE_NONCOPYABLE(BackingStore);
 
 public:
-    static PassOwnPtr<BackingStore> create(const WebCore::IntSize&);
+    static PassOwnPtr<BackingStore> create(const WebCore::IntSize&, WebPageProxy*);
     ~BackingStore();
 
 #if PLATFORM(MAC)
@@ -58,15 +58,17 @@ public:
     void incorporateUpdate(const UpdateInfo&);
 
 private:
-    explicit BackingStore(const WebCore::IntSize&);
+    BackingStore(const WebCore::IntSize&, WebPageProxy*);
 
     void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
 
     WebCore::IntSize m_size;
+    WebPageProxy* m_webPageProxy;
 
 #if PLATFORM(MAC)
     CGContextRef backingStoreContext();
 
+    RetainPtr<CGLayerRef> m_cgLayer;
     RetainPtr<CGContextRef> m_bitmapContext;
 #endif
 };
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index d6c287e..d34bc0e 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -113,7 +113,7 @@ void DrawingAreaProxyImpl::incorporateUpdate(const UpdateInfo& updateInfo)
     // FIXME: Check for the update bounds being empty here.
 
     if (!m_backingStore)
-        m_backingStore = BackingStore::create(updateInfo.viewSize);
+        m_backingStore = BackingStore::create(updateInfo.viewSize, m_webPageProxy);
 
     m_backingStore->incorporateUpdate(updateInfo);
 
diff --git a/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm b/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
index db06e79..ffaefd7 100644
--- a/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
+++ b/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
@@ -47,7 +47,9 @@ CGContextRef BackingStore::backingStoreContext()
         RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
         
         m_bitmapContext.adoptCF(CGBitmapContextCreate(0, m_size.width(), m_size.height(), 8, m_size.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
-        
+
+        CGContextSetBlendMode(m_bitmapContext.get(), kCGBlendModeCopy);
+
         // We want the origin to be in the top left corner so flip the backing store context.
         CGContextTranslateCTM(m_bitmapContext.get(), 0, m_size.height());
         CGContextScaleCTM(m_bitmapContext.get(), 1, -1);

-- 
WebKit Debian packaging