[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

andersca at apple.com andersca at apple.com
Sun Feb 20 23:11:37 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 8cb1692bcccde3349ebb9d04255dd89669628e6d
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 21:28:40 2011 +0000

    2011-01-18  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Get and paint each individual rect in -[WKView drawRect:]
            https://bugs.webkit.org/show_bug.cgi?id=52660
    
            * UIProcess/API/mac/WKView.mm:
            (-[WKView drawRect:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 6907c12..aec4425 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-18  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        Get and paint each individual rect in -[WKView drawRect:]
+        https://bugs.webkit.org/show_bug.cgi?id=52660
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView drawRect:]):
+
+2011-01-18  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Darin Adler.
 
         Assertion when loading two URLs in quick succession
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index da9b7c9..a781d64 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -1234,7 +1234,14 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
     if (useNewDrawingArea()) {
         if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(_data->_page->drawingArea())) {
             CGContextRef context = static_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
-            drawingArea->paint(context, enclosingIntRect(rect));
+
+            const NSRect *rectsBeingDrawn;
+            NSInteger numRectsBeingDrawn;
+            [self getRectsBeingDrawn:&rectsBeingDrawn count:&numRectsBeingDrawn];
+            for (NSInteger i = 0; i < numRectsBeingDrawn; ++i) {
+                IntRect rect = enclosingIntRect(rectsBeingDrawn[i]);
+                drawingArea->paint(context, rect);
+            }
         } else if (_data->_page->drawsBackground()) {
             [_data->_page->drawsTransparentBackground() ? [NSColor clearColor] : [NSColor whiteColor] set];
             NSRectFill(rect);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list