summaryrefslogtreecommitdiffstats
path: root/ui/views/view_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 16:29:21 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 16:29:21 +0000
commitb9857bdd37282ba346cbb2ccb52b67175ef490c0 (patch)
tree373a6f5904ab4e71c7b407a26512267f0c7b109c /ui/views/view_unittest.cc
parent414d57a780c0f774a9e5c2a893f5189b88b43b6e (diff)
downloadchromium_src-b9857bdd37282ba346cbb2ccb52b67175ef490c0.zip
chromium_src-b9857bdd37282ba346cbb2ccb52b67175ef490c0.tar.gz
chromium_src-b9857bdd37282ba346cbb2ccb52b67175ef490c0.tar.bz2
ui: Let skia do the conversion work for us by using the integer version of set() function.
R=pkasting@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9544001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_unittest.cc')
-rw-r--r--ui/views/view_unittest.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 1c1533c..32a027e 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -629,22 +629,13 @@ TEST_F(ViewTest, DISABLED_Painting) {
SkRect tmp_rect;
- tmp_rect.set(SkIntToScalar(10),
- SkIntToScalar(10),
- SkIntToScalar(20),
- SkIntToScalar(20));
+ tmp_rect.iset(10, 10, 20, 20);
CheckRect(v3->last_clip_, tmp_rect);
- tmp_rect.set(SkIntToScalar(20),
- SkIntToScalar(20),
- SkIntToScalar(30),
- SkIntToScalar(30));
+ tmp_rect.iset(20, 20, 30, 30);
CheckRect(v2->last_clip_, tmp_rect);
- tmp_rect.set(SkIntToScalar(30),
- SkIntToScalar(30),
- SkIntToScalar(40),
- SkIntToScalar(40));
+ tmp_rect.iset(30, 30, 40, 40);
CheckRect(v1->last_clip_, tmp_rect);
// Make sure v4 was not painted