summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 17:46:15 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 17:46:15 +0000
commit655750cba246a2e3049867c3b200ca478f883230 (patch)
tree581ae4bdfb37aa3673619c021ca5796348dcb70e /chrome/renderer
parent87373acb051a898a2b6cbb56be05fc3f4d3a75bc (diff)
downloadchromium_src-655750cba246a2e3049867c3b200ca478f883230.zip
chromium_src-655750cba246a2e3049867c3b200ca478f883230.tar.gz
chromium_src-655750cba246a2e3049867c3b200ca478f883230.tar.bz2
Remove code doing a no-op due to float -> int rounding.
Make implicit float -> int/long conversions explicit. (Implicit float -> int conversions can be found by compiling with -Wconversion in gcc [versions 4.1.1 and 4.2.4, and surely many others].) Landing the patch for Jacob Mandelson, original review: http://codereview.chromium.org/201091 BUG=none TEST=app_unittests & base_unittests Review URL: http://codereview.chromium.org/200122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/print_web_view_helper_linux.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index b16b05e..211eb6f 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -27,15 +27,15 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) {
// Top = 0.25 in.
// Bottom = 0.56 in.
const int kDPI = 72;
- const int kWidth = (8.5-0.25-0.25) * kDPI;
- const int kHeight = (11-0.25-0.56) * kDPI;
+ const int kWidth = static_cast<int>((8.5-0.25-0.25) * kDPI);
+ const int kHeight = static_cast<int>((11-0.25-0.56) * kDPI);
ViewMsg_Print_Params default_settings;
default_settings.printable_size = gfx::Size(kWidth, kHeight);
default_settings.dpi = kDPI;
default_settings.min_shrink = 1.25;
default_settings.max_shrink = 2.0;
default_settings.desired_dpi = kDPI;
- default_settings.document_cookie = NULL;
+ default_settings.document_cookie = 0;
default_settings.selection_only = false;
ViewMsg_PrintPages_Params print_settings;