diff options
| author | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 07:32:05 +0000 |
|---|---|---|
| committer | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 07:32:05 +0000 |
| commit | 4f08ba89fe50630fc8545d5a2bff21320ee0f5da (patch) | |
| tree | 73bc56b04aecaf03587416b2e8b1c1b0297ff6ab /chrome | |
| parent | 6c8909c917c7e8fc735416adf5e6db82b0f91982 (diff) | |
| download | chromium_src-4f08ba89fe50630fc8545d5a2bff21320ee0f5da.zip chromium_src-4f08ba89fe50630fc8545d5a2bff21320ee0f5da.tar.gz chromium_src-4f08ba89fe50630fc8545d5a2bff21320ee0f5da.tar.bz2 | |
Fix style issues pointed in another change.
BUG=47277
TEST=none
Review URL: http://codereview.chromium.org/2841035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/print_web_view_helper.cc | 20 | ||||
| -rw-r--r-- | chrome/renderer/print_web_view_helper_mac.mm | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index b0ae1d2..d816a8d 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -381,12 +381,12 @@ void PrintWebViewHelper::GetPageSizeAndMarginsInPoints( default_params.margin_top, dpi, printing::kPixelsPerInch); int margin_right_in_pixels = ConvertUnit( - default_params.page_size.width() - - default_params.printable_size.width() - default_params.margin_left, + default_params.page_size.width() - + default_params.printable_size.width() - default_params.margin_left, dpi, printing::kPixelsPerInch); int margin_bottom_in_pixels = ConvertUnit( - default_params.page_size.height() - - default_params.printable_size.height() - default_params.margin_top, + default_params.page_size.height() - + default_params.printable_size.height() - default_params.margin_top, dpi, printing::kPixelsPerInch); int margin_left_in_pixels = ConvertUnit( default_params.margin_left, @@ -401,12 +401,12 @@ void PrintWebViewHelper::GetPageSizeAndMarginsInPoints( margin_left_in_pixels); } - *content_width_in_points = ConvertPixelsToPoint(page_size_in_pixels.width - - margin_left_in_pixels - - margin_right_in_pixels); - *content_height_in_points = ConvertPixelsToPoint(page_size_in_pixels.height - - margin_top_in_pixels - - margin_bottom_in_pixels); + *content_width_in_points = ConvertPixelsToPoint(page_size_in_pixels.width - + margin_left_in_pixels - + margin_right_in_pixels); + *content_height_in_points = ConvertPixelsToPoint(page_size_in_pixels.height - + margin_top_in_pixels - + margin_bottom_in_pixels); // Invalid page size and/or margins. We just use the default setting. if (*content_width_in_points < 1.0 || *content_height_in_points < 1.0) { diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index b94221e..16311d4 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -69,10 +69,10 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params, base::SharedMemory shared_buf; page_params.page_size = gfx::Size( - static_cast<int>(content_width_in_points - + margin_left_in_points + margin_right_in_points), - static_cast<int>(content_height_in_points - + margin_top_in_points + margin_bottom_in_points)); + static_cast<int>(content_width_in_points + + margin_left_in_points + margin_right_in_points), + static_cast<int>(content_height_in_points + + margin_top_in_points + margin_bottom_in_points)); page_params.content_area = gfx::Rect( static_cast<int>(margin_left_in_points), static_cast<int>(margin_top_in_points), |