Revert 103021 - PrintPreview: Printing preview of a PDF on Mac with Skia only previews the last p...

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"
 #include "base/metrics/histogram.h"
 #include "chrome/common/print_messages.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "printing/page_size_margins.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 #if defined(USE_SKIA)
 #include "printing/metafile_skia_wrapper.h"
-#include "skia/ext/platform_device.h"
 #include "skia/ext/vector_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
 #endif
 
 using WebKit::WebFrame;
 
 void PrintWebViewHelper::PrintPageInternal(
     const PrintMsg_PrintPage_Params& params,
     const gfx::Size& canvas_size,
     WebFrame* frame) {
   printing::NativeMetafile metafile;
   if (!metafile.Init())
     return;
 
   float scale_factor = frame->getPrintPageShrink(params.page_number);
   int page_number = params.page_number;
 
   // Render page for printing.
   gfx::Rect content_area(params.params.printable_size);
   RenderPage(params.params.printable_size, content_area, scale_factor,
-             page_number, frame, false, &metafile);
+             page_number, frame, &metafile);
   metafile.FinishDocument();
 
   PrintHostMsg_DidPrintPage_Params page_params;
   page_params.data_size = metafile.GetDataSize();
   page_params.page_number = page_number;
   page_params.document_cookie = params.params.document_cookie;
   page_params.actual_shrink = scale_factor;
   page_params.page_size = params.params.page_size;
   page_params.content_area = gfx::Rect(params.params.margin_left,
                                        params.params.margin_top,
@@ skipping 38 matching lines @@
       print_preview_context_.set_error(
           PREVIEW_ERROR_MAC_DRAFT_METAFILE_INIT_FAILED);
       LOG(ERROR) << "Draft PreviewMetafile Init failed";
       return false;
     }
     initial_render_metafile = draft_metafile.get();
   }
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
   RenderPage(printParams.page_size, content_area, scale_factor, page_number,
-             print_preview_context_.frame(), true, initial_render_metafile);
+             print_preview_context_.frame(), initial_render_metafile);
   print_preview_context_.RenderedPreviewPage(
       base::TimeTicks::Now() - begin_time);
 
   if (draft_metafile.get()) {
     draft_metafile->FinishDocument();
 #if !defined(USE_SKIA)
     if (!is_print_ready_metafile_sent_) {
       // With CG, we rendered into a new metafile so we could get it as a draft
       // document.  Now we need to add it to print ready document.  But the
       // document has already been scaled and adjusted for margins, so do a 1:1
@@ skipping 27 matching lines @@
           print_preview_context_.metafile()->GetMetafileForCurrentPage());
     }
 #endif
   }
   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,
-    bool is_preview, printing::Metafile* metafile) {
+    printing::Metafile* metafile) {
 
   {
 #if defined(USE_SKIA)
     SkDevice* device = metafile->StartPageForVectorCanvas(
         page_size, content_area, scale_factor);
     if (!device)
       return;
 
     SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
     canvas->unref();  // SkRefPtr and new both took a reference.
     WebKit::WebCanvas* canvas_ptr = canvas.get();
-    printing::MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
-    skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
-    skia::SetIsPreviewMetafile(*canvas, is_preview);
+    printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile);
+    printing::MetafileSkiaWrapper::SetDraftMode(canvas.get(),
+                                                is_print_ready_metafile_sent_);
 #else
     bool success = metafile->StartPage(page_size, content_area, scale_factor);
     DCHECK(success);
     // printPage can create autoreleased references to |context|. PDF contexts
     // don't write all their data until they are destroyed, so we need to make
     // certain that there are no lingering references.
     base::mac::ScopedNSAutoreleasePool pool;
     CGContextRef cgContext = metafile->context();
     CGContextRef canvas_ptr = cgContext;
 #endif
@@ skipping 26 matching lines @@
                            print_preview_context_.total_page_count(),
                            scale_factor, page_layout_in_points,
                            *header_footer_info_);
     }
 #endif  // defined(USE_SKIA)
   }
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   metafile->FinishPage();
 }