diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 22:05:24 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 22:05:24 +0000 |
| commit | b8785de6caf1862f2a875856c35d1e84ed6a5f30 (patch) | |
| tree | 940a7c887090608c4c3527a16c4462b0064eec0e /views | |
| parent | f1d1bd19f5700a838af6139914463dc51cc9bc4d (diff) | |
| download | chromium_src-b8785de6caf1862f2a875856c35d1e84ed6a5f30.zip chromium_src-b8785de6caf1862f2a875856c35d1e84ed6a5f30.tar.gz chromium_src-b8785de6caf1862f2a875856c35d1e84ed6a5f30.tar.bz2 | |
Fix compile on windows.
TBR=ben@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 74aadd5..2430cb1 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -1660,7 +1660,7 @@ TEST_F(ViewTest, TransformEvent) { v3->SetTranslateX(30); // Scale |v2| with respect to |v1| along both axis. - v2->SetScale(0.8, 0.5); + v2->SetScale(0.8f, 0.5f); // |v3| occupies (108, 105) to (132, 115) in |root|. @@ -1693,7 +1693,7 @@ TEST_F(ViewTest, TransformEvent) { // Rotation sets some scaling transformation. Using SetScale would overwrite // that and pollute the rotation. So combine the scaling with the existing // transforamtion. - v3->ConcatScale(0.8, 0.5); + v3->ConcatScale(0.8f, 0.5f); // Translate |v2| with respect to |v1|. v2->SetTranslate(10, 10); |