PrintPreview: Modified PrintingContextMac code to use the copy of sharedPrintInfo object.

printing/printing_context_mac.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/printing_context_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsexception_enabler.h"
 #include "base/sys_string_conversions.h"
 #include "base/values.h"
 #include "printing/print_settings_initializer_mac.h"
 
 static const CFStringRef kColorModel = CFSTR("ColorModel");
 static const CFStringRef kGrayColor = CFSTR("Gray");
 
 namespace printing {
 
 // static
 PrintingContext* PrintingContext::Create(const std::string& app_locale) {
   return static_cast<PrintingContext*>(new PrintingContextMac(app_locale));
 }
 
 PrintingContextMac::PrintingContextMac(const std::string& app_locale)
     : PrintingContext(app_locale),
+      print_info_([[NSPrintInfo sharedPrintInfo] copy]),
       context_(NULL) {
 }
 
 PrintingContextMac::~PrintingContextMac() {
   ReleaseContext();
 }
 
 void PrintingContextMac::AskUserForSettings(gfx::NativeView parent_view,
                                             int max_pages,
                                             bool has_selection,
@@ skipping 10 matching lines @@
   DCHECK([NSThread isMainThread]);
 
   // We deliberately don't feed max_pages into the dialog, because setting
   // NSPrintLastPage makes the print dialog pre-select the option to only print
   // a range.
 
   // TODO(stuartmorgan): implement 'print selection only' (probably requires
   // adding a new custom view to the panel on 10.5; 10.6 has
   // NSPrintPanelShowsPrintSelection).
   NSPrintPanel* panel = [NSPrintPanel printPanel];
-  NSPrintInfo* printInfo = [NSPrintInfo sharedPrintInfo];
+  NSPrintInfo* printInfo = print_info_.get();
 
   NSPrintPanelOptions options = [panel options];
   options |= NSPrintPanelShowsPaperSize;
   options |= NSPrintPanelShowsOrientation;
   options |= NSPrintPanelShowsScaling;
   [panel setOptions:options];
 
   // Set the print job title text.
   if (parent_view) {
     NSString* job_title = [[parent_view window] title];
     if (job_title) {
       PMPrintSettings printSettings =
           (PMPrintSettings)[printInfo PMPrintSettings];
       PMPrintSettingsSetJobName(printSettings, (CFStringRef)job_title);
       [printInfo updateFromPMPrintSettings];
     }
   }
 
   // TODO(stuartmorgan): We really want a tab sheet here, not a modal window.
   // Will require restructuring the PrintingContext API to use a callback.
   NSInteger selection = [panel runModalWithPrintInfo:printInfo];
   if (selection == NSOKButton) {
-    ParsePrintInfo([panel printInfo]);
+    ResetPrintInfo([panel printInfo]);
+    InitPrintSettingsFromPrintInfo(GetPageRangesFromPrintInfo());
     callback->Run(OK);
   } else {
     callback->Run(CANCEL);
   }
 }
 
 PrintingContext::Result PrintingContextMac::UseDefaultSettings() {
   DCHECK(!in_print_job_);
 
-  ParsePrintInfo([NSPrintInfo sharedPrintInfo]);
+  ResetPrintInfo([[NSPrintInfo sharedPrintInfo] copy]);

[stuartmorgan, 2011/06/02 21:07:20]

copy + retain = leak

[kmadhusu, 2011/06/02 23:07:00]

Fixed.

+  InitPrintSettingsFromPrintInfo(GetPageRangesFromPrintInfo());
 
   return OK;
 }
 
 PrintingContext::Result PrintingContextMac::UpdatePrintSettings(
     const DictionaryValue& job_settings, const PageRanges& ranges) {
   DCHECK(!in_print_job_);
 
-  ResetSettings();
-  print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
+  ResetPrintInfo([[NSPrintInfo sharedPrintInfo]copy]);

[stuartmorgan, 2011/06/02 21:07:20]

copy + retain = leak

Also, why was the space removed? It should be there.

[kmadhusu, 2011/06/02 23:07:00]

Fixed.
Fixed. 

 
   bool collate;
   bool color;
   bool landscape;
   bool print_to_pdf;
   int copies;
   int duplex_mode;
   std::string device_name;
 
   if (!job_settings.GetBoolean(kSettingLandscape, &landscape) ||
@@ skipping 129 matching lines @@
   PMPrintSettings pmPrintSettings =
       static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
   CFStringRef output_color = color ? NULL : kGrayColor;
 
   return PMPrintSettingsSetValue(pmPrintSettings,
                                  kColorModel,
                                  output_color,
                                  false) == noErr;
 }
 
-void PrintingContextMac::ParsePrintInfo(NSPrintInfo* print_info) {
+void PrintingContextMac::ResetPrintInfo(NSPrintInfo* print_info) {
   ResetSettings();

[stuartmorgan, 2011/06/02 21:07:20]

I just looked at ResetSettings(), and it doesn't do at all what I expected. This
shouldn't be called in any of the normal flow; compare with
printing_context_win.

So this whole function can be removed.

[kmadhusu, 2011/06/02 23:07:00]

Done.

   print_info_.reset([print_info retain]);
+}
+
+PageRanges PrintingContextMac::GetPageRangesFromPrintInfo() {
   PageRanges page_ranges;
   NSDictionary* print_info_dict = [print_info_.get() dictionary];
   if (![[print_info_dict objectForKey:NSPrintAllPages] boolValue]) {
     PageRange range;
     range.from = [[print_info_dict objectForKey:NSPrintFirstPage] intValue] - 1;
     range.to = [[print_info_dict objectForKey:NSPrintLastPage] intValue] - 1;
     page_ranges.push_back(range);
   }
-  InitPrintSettingsFromPrintInfo(page_ranges);
+  return page_ranges;
 }
 
 PrintingContext::Result PrintingContextMac::InitWithSettings(
     const PrintSettings& settings) {
   DCHECK(!in_print_job_);
 
   settings_ = settings;
 
   NOTIMPLEMENTED();
 
@@ skipping 91 matching lines @@
 void PrintingContextMac::ReleaseContext() {
   print_info_.reset();
   context_ = NULL;
 }
 
 gfx::NativeDrawingContext PrintingContextMac::context() const {
   return context_;
 }
 
 }  // namespace printing