Commit 6292696c authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Initialize PrintRenderFrameHelper members in the class definition.

Change-Id: I23852629fc7c76a73aa70aa85ac1331c4e468296
Reviewed-on: https://chromium-review.googlesource.com/1150801Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578202}
parent d05fd951
......@@ -739,15 +739,15 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
FrameReference frame_;
blink::WebNode node_to_print_;
bool owns_web_view_;
bool owns_web_view_ = false;
blink::WebPrintParams web_print_params_;
gfx::Size prev_view_size_;
gfx::Size prev_scroll_offset_;
int expected_pages_count_;
int expected_pages_count_ = 0;
base::Closure on_ready_;
bool should_print_backgrounds_;
bool should_print_selection_only_;
bool is_printing_started_;
const bool should_print_backgrounds_;
const bool should_print_selection_only_;
bool is_printing_started_ = false;
base::WeakPtrFactory<PrepareFrameAndViewForPrint> weak_ptr_factory_;
......@@ -761,11 +761,8 @@ PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(
bool ignore_css_margins)
: frame_(frame),
node_to_print_(node),
owns_web_view_(false),
expected_pages_count_(0),
should_print_backgrounds_(params.should_print_backgrounds),
should_print_selection_only_(params.selection_only),
is_printing_started_(false),
weak_ptr_factory_(this) {
PrintMsg_Print_Params print_params = params;
bool source_is_pdf = PrintingNodeOrPdfFrame(frame, node_to_print_);
......@@ -968,17 +965,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper(
std::unique_ptr<Delegate> delegate)
: content::RenderFrameObserver(render_frame),
content::RenderFrameObserverTracker<PrintRenderFrameHelper>(render_frame),
reset_prep_frame_view_(false),
is_print_ready_metafile_sent_(false),
ignore_css_margins_(false),
is_printing_enabled_(true),
notify_browser_of_print_failure_(true),
delegate_(std::move(delegate)),
print_node_in_progress_(false),
is_loading_(false),
is_scripted_preview_delayed_(false),
ipc_nesting_level_(0),
render_frame_gone_(false),
weak_ptr_factory_(this) {
if (!delegate_->IsPrintPreviewEnabled())
DisablePreview();
......@@ -2199,15 +2186,9 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
}
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
PrintRenderFrameHelper::PrintPreviewContext::PrintPreviewContext()
: total_page_count_(0),
current_page_index_(0),
is_modifiable_(true),
print_ready_metafile_page_count_(0),
error_(PREVIEW_ERROR_NONE),
state_(UNINITIALIZED) {}
PrintRenderFrameHelper::PrintPreviewContext::PrintPreviewContext() = default;
PrintRenderFrameHelper::PrintPreviewContext::~PrintPreviewContext() {}
PrintRenderFrameHelper::PrintPreviewContext::~PrintPreviewContext() = default;
void PrintRenderFrameHelper::PrintPreviewContext::InitWithFrame(
blink::WebLocalFrame* web_frame) {
......
......@@ -375,18 +375,18 @@ class PrintRenderFrameHelper
// WebView used only to print the selection.
std::unique_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
bool reset_prep_frame_view_;
bool reset_prep_frame_view_ = false;
std::unique_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
gfx::Rect printer_printable_area_;
bool is_print_ready_metafile_sent_;
bool ignore_css_margins_;
bool is_print_ready_metafile_sent_ = false;
bool ignore_css_margins_ = false;
bool is_printing_enabled_;
bool is_printing_enabled_ = true;
// Let the browser process know of a printing failure. Only set to false when
// the failure came from the browser in the first place.
bool notify_browser_of_print_failure_;
bool notify_browser_of_print_failure_ = true;
// Used to check the prerendering status.
const std::unique_ptr<Delegate> delegate_;
......@@ -479,26 +479,26 @@ class PrintRenderFrameHelper
std::unique_ptr<PdfMetafileSkia> metafile_;
// Total page count in the renderer.
int total_page_count_;
int total_page_count_ = 0;
// The current page to render.
int current_page_index_;
int current_page_index_ = 0;
// List of page indices that need to be rendered.
std::vector<int> pages_to_render_;
// True, if the document source is modifiable. e.g. HTML and not PDF.
bool is_modifiable_;
bool is_modifiable_ = true;
// Specifies the total number of pages in the print ready metafile.
int print_ready_metafile_page_count_;
int print_ready_metafile_page_count_ = 0;
base::TimeDelta document_render_time_;
base::TimeTicks begin_time_;
enum PrintPreviewErrorBuckets error_;
enum PrintPreviewErrorBuckets error_ = PREVIEW_ERROR_NONE;
State state_;
State state_ = UNINITIALIZED;
DISALLOW_COPY_AND_ASSIGN(PrintPreviewContext);
};
......@@ -522,12 +522,12 @@ class PrintRenderFrameHelper
ScriptingThrottler scripting_throttler_;
bool print_node_in_progress_;
bool print_node_in_progress_ = false;
PrintPreviewContext print_preview_context_;
bool is_loading_;
bool is_scripted_preview_delayed_;
int ipc_nesting_level_;
bool render_frame_gone_;
bool is_loading_ = false;
bool is_scripted_preview_delayed_ = false;
int ipc_nesting_level_ = 0;
bool render_frame_gone_ = false;
// Used to fix a race condition where the source is a PDF and print preview
// hangs because RequestPrintPreview is called before DidStopLoading() is
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment