Changeset 73275 in webkit

Timestamp:

Dec 3, 2010 11:11:49 AM (13 years ago)

Author:

andersca@apple.com

Message:

The chunked update drawing area is flipped twice when drawing
​https://bugs.webkit.org/show_bug.cgi?id=50465
<rdar://problem/8726836>

Reviewed by Dan Bernstein.

• UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:

(WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
(WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
Flip the destination contexts, thus unflipping them. (Turns out two wrongs make a right here).

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        The chunked update drawing area is flipped twice when drawing
+        https://bugs.webkit.org/show_bug.cgi?id=50465
+        <rdar://problem/8726836>
+
+        * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
+        Flip the destination contexts, thus unflipping them. (Turns out two wrongs make a right here).
+
 2010-12-03  Jessie Berlin  <jberlin@apple.com>
 

trunk/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm

@@ -66 +66 @@
         return;
 
+    CGContextSaveGState(context);
+
+    // Flip the destination.
+    CGContextScaleCTM(context, 1, -1);
+    CGContextTranslateCTM(context, 0, -m_size.height());
+
     RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(m_bitmapContext.get()));
     CGContextDrawImage(context, CGRectMake(0, 0, CGImageGetWidth(image.get()), CGImageGetHeight(image.get())), image.get());
+
+    CGContextRestoreGState(context);
 }
 
@@ -75 +83 @@
 
     RetainPtr<CGImageRef> image(updateChunk->createImage());
-    const IntRect& updateChunkRect = updateChunk->rect();
+    IntRect updateChunkRect = updateChunk->rect();
 
-    CGContextDrawImage(m_bitmapContext.get(), CGRectMake(updateChunkRect.x(), size().height() - updateChunkRect.bottom(), 
-                                                         updateChunkRect.width(), updateChunkRect.height()), image.get());
+    // Flip the destination.
+    CGContextSaveGState(m_bitmapContext.get());
+    CGContextScaleCTM(m_bitmapContext.get(), 1, -1);
+    CGContextTranslateCTM(m_bitmapContext.get(), 0, -(updateChunkRect.y() + updateChunkRect.bottom()));
+
+    CGContextDrawImage(m_bitmapContext.get(), updateChunkRect, image.get());
+    CGContextRestoreGState(m_bitmapContext.get());
+
     [m_webView setNeedsDisplayInRect:NSRectFromCGRect(updateChunkRect)];
 }