Merge 167311 - Print headers and footers with WebKit.

chrome/renderer/print_web_view_helper_win.cc

 // Copyright (c) 2012 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"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
@@ skipping 151 matching lines @@
     // we make sure the canvas covers the worst case scenario (x2.0 currently).
     // PrintContext will then set the correct clipping region.
     page_size = gfx::Size(
         static_cast<int>(page_layout_in_points.content_width *
                          params.max_shrink),
         static_cast<int>(page_layout_in_points.content_height *
                          params.max_shrink));
   }
 
   float webkit_page_shrink_factor = frame->getPrintPageShrink(page_number);
+  float scale_factor = css_scale_factor * webkit_page_shrink_factor;
+
+  gfx::Rect canvas_area =
+      params.display_header_footer ? gfx::Rect(page_size) : content_area;
+
   SkDevice* device = metafile->StartPageForVectorCanvas(
-      page_size, content_area, css_scale_factor * webkit_page_shrink_factor);
+      page_size, canvas_area, scale_factor);
   DCHECK(device);
   // The printPage method may take a reference to the canvas we pass down, so it
   // can't be a stack object.
   SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
   canvas->unref();  // SkRefPtr and new both took a reference.
+
   if (is_preview) {
     printing::MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
     skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
     skia::SetIsPreviewMetafile(*canvas, is_preview);
   }
 
-  float webkit_scale_factor = frame->printPage(page_number, canvas.get());
-
   if (params.display_header_footer) {
     // |page_number| is 0-based, so 1 is added.
     PrintHeaderAndFooter(canvas.get(), page_number + 1,
-                         print_preview_context_.total_page_count(),
-                         css_scale_factor * webkit_page_shrink_factor,
-                         page_layout_in_points, *header_footer_info_, params);
+        print_preview_context_.total_page_count(), scale_factor,
+        page_layout_in_points, *header_footer_info_, params);
   }
 
+  float webkit_scale_factor = RenderPageContent(frame, page_number, canvas_area,
+                                                content_area, scale_factor,
+                                                canvas.get());
+
   if (*actual_shrink <= 0 || webkit_scale_factor <= 0) {
     NOTREACHED() << "Printing page " << page_number << " failed.";
   } else {
     // While rendering certain plugins (PDF) to metafile, we might need to
     // set custom scale factor. Update |actual_shrink| with custom scale
     // if it is set on canvas.
     // TODO(gene): We should revisit this solution for the next versions.
     // Consider creating metafile of the right size (or resizable)
     // https://code.google.com/p/chromium/issues/detail?id=126037
     if (!printing::MetafileSkiaWrapper::GetCustomScaleOnCanvas(
@@ skipping 29 matching lines @@
     shared_buf.Unmap();
     return false;
   }
   shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle);
   shared_buf.Unmap();
 
   Send(new PrintHostMsg_DuplicateSection(routing_id(), *shared_mem_handle,
                                          shared_mem_handle));
   return true;
 }