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

Use kPointsPerInch instead of desired_dpi

Browse source 
Changed in https://codereview.chromium.org/2788343003
This commit is contained in:
Kevin Sawicki 2017-07-03 13:23:54 -07:00 • committed by Aleksei Kuzmin
parent 9945fc5148
commit 7d1a49db48
3 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chromium_src/chrome/common/print_messages.cc
View file

@ -15,7 +15,6 @@ PrintMsg_Print_Params::PrintMsg_Print_Params()
margin_left(0), margin_left(0),
dpi(0), dpi(0),
scale_factor(1.0f), scale_factor(1.0f),
desired_dpi(0),
document_cookie(0), document_cookie(0),
selection_only(false), selection_only(false),
supports_alpha_blend(false), supports_alpha_blend(false),
@ -41,7 +40,6 @@ void PrintMsg_Print_Params::Reset() {
margin_left = 0; margin_left = 0;
dpi = 0; dpi = 0;
scale_factor = 1.0f; scale_factor = 1.0f;
desired_dpi = 0;
document_cookie = 0; document_cookie = 0;
selection_only = false; selection_only = false;
supports_alpha_blend = false; supports_alpha_blend = false;

4
chromium_src/chrome/common/print_messages.h
View file

@ -41,7 +41,6 @@ struct PrintMsg_Print_Params {
int margin_left; int margin_left;
double dpi; double dpi;
double scale_factor; double scale_factor;
int desired_dpi;
bool rasterize_pdf; bool rasterize_pdf;
int document_cookie; int document_cookie;
bool selection_only; bool selection_only;
@ -105,9 +104,6 @@ IPC_STRUCT_TRAITS_BEGIN(PrintMsg_Print_Params)
// Specifies the scale factor in percent // Specifies the scale factor in percent
IPC_STRUCT_TRAITS_MEMBER(scale_factor) IPC_STRUCT_TRAITS_MEMBER(scale_factor)
// Desired apparent dpi on paper.
IPC_STRUCT_TRAITS_MEMBER(desired_dpi)
// Cookie for the document to ensure correctness. // Cookie for the document to ensure correctness.
IPC_STRUCT_TRAITS_MEMBER(document_cookie) IPC_STRUCT_TRAITS_MEMBER(document_cookie)

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

@ -66,9 +66,8 @@ int GetDPI(const PrintMsg_Print_Params* print_params) {
bool PrintMsg_Print_Params_IsValid(const PrintMsg_Print_Params& params) { bool PrintMsg_Print_Params_IsValid(const PrintMsg_Print_Params& params) {
return !params.content_size.IsEmpty() && !params.page_size.IsEmpty() && return !params.content_size.IsEmpty() && !params.page_size.IsEmpty() &&
!params.printable_area.IsEmpty() && params.document_cookie && !params.printable_area.IsEmpty() && params.document_cookie &&
params.desired_dpi && params.dpi && params.margin_top >= 0 && params.dpi && params.margin_top >= 0 && params.margin_left >= 0 &&
params.margin_left >= 0 && params.dpi > kMinDpi && params.dpi > kMinDpi && params.document_cookie != 0;
params.document_cookie != 0;
} }
PrintMsg_Print_Params GetCssPrintParams( PrintMsg_Print_Params GetCssPrintParams(
@ -218,31 +217,23 @@ void ComputeWebKitPrintParamsInDesiredDpi(
webkit_print_params->print_scaling_option = print_params.print_scaling_option; webkit_print_params->print_scaling_option = print_params.print_scaling_option;
webkit_print_params->print_content_area.width = webkit_print_params->print_content_area.width =
ConvertUnit(print_params.content_size.width(), dpi, ConvertUnit(print_params.content_size.width(), dpi, kPointsPerInch);
print_params.desired_dpi);
webkit_print_params->print_content_area.height = webkit_print_params->print_content_area.height =
ConvertUnit(print_params.content_size.height(), dpi, ConvertUnit(print_params.content_size.height(), dpi, kPointsPerInch);
print_params.desired_dpi);
webkit_print_params->printable_area.x = webkit_print_params->printable_area.x =
ConvertUnit(print_params.printable_area.x(), dpi, ConvertUnit(print_params.printable_area.x(), dpi, kPointsPerInch);
print_params.desired_dpi);
webkit_print_params->printable_area.y = webkit_print_params->printable_area.y =
ConvertUnit(print_params.printable_area.y(), dpi, ConvertUnit(print_params.printable_area.y(), dpi, kPointsPerInch);
print_params.desired_dpi);
webkit_print_params->printable_area.width = webkit_print_params->printable_area.width =
ConvertUnit(print_params.printable_area.width(), dpi, ConvertUnit(print_params.printable_area.width(), dpi, kPointsPerInch);
print_params.desired_dpi);
webkit_print_params->printable_area.height = webkit_print_params->printable_area.height =
ConvertUnit(print_params.printable_area.height(), ConvertUnit(print_params.printable_area.height(), dpi, kPointsPerInch);
dpi, print_params.desired_dpi);
webkit_print_params->paper_size.width = webkit_print_params->paper_size.width =
ConvertUnit(print_params.page_size.width(), dpi, ConvertUnit(print_params.page_size.width(), dpi, kPointsPerInch);
print_params.desired_dpi);
webkit_print_params->paper_size.height = webkit_print_params->paper_size.height =
ConvertUnit(print_params.page_size.height(), dpi, ConvertUnit(print_params.page_size.height(), dpi, kPointsPerInch);
print_params.desired_dpi);
} }
blink::WebPlugin* GetPlugin(const blink::WebFrame* frame) { blink::WebPlugin* GetPlugin(const blink::WebFrame* frame) {