Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6558)

Unified Diff: chrome/renderer/printing/print_web_view_helper_mac.mm

Issue 559263002: Replaced Metafile with PdfMetafileSkia in renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Thu Sep 11 15:46:31 PDT 2014 Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/printing/print_web_view_helper_mac.mm
diff --git a/chrome/renderer/printing/print_web_view_helper_mac.mm b/chrome/renderer/printing/print_web_view_helper_mac.mm
index 219a4fabe7c988145be760fa5562aea720810eaf..c5e6b9fca9018fba2ca46d7693f2033cb703aabe 100644
--- a/chrome/renderer/printing/print_web_view_helper_mac.mm
+++ b/chrome/renderer/printing/print_web_view_helper_mac.mm
@@ -10,7 +10,6 @@
#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_skia_wrapper.h"
#include "printing/page_size_margins.h"
#include "skia/ext/platform_device.h"
@@ -57,8 +56,8 @@ bool PrintWebViewHelper::RenderPreviewPage(
int page_number,
const PrintMsg_Print_Params& print_params) {
PrintMsg_Print_Params printParams = print_params;
- scoped_ptr<Metafile> draft_metafile;
- Metafile* initial_render_metafile = print_preview_context_.metafile();
+ scoped_ptr<PdfMetafileSkia> draft_metafile;
+ PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
bool render_to_draft = print_preview_context_.IsModifiable() &&
is_print_ready_metafile_sent_;
@@ -94,10 +93,13 @@ bool PrintWebViewHelper::RenderPreviewPage(
return PreviewPageRendered(page_number, draft_metafile.get());
}
-void PrintWebViewHelper::RenderPage(
- const PrintMsg_Print_Params& params, int page_number, WebFrame* frame,
- bool is_preview, Metafile* metafile, gfx::Size* page_size,
- gfx::Rect* content_rect) {
+void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
+ int page_number,
+ WebFrame* frame,
+ bool is_preview,
+ PdfMetafileSkia* metafile,
+ gfx::Size* page_size,
+ gfx::Rect* content_rect) {
double scale_factor = 1.0f;
double webkit_shrink_factor = frame->getPrintPageShrink(page_number);
PageSizeMargins page_layout_in_points;
« no previous file with comments | « chrome/renderer/printing/print_web_view_helper_linux.cc ('k') | chrome/renderer/printing/print_web_view_helper_pdf_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698