[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 1487c1e08c0dc1a827335e2c83ef64aa2df49acc
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 19:43:51 2011 +0000

            Reviewed by John Sullivan.
    
            https://bugs.webkit.org/show_bug.cgi?id=52590
            Should pass a frame into -[WKView canPrintHeadersAndFooters]
    
            * UIProcess/API/mac/WKView.h:
            * UIProcess/API/mac/WKView.mm: (-[WKView canChangeFrameLayout:]): Also, renamed the method
            to canChangeFrameLayout.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75959 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index db9a854..4df9261 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-17  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by John Sullivan.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52590
+        Should pass a frame into -[WKView canPrintHeadersAndFooters]
+
+        * UIProcess/API/mac/WKView.h:
+        * UIProcess/API/mac/WKView.mm: (-[WKView canChangeFrameLayout:]): Also, renamed the method
+        to canChangeFrameLayout.
+
 2011-01-17  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.h b/Source/WebKit2/UIProcess/API/mac/WKView.h
index a63f757..618bbc4 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.h
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.h
@@ -37,7 +37,7 @@ WK_EXPORT
 - (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef;
 
 - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef;
-- (BOOL)canPrintHeadersAndFooters;
+- (BOOL)canChangeFrameLayout:(WKFrameRef)frameRef;
 
 @property(readonly) WKPageRef pageRef;
 
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index 37830dd..cb362a8 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -1292,10 +1292,10 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
     return [NSPrintOperation printOperationWithView:self printInfo:printInfo];
 }
 
-- (BOOL)canPrintHeadersAndFooters
+- (BOOL)canChangeFrameLayout:(WKFrameRef)frameRef
 {
     // PDF documents are already paginated, so we can't change them to add headers and footers.
-    return !_data->_pdfViewController;
+    return !toImpl(frameRef)->isMainFrame() || _data->_pdfViewController;
 }
 
 @end

-- 
WebKit Debian packaging