Changeset 76077 in webkit

Timestamp:

Jan 18, 2011 3:40:46 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-01-18 Anders Carlsson <​andersca@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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/BackingStore.cpp (modified) (1 diff)
• UIProcess/BackingStore.h (modified) (2 diffs)
• UIProcess/DrawingAreaProxyImpl.cpp (modified) (1 diff)
• UIProcess/mac/BackingStoreMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-18  Anders Carlsson  <andersca@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@apple.com>
 

trunk/Source/WebKit2/UIProcess/BackingStore.cpp

@@ -34 +34 @@
 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());

trunk/Source/WebKit2/UIProcess/BackingStore.h

@@ -48 +48 @@
 
 public:
-    static PassOwnPtr<BackingStore> create(const WebCore::IntSize&);
+    static PassOwnPtr<BackingStore> create(const WebCore::IntSize&, WebPageProxy*);
     ~BackingStore();
 
@@ -59 +59 @@
 
 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

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

@@ -114 +114 @@
 
     if (!m_backingStore)
-        m_backingStore = BackingStore::create(updateInfo.viewSize);
+        m_backingStore = BackingStore::create(updateInfo.viewSize, m_webPageProxy);
 
     m_backingStore->incorporateUpdate(updateInfo);

trunk/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm

@@ -48 +48 @@
         
         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());