WKView -printOperationWithPrintInfo:forFrame: doesn’t use the print info that is
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2013 00:09:55 +0000 (00:09 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2013 00:09:55 +0000 (00:09 +0000)
passed in
https://bugs.webkit.org/show_bug.cgi?id=112212
-and corresponding-
<rdar://problem/12994883>

Reviewed by Anders Carlsson.

We should call [NSPrintOperation printOperationWithView: printInfo:] to use the
printInfo parameter instead of [NSPrintOperation printOperationWithView:] which
will just use the sharedPrintInfo.
* UIProcess/API/mac/WKView.mm:
(-[WKView printOperationWithPrintInfo:forFrame:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/mac/WKView.mm

index c4f1f99..43eb263 100644 (file)
@@ -1,3 +1,19 @@
+2013-03-12  Beth Dakin  <bdakin@apple.com>
+
+        WKView -printOperationWithPrintInfo:forFrame: doesn’t use the print info that is 
+        passed in
+        https://bugs.webkit.org/show_bug.cgi?id=112212
+        -and corresponding-
+        <rdar://problem/12994883>
+
+        Reviewed by Anders Carlsson.
+
+        We should call [NSPrintOperation printOperationWithView: printInfo:] to use the 
+        printInfo parameter instead of [NSPrintOperation printOperationWithView:] which 
+        will just use the sharedPrintInfo.
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView printOperationWithPrintInfo:forFrame:]):
+
 2013-03-12  Geoffrey Garen  <ggaren@apple.com>
 
         Moved RunLoopTimer and SchedulePair to WTF
index dcaffff..fac936d 100644 (file)
@@ -3207,7 +3207,7 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
         // printing), this function should return nil.
         RetainPtr<WKPrintingView> printingView(AdoptNS, [[WKPrintingView alloc] initWithFrameProxy:toImpl(frameRef) view:self]);
         // NSPrintOperation takes ownership of the view.
-        NSPrintOperation *printOperation = [NSPrintOperation printOperationWithView:printingView.get()];
+        NSPrintOperation *printOperation = [NSPrintOperation printOperationWithView:printingView.get() printInfo:printInfo];
         [printOperation setCanSpawnSeparateThread:YES];
         [printOperation setJobTitle:toImpl(frameRef)->title()];
         printingView->_printOperation = printOperation;