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

[ap at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 2b8a3fe943eabc37421849d80e68c647cd7a8419
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 22:30:11 2011 +0000

            Reviewed by Dan Bernstein and Darin Adler.
    
            <rdar://problem/8830594> Printed page is sometimes shifted down, making footer invisible
    
            * UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView locationOfPrintRect:]): Instead of
            letting AppKit compute content position on page, make the view provide it. We can do this
            because WK(Printing)Views are always printed on their own, not as part of other views.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f5f7976..f73fbdd 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Dan Bernstein and Darin Adler.
+
+        <rdar://problem/8830594> Printed page is sometimes shifted down, making footer invisible
+
+        * UIProcess/API/mac/WKPrintingView.mm: (-[WKPrintingView locationOfPrintRect:]): Instead of
+        letting AppKit compute content position on page, make the view provide it. We can do this
+        because WK(Printing)Views are always printed on their own, not as part of other views.
+
 2011-02-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm b/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm
index 9ca5bf1..0dbe7cb 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm
@@ -498,6 +498,13 @@ static void prepareDataForPrintingOnSecondaryThread(void* untypedContext)
     return rect;
 }
 
+// Temporary workaround for <rdar://problem/8944535>. Force correct printout positioning.
+- (NSPoint)locationOfPrintRect:(NSRect)aRect
+{
+    ASSERT(_printOperation == [NSPrintOperation currentOperation]);
+    return NSMakePoint([[_printOperation printInfo] leftMargin], [[_printOperation printInfo] bottomMargin]);
+}
+
 - (void)endDocument
 {
     ASSERT(_printOperation == [NSPrintOperation currentOperation]);

-- 
WebKit Debian packaging