Changeset 76072 in webkit

Timestamp:

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

Author:

andersca@apple.com

Message:

2011-01-18 Anders Carlsson <​andersca@apple.com>

Reviewed by Darin Adler.

Factor code to create the backing store bitmap context out into a new function
​https://bugs.webkit.org/show_bug.cgi?id=52670

• UIProcess/BackingStore.h:
• UIProcess/mac/BackingStoreMac.mm: (WebKit::BackingStore::backingStoreContext): Create the backing store context.

(WebKit::BackingStore::incorporateUpdate):
Call backingStoreContext.

(WebKit::BackingStore::scroll):
Assert that the context is not null.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Factor code to create the backing store bitmap context out into a new function
+        https://bugs.webkit.org/show_bug.cgi?id=52670
+
+        * UIProcess/BackingStore.h:
+        * UIProcess/mac/BackingStoreMac.mm:
+        (WebKit::BackingStore::backingStoreContext):
+        Create the backing store context.
+
+        (WebKit::BackingStore::incorporateUpdate):
+        Call backingStoreContext.
+
+        (WebKit::BackingStore::scroll):
+        Assert that the context is not null.
+
 2011-01-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/BackingStore.h

@@ -66 +66 @@
 
 #if PLATFORM(MAC)
+    CGContextRef backingStoreContext();
+
     RetainPtr<CGContextRef> m_bitmapContext;
 #endif

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

@@ -42 +42 @@
 }
 
-void BackingStore::incorporateUpdate(const UpdateInfo& updateInfo)
+CGContextRef BackingStore::backingStoreContext()
 {
-    ASSERT(m_size == updateInfo.viewSize);
-
-    RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(updateInfo.updateRectBounds.size(), updateInfo.bitmapHandle);
-    if (!bitmap)
-        return;
-
     if (!m_bitmapContext) {
         RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
@@ -60 +54 @@
     }
 
+    return m_bitmapContext.get();
+}
+
+void BackingStore::incorporateUpdate(const UpdateInfo& updateInfo)
+{
+    ASSERT(m_size == updateInfo.viewSize);
+
+    RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(updateInfo.updateRectBounds.size(), updateInfo.bitmapHandle);
+    if (!bitmap)
+        return;
+
+    CGContextRef context = backingStoreContext();
+
     scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
 
     IntPoint updateRectLocation = updateInfo.updateRectBounds.location();
 
-    GraphicsContext graphicsContext(m_bitmapContext.get());
+    GraphicsContext graphicsContext(context);
 
     // Paint all update rects.
@@ -81 +88 @@
         return;
 
+    ASSERT(m_bitmapContext);
+
     CGContextSaveGState(m_bitmapContext.get());