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

Printing: Remove PrintedPage on non-Windows

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/804178
https://chromium-review.googlesource.com/c/chromium/src/+/770492
https://chromium-review.googlesource.com/c/chromium/src/+/704262
This commit is contained in:
deepak1556 2018-04-13 14:13:52 +05:30 • committed by Samuel Attard
parent 37d64e6a00
commit 39b30b76ea
13 changed files with 154 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include "net/base/escape.h"
#include "printing/pdf_metafile_skia.h"
#include "printing/units.h"
#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h"
#include "third_party/WebKit/public/platform/WebDoubleSize.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
@ -510,8 +511,8 @@ void PrepareFrameAndViewForPrint::CopySelection(
WebPreferences prefs = preferences;
prefs.javascript_enabled = false;
blink::WebView* web_view =
blink::WebView::Create(this, blink::kWebPageVisibilityStateVisible);
blink::WebView* web_view = blink::WebView::Create(
this, blink::mojom::PageVisibilityState::kVisible, nullptr);
owns_web_view_ = true;
content::RenderView::ApplyWebPreferences(prefs, web_view);
blink::WebLocalFrame* main_frame =

1
chromium_src/chrome/renderer/printing/print_web_view_helper.h
View file

@ -203,7 +203,6 @@ class PrintWebViewHelper
void RenderPage(const PrintMsg_Print_Params& params,
int page_number,
blink::WebLocalFrame* frame,
bool is_preview,
PdfMetafileSkia* metafile,
gfx::Size* page_size,
gfx::Rect* content_rect);

6
chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
View file

@ -28,7 +28,7 @@ void PrintWebViewHelper::PrintPageInternal(
int page_number = params.page_number;
gfx::Size page_size_in_dpi;
gfx::Rect content_area_in_dpi;
RenderPage(print_pages_params_->params, page_number, frame, false, &metafile,
RenderPage(print_pages_params_->params, page_number, frame, &metafile,
&page_size_in_dpi, &content_area_in_dpi);
metafile.FinishDocument();
@ -68,7 +68,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
base::TimeTicks begin_time = base::TimeTicks::Now();
gfx::Size page_size;
RenderPage(printParams, page_number, print_preview_context_.prepared_frame(),
true, initial_render_metafile, &page_size, NULL);
initial_render_metafile, &page_size, nullptr);
print_preview_context_.RenderedPreviewPage(base::TimeTicks::Now() -
begin_time);
@ -89,7 +89,6 @@ bool PrintWebViewHelper::RenderPreviewPage(
void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
int page_number,
WebLocalFrame* frame,
bool is_preview,
PdfMetafileSkia* metafile,
gfx::Size* page_size,
gfx::Rect* content_rect) {
@ -117,7 +116,6 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
return;
MetafileSkiaWrapper::SetMetafileOnCanvas(canvas, metafile);
cc::SetIsPreviewMetafile(canvas, is_preview);
RenderPageContent(frame, page_number, canvas_area, content_area,
scale_factor, static_cast<blink::WebCanvas*>(canvas));
}