Merge 97702, 97820, 97976

chrome/renderer/print_web_view_helper_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 "chrome/renderer/print_web_view_helper.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 41 matching lines @@
 
   // Ask the browser to create the shared memory for us.
   if (!CopyMetafileDataToSharedMem(&metafile,
                                    &(page_params.metafile_data_handle))) {
     page_params.data_size = 0;
   }
 
   Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
 }
 
-void PrintWebViewHelper::RenderPreviewPage(int page_number) {
+bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
   float scale_factor = print_preview_context_.frame()->getPrintPageShrink(0);
   PrintMsg_Print_Params printParams = print_preview_context_.print_params();
   gfx::Rect content_area(printParams.margin_left, printParams.margin_top,
                          printParams.printable_size.width(),
                          printParams.printable_size.height());
 
   printing::Metafile* initial_render_metafile =
       print_preview_context_.metafile();
   scoped_ptr<printing::PreviewMetafile> draft_metafile;
 #if !defined(USE_SKIA)
   if (print_preview_context_.IsModifiable()) {
     draft_metafile.reset(new printing::PreviewMetafile);
     if (!draft_metafile->Init()) {
-      DidFinishPrinting(FAIL_PREVIEW);
-      return;
+      return false;
     }
     initial_render_metafile = draft_metafile.get();
   }
 #endif
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
   RenderPage(printParams.page_size, content_area, scale_factor, page_number,
              print_preview_context_.frame(), initial_render_metafile);
   print_preview_context_.RenderedPreviewPage(
       base::TimeTicks::Now() - begin_time);
@@ skipping 23 matching lines @@
                                complete_metafile->context(),
                                draft_metafile->GetPageBounds(1).ToCGRect(),
                                false /* shrink_to_fit */,
                                false /* stretch_to_fit */,
                                true  /* center_horizontally */,
                                true  /* center_vertically */);
     complete_metafile->FinishPage();
 #endif
   }
 
-  PreviewPageRendered(page_number, draft_metafile.get());
+  return PreviewPageRendered(page_number, draft_metafile.get());
 }
 
 void PrintWebViewHelper::RenderPage(
     const gfx::Size& page_size, const gfx::Rect& content_area,
     const float& scale_factor, int page_number, WebFrame* frame,
     printing::Metafile* metafile) {
 
   {
 #if defined(USE_SKIA)
     SkDevice* device = metafile->StartPageForVectorCanvas(
@@ skipping 14 matching lines @@
     base::mac::ScopedNSAutoreleasePool pool;
     CGContextRef cgContext = metafile->context();
     CGContextRef canvasPtr = cgContext;
 #endif
     frame->printPage(page_number, canvasPtr);
   }
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   metafile->FinishPage();
 }