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

ap at apple.com ap at apple.com
Sun Feb 20 23:37:18 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 1260e1d1280da5ea7401f03cda16f6c166ef025b
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 08:22:00 2011 +0000

    2011-01-22  Alexey Proskuryakov  <ap at apple.com>
    
            Reviewed by Dan Bernstein.
    
            https://bugs.webkit.org/show_bug.cgi?id=52951
            WebKit2 generates a bad PDF for cross process messaging
    
            * page/PrintContext.cpp: (WebCore::PrintContext::spoolRect): Use a correct offset to actually
            draw inside the requested rectangle.
    2011-01-22  Alexey Proskuryakov  <ap at apple.com>
    
            Reviewed by Dan Bernstein.
    
            https://bugs.webkit.org/show_bug.cgi?id=52951
            WebKit2 generates a bad PDF for cross process messaging
    
            * UIProcess/API/mac/WKView.mm:
            (-[WKView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
            Use a correct offset when flipping.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c9a6896..4c7673e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-22  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52951
+        WebKit2 generates a bad PDF for cross process messaging
+
+        * page/PrintContext.cpp: (WebCore::PrintContext::spoolRect): Use a correct offset to actually
+        draw inside the requested rectangle.
+
 2011-01-21  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/Source/WebCore/page/PrintContext.cpp b/Source/WebCore/page/PrintContext.cpp
index e82420d..16fd379 100644
--- a/Source/WebCore/page/PrintContext.cpp
+++ b/Source/WebCore/page/PrintContext.cpp
@@ -166,7 +166,7 @@ void PrintContext::spoolRect(GraphicsContext& ctx, const IntRect& rect)
 {
     ctx.save();
     ctx.scale(FloatSize(1, -1));
-    ctx.translate(0, -rect.height());
+    ctx.translate(0, -m_frame->view()->contentsHeight());
     ctx.clip(rect);
     m_frame->view()->paintContents(&ctx, rect);
     ctx.restore();
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index fe2e6cf..1f016a5 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-22  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52951
+        WebKit2 generates a bad PDF for cross process messaging
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
+        Use a correct offset when flipping.
+
 2011-01-21  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index 400239d..1f83ac7 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -1497,7 +1497,7 @@ static float currentPrintOperationScale()
     CGContextSaveGState(context);
     // Flip the destination.
     CGContextScaleCTM(context, 1, -1);
-    CGContextTranslateCTM(context, 0, -rect.size.height);
+    CGContextTranslateCTM(context, 0, -CGPDFPageGetBoxRect(pdfPage, kCGPDFMediaBox).size.height);
     CGContextDrawPDFPage(context, pdfPage);
     CGContextRestoreGState(context);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list