Reviewed by John Sullivan.

aproskuryakov · aproskuryakov · commit 67ed3a29d909 · 2011-01-17T19:43:51.000Z
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. Canonical link: https://commits.webkit.org/66201@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75959 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-17  Alexey Proskuryakov  <ap@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@apple.com>
 
         Reviewed by Sam Weinig.
diff --git 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
@@ -1292,10 +1292,10 @@ - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFr
     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

Original file line number	Diff line number	Diff line change
`@@ -1292,10 +1292,10 @@ - (NSPrintOperation )printOperationWithPrintInfo:(NSPrintInfo )printInfo forFr`
`1292`	`1292`	`return [NSPrintOperation printOperationWithView:self printInfo:printInfo];`
`1293`	`1293`	`}`
`1294`	`1294`
`1295`		`-- (BOOL)canPrintHeadersAndFooters`
	`1295`	`+- (BOOL)canChangeFrameLayout:(WKFrameRef)frameRef`
`1296`	`1296`	`{`
`1297`	`1297`	`// PDF documents are already paginated, so we can't change them to add headers and footers.`
`1298`		`- return !_data->_pdfViewController;`
	`1298`	`+ return !toImpl(frameRef)->isMainFrame() \|\| _data->_pdfViewController;`
`1299`	`1299`	`}`
`1300`	`1300`
`1301`	`1301`	`@end`