summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 08:44:32 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 08:44:32 +0000
commit55bd3364e18dad8d61199cb9d499d36655c1a813 (patch)
treecfe01009d7d82fc75bd0e0d2f223c7fbd828e523 /ui/ui.gyp
parent09a6f302b7a88a119f417ecfca5e7284719d805b (diff)
downloadchromium_src-55bd3364e18dad8d61199cb9d499d36655c1a813.zip
chromium_src-55bd3364e18dad8d61199cb9d499d36655c1a813.tar.gz
chromium_src-55bd3364e18dad8d61199cb9d499d36655c1a813.tar.bz2
Add gfx::ToRoundedInt safe conversion method from float to int.
This fixes the problems with the windows build that caused revert. BUG=147395 R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/11094051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 9d99b41..b5e6871 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -152,8 +152,8 @@
'gfx/rect_conversions.h',
'gfx/rect_f.cc',
'gfx/rect_f.h',
- 'gfx/safe_floor_ceil.cc',
- 'gfx/safe_floor_ceil.h',
+ 'gfx/safe_integer_conversions.cc',
+ 'gfx/safe_integer_conversions.h',
'gfx/scoped_ui_graphics_push_context_ios.h',
'gfx/scoped_ui_graphics_push_context_ios.mm',
'gfx/screen.h',