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

Unified Diff: chrome/renderer/print_web_view_helper_mac.mm

Issue 7747033: Merge 97702, 97820, 97976 (Closed) Base URL: svn://chrome-svn/chrome/branches/835/src/
Patch Set: Created 9 years, 4 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
« no previous file with comments | « chrome/renderer/print_web_view_helper_linux.cc ('k') | chrome/renderer/print_web_view_helper_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/print_web_view_helper_mac.mm
===================================================================
--- chrome/renderer/print_web_view_helper_mac.mm (revision 98330)
+++ chrome/renderer/print_web_view_helper_mac.mm (working copy)
@@ -59,7 +59,7 @@
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,
@@ -73,8 +73,7 @@
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();
}
@@ -118,7 +117,7 @@
#endif
}
- PreviewPageRendered(page_number, draft_metafile.get());
+ return PreviewPageRendered(page_number, draft_metafile.get());
}
void PrintWebViewHelper::RenderPage(
« no previous file with comments | « chrome/renderer/print_web_view_helper_linux.cc ('k') | chrome/renderer/print_web_view_helper_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698