diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 00:38:23 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 00:38:23 +0000 |
| commit | b8f0d0daa59b11aa8303952fe34a82471d6c3015 (patch) | |
| tree | 29682e00e76d171b3a4779a444ea7d6c69fdfee9 /ash/tooltips | |
| parent | acf2eb009a525699a4054e94a9455c1cc60091b6 (diff) | |
| download | chromium_src-b8f0d0daa59b11aa8303952fe34a82471d6c3015.zip chromium_src-b8f0d0daa59b11aa8303952fe34a82471d6c3015.tar.gz chromium_src-b8f0d0daa59b11aa8303952fe34a82471d6c3015.tar.bz2 | |
Revert 160976 - The center of a rect is x+width/2, y+height/2
If a rect is (0, 0, 5, 5) the center should be 2.5, 2.5, not 2, 2.
Tests:
ui_unittests:RectTest.CenterPoint
ui_unittests:RectTest.CenterPointF
BUG=147395
Review URL: https://chromiumcodereview.appspot.com/11065050
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11086037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index d48db06..995f889 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -194,7 +194,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) { view1->bounds().CenterPoint()); FireTooltipTimer(); EXPECT_TRUE(IsTooltipVisible()); - for (int i = 0; i < 49; ++i) { + for (int i = 0; i < 50; i++) { generator.MoveMouseBy(1, 0); EXPECT_TRUE(IsTooltipVisible()); EXPECT_EQ(window, @@ -205,7 +205,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) { EXPECT_EQ(expected_tooltip, GetTooltipText()); EXPECT_EQ(window, GetTooltipWindow()); } - for (int i = 0; i < 49; ++i) { + for (int i = 0; i < 50; i++) { generator.MoveMouseBy(1, 0); EXPECT_FALSE(IsTooltipVisible()); EXPECT_EQ(window, @@ -397,7 +397,7 @@ TEST_F(TooltipControllerTest, TooltipHidesOnKeyPressAndStaysHiddenUntilChange) { // Moving the mouse inside |view1| should not change the state of the tooltip // or the timers. - for (int i = 0; i < 49; i++) { + for (int i = 0; i < 50; i++) { generator.MoveMouseBy(1, 0); EXPECT_FALSE(IsTooltipVisible()); EXPECT_FALSE(IsTooltipTimerRunning()); @@ -452,7 +452,7 @@ TEST_F(TooltipControllerTest, TooltipHidesOnTimeoutAndStaysHiddenUntilChange) { // Moving the mouse inside |view1| should not change the state of the tooltip // or the timers. - for (int i = 0; i < 49; ++i) { + for (int i = 0; i < 50; i++) { generator.MoveMouseBy(1, 0); EXPECT_FALSE(IsTooltipVisible()); EXPECT_FALSE(IsTooltipTimerRunning()); |