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

Unified Diff: chrome/renderer/printing/print_web_view_helper.cc

Issue 581163002: Removed unused argument and GetPrintCanvasSize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_rot
Patch Set: Thu 09/18/2014 11:42:21.91 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.cc
diff --git a/chrome/renderer/printing/print_web_view_helper.cc b/chrome/renderer/printing/print_web_view_helper.cc
index 2fb7b0823fe0d7d0264e06ae4cca89c295de8a0e..53a66ee29263edee54837201297c2b99c9ba9d9c 100644
--- a/chrome/renderer/printing/print_web_view_helper.cc
+++ b/chrome/renderer/printing/print_web_view_helper.cc
@@ -561,8 +561,6 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
return expected_pages_count_;
}
- gfx::Size GetPrintCanvasSize() const;
-
void FinishPrinting();
bool IsLoadingSelection() {
@@ -742,12 +740,6 @@ void PrepareFrameAndViewForPrint::CallOnReady() {
return on_ready_.Run(); // Can delete |this|.
}
-gfx::Size PrepareFrameAndViewForPrint::GetPrintCanvasSize() const {
- DCHECK(is_printing_started_);
- return gfx::Size(web_print_params_.printContentArea.width,
- web_print_params_.printContentArea.height);
-}
-
void PrepareFrameAndViewForPrint::RestoreSize() {
if (frame()) {
blink::WebView* web_view = frame_.GetFrame()->view();
@@ -1357,8 +1349,7 @@ void PrintWebViewHelper::PrintPages() {
}
- if (!PrintPagesNative(prep_frame_view_->frame(), page_count,
- prep_frame_view_->GetPrintCanvasSize())) {
+ if (!PrintPagesNative(prep_frame_view_->frame(), page_count)) {
LOG(ERROR) << "Printing failed.";
return DidFinishPrinting(FAIL_PRINT);
}
@@ -1370,8 +1361,7 @@ void PrintWebViewHelper::FinishFramePrinting() {
#if defined(OS_MACOSX)
bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
- int page_count,
- const gfx::Size& canvas_size) {
+ int page_count) {
const PrintMsg_PrintPages_Params& params = *print_pages_params_;
const PrintMsg_Print_Params& print_params = params.params;
@@ -1380,14 +1370,14 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
if (params.pages.empty()) {
for (int i = 0; i < page_count; ++i) {
page_params.page_number = i;
- PrintPageInternal(page_params, canvas_size, frame);
+ PrintPageInternal(page_params, frame);
}
} else {
for (size_t i = 0; i < params.pages.size(); ++i) {
if (params.pages[i] >= page_count)
break;
page_params.page_number = params.pages[i];
- PrintPageInternal(page_params, canvas_size, frame);
+ PrintPageInternal(page_params, frame);
}
}
return true;
@@ -1974,11 +1964,6 @@ int PrintWebViewHelper::PrintPreviewContext::last_error() const {
return error_;
}
-gfx::Size PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
- DCHECK(IsRendering());
- return prep_frame_view_->GetPrintCanvasSize();
-}
-
void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
prep_frame_view_.reset();
metafile_.reset();
« no previous file with comments | « chrome/renderer/printing/print_web_view_helper.h ('k') | chrome/renderer/printing/print_web_view_helper_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698