mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chromium-style fixes (#12826)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-05-03 23:45:12 -07:00 • committed by Shelley Vohr
parent 7be30bb249
commit b280ea5579
11 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chromium_src/chrome/renderer/printing/print_web_view_helper.cc
View file

@ -401,8 +401,6 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
void RestoreSize();
void CopySelection(const WebPreferences& preferences);
base::WeakPtrFactory<PrepareFrameAndViewForPrint> weak_ptr_factory_;
FrameReference frame_;
blink::WebNode node_to_print_;
bool owns_web_view_;
@ -415,6 +413,8 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
bool should_print_selection_only_;
bool is_printing_started_;
base::WeakPtrFactory<PrepareFrameAndViewForPrint> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(PrepareFrameAndViewForPrint);
};
@ -423,14 +423,14 @@ PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(
blink::WebLocalFrame* frame,
const blink::WebNode& node,
bool ignore_css_margins)
: weak_ptr_factory_(this),
frame_(frame),
: 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) {
is_printing_started_(false),
weak_ptr_factory_(this) {
PrintMsg_Print_Params print_params = params;
if (!should_print_selection_only_ ||
!PrintingNodeOrPdfFrame(frame, node_to_print_)) {