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

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

Issue 822133003: Refactor webview to use //components/printing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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: components/printing/renderer/print_web_view_helper.cc
diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc
index 49055f049578d086bdd45f9f7a56fd2af2d1ec33..f4fae7d767e11af6972ab3a158dccfaca0c21b46 100644
--- a/components/printing/renderer/print_web_view_helper.cc
+++ b/components/printing/renderer/print_web_view_helper.cc
@@ -138,7 +138,7 @@ PrintMsg_Print_Params GetCssPrintParams(
// Invalid page size and/or margins. We just use the default setting.
if (new_content_width < 1 || new_content_height < 1) {
- CHECK(frame != NULL);
+ CHECK(frame);
page_css_params = GetCssPrintParams(NULL, page_index, page_params);
return page_css_params;
}
@@ -756,13 +756,14 @@ PrintWebViewHelper::PrintWebViewHelper(
content::RenderView* render_view,
bool out_of_process_pdf_enabled,
bool print_preview_disabled,
+ bool scripted_print_blocked,
scoped_ptr<Delegate> delegate)
: content::RenderViewObserver(render_view),
content::RenderViewObserverTracker<PrintWebViewHelper>(render_view),
reset_prep_frame_view_(false),
is_print_ready_metafile_sent_(false),
ignore_css_margins_(false),
- is_scripted_printing_blocked_(false),
+ is_scripted_printing_blocked_(scripted_print_blocked),
notify_browser_of_print_failure_(true),
print_for_preview_(false),
out_of_process_pdf_enabled_(out_of_process_pdf_enabled),
@@ -1924,30 +1925,30 @@ void PrintWebViewHelper::PrintPreviewContext::set_error(
}
blink::WebLocalFrame* PrintWebViewHelper::PrintPreviewContext::source_frame() {
- DCHECK(state_ != UNINITIALIZED);
+ DCHECK_NE(UNINITIALIZED, state_);
return source_frame_.GetFrame();
}
const blink::WebNode&
PrintWebViewHelper::PrintPreviewContext::source_node() const {
- DCHECK(state_ != UNINITIALIZED);
+ DCHECK_NE(UNINITIALIZED, state_);
return source_node_;
}
blink::WebLocalFrame*
PrintWebViewHelper::PrintPreviewContext::prepared_frame() {
- DCHECK(state_ != UNINITIALIZED);
+ DCHECK_NE(UNINITIALIZED, state_);
return prep_frame_view_->frame();
}
const blink::WebNode&
PrintWebViewHelper::PrintPreviewContext::prepared_node() const {
- DCHECK(state_ != UNINITIALIZED);
+ DCHECK_NE(UNINITIALIZED, state_);
return prep_frame_view_->node();
}
int PrintWebViewHelper::PrintPreviewContext::total_page_count() const {
- DCHECK(state_ != UNINITIALIZED);
+ DCHECK_NE(UNINITIALIZED, state_);
return total_page_count_;
}
« components/components.gyp ('K') | « components/printing/renderer/print_web_view_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698