Changeset 115266 in webkit

Timestamp:

Apr 25, 2012 5:46:26 PM (12 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=84909
Background tabs are fuzzy until repaint when deviceScaleFactor > 1
-and corresponding-
<rdar://problem/11312064>

Reviewed by Darin Adler.

BackingStoreMac paints into a Bitmap instead of a CGLayer when there is no
containing window. That bitmap is used for the initial paint when a background tab
first comes to he foreground, so it needs to be HiDPI-aware.

paintBitmapContext() now takes a scale factor that it passes along to paintImage
rather than hardcoding a scale factor of 1 for paintImage.

• Platform/cg/CGUtilities.cpp:

(WebKit::paintBitmapContext):

• Platform/cg/CGUtilities.h:

(WebKit):

When these functions fall into the bitmap case, they need to adopt the device
scale factor, which means they need to scale in size by the scale factor, and also
scale their context.

• UIProcess/mac/BackingStoreMac.mm:

(WebKit::BackingStore::resetScrolledRect):
(WebKit::BackingStore::paint):
(WebKit::BackingStore::backingStoreContext):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/cg/CGUtilities.cpp (modified) (1 diff)
• Platform/cg/CGUtilities.h (modified) (1 diff)
• UIProcess/mac/BackingStoreMac.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-04-25  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=84909
+        Background tabs are fuzzy until repaint when deviceScaleFactor > 1
+        -and corresponding-
+        <rdar://problem/11312064>
+
+        Reviewed by Darin Adler.
+
+        BackingStoreMac paints into a Bitmap instead of a CGLayer when there is no 
+        containing window. That bitmap is used for the initial paint when a background tab 
+        first comes to he foreground, so it needs to be HiDPI-aware.  
+
+        paintBitmapContext() now takes a scale factor that it passes along to paintImage 
+        rather than hardcoding a scale factor of 1 for paintImage.
+        * Platform/cg/CGUtilities.cpp:
+        (WebKit::paintBitmapContext):
+        * Platform/cg/CGUtilities.h:
+        (WebKit):
+
+        When these functions fall into the bitmap case, they need to adopt the device 
+        scale factor, which means they need to scale in size by the scale factor, and also 
+        scale their context. 
+        * UIProcess/mac/BackingStoreMac.mm:
+        (WebKit::BackingStore::resetScrolledRect):
+        (WebKit::BackingStore::paint):
+        (WebKit::BackingStore::backingStoreContext):
+
 2012-04-25  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/Platform/cg/CGUtilities.cpp

@@ -49 +49 @@
 }
 
-void paintBitmapContext(CGContextRef context, CGContextRef bitmapContext, CGPoint destination, CGRect source)
+void paintBitmapContext(CGContextRef context, CGContextRef bitmapContext, CGPoint destination, CGRect source, CGFloat scaleFactor)
 {
     RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(bitmapContext));
-    paintImage(context, image.get(), 1, destination, source);
+    paintImage(context, image.get(), scaleFactor, destination, source);
 }
 

trunk/Source/WebKit2/Platform/cg/CGUtilities.h

@@ -30 +30 @@
 
 void paintImage(CGContextRef, CGImageRef, CGFloat scaleFactor, CGPoint destination, CGRect source);
-void paintBitmapContext(CGContextRef, CGContextRef bitmapContext, CGPoint destination, CGRect source);
+void paintBitmapContext(CGContextRef, CGContextRef bitmapContext, CGPoint destination, CGRect source, CGFloat scaleFactor);
 
 } // namespace WebKit

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

@@ -98 +98 @@
     }
 
+    IntSize scaledSize = m_scrolledRect.size();
+    scaledSize.scale(m_deviceScaleFactor);
+
     RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-    RetainPtr<CGContextRef> context(AdoptCF, CGBitmapContextCreate(0, m_scrolledRect.size().width(), m_scrolledRect.size().height(), 8, m_scrolledRect.size().width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
+    RetainPtr<CGContextRef> context(AdoptCF, CGBitmapContextCreate(0, scaledSize.width(), scaledSize.height(), 8, scaledSize.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
+
+    CGContextScaleCTM(context.get(), m_deviceScaleFactor, m_deviceScaleFactor);
 
     CGContextTranslateCTM(context.get(), -m_scrolledRect.location().x(), -m_scrolledRect.location().y());
@@ -107 +112 @@
 
     IntRect sourceRect(IntPoint(), m_scrolledRect.size());
-    paintBitmapContext(backingStoreContext(), context.get(), m_scrolledRect.location(), sourceRect);
+    paintBitmapContext(backingStoreContext(), context.get(), m_scrolledRect.location(), sourceRect, m_deviceScaleFactor);
 
     m_scrolledRect = IntRect();
@@ -133 +138 @@
         source.origin.x += offset.width();
         source.origin.y += offset.height();
-        paintBitmapContext(context, m_bitmapContext.get(), part.location(), source);
+        paintBitmapContext(context, m_bitmapContext.get(), part.location(), source, m_deviceScaleFactor);
     });
 }
@@ -155 +160 @@
         if (m_bitmapContext) {
             // Paint the contents of the bitmap into the layer context.
-            paintBitmapContext(layerContext, m_bitmapContext.get(), CGPointZero, CGRectMake(0, 0, m_size.width(), m_size.height()));
+            paintBitmapContext(layerContext, m_bitmapContext.get(), CGPointZero, CGRectMake(0, 0, m_size.width(), m_size.height()), m_deviceScaleFactor);
             m_bitmapContext = nullptr;
         }
@@ -164 +169 @@
     if (!m_bitmapContext) {
         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));
+
+        IntSize scaledSize(m_size);
+        scaledSize.scale(m_deviceScaleFactor);
+        m_bitmapContext.adoptCF(CGBitmapContextCreate(0, scaledSize.width(), scaledSize.height(), 8, scaledSize.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
 
         CGContextSetBlendMode(m_bitmapContext.get(), kCGBlendModeCopy);
+
+        CGContextScaleCTM(m_bitmapContext.get(), m_deviceScaleFactor, m_deviceScaleFactor);
 
         // We want the origin to be in the top left corner so flip the backing store context.