Commit 53453fb0 authored by W. James MacLean's avatar W. James MacLean Committed by Commit Bot

Use EXPECT_NEAR when comparing scales on Android.

When this test was written it was assumed safe to use exact comparisons
for scale because it was expected that all the page scale factors would
be a power of 2. But Android test bots use arbitrary values that mean we
should use EXPECT_NEAR instead.

TBR=kenrb@chromium.org

Bug: 894561
Change-Id: Ia6f70f62ef993ef5bd2a7699a7fbb30c492c651d
Reviewed-on: https://chromium-review.googlesource.com/c/1277651Reviewed-by: default avatarJames MacLean <wjmaclean@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#598915}
parent 6bc60abd
......@@ -1206,12 +1206,15 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
// Some basic tests on the transforms between child and root. These assume
// a CSS scale of 0.5 on the child, though should be robust to placement of
// the iframe.
float kScaleTolerance = 0.0001f;
gfx::Transform transform_to_child;
ASSERT_TRUE(
root_rwhv->GetTransformToViewCoordSpace(child_rwhv, &transform_to_child));
EXPECT_TRUE(transform_to_child.IsScaleOrTranslation());
EXPECT_EQ(2.f / scale_factor, transform_to_child.matrix().getFloat(0, 0));
EXPECT_EQ(2.f / scale_factor, transform_to_child.matrix().getFloat(1, 1));
EXPECT_NEAR(2.f / scale_factor, transform_to_child.matrix().getFloat(0, 0),
kScaleTolerance);
EXPECT_NEAR(2.f / scale_factor, transform_to_child.matrix().getFloat(1, 1),
kScaleTolerance);
gfx::PointF child_origin =
child_rwhv->TransformPointToRootCoordSpaceF(gfx::PointF());
......@@ -1220,8 +1223,10 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
ASSERT_TRUE(child_rwhv->GetTransformToViewCoordSpace(root_rwhv,
&transform_from_child));
EXPECT_TRUE(transform_from_child.IsScaleOrTranslation());
EXPECT_EQ(0.5f * scale_factor, transform_from_child.matrix().getFloat(0, 0));
EXPECT_EQ(0.5f * scale_factor, transform_from_child.matrix().getFloat(1, 1));
EXPECT_NEAR(0.5f * scale_factor, transform_from_child.matrix().getFloat(0, 0),
kScaleTolerance);
EXPECT_NEAR(0.5f * scale_factor, transform_from_child.matrix().getFloat(1, 1),
kScaleTolerance);
EXPECT_EQ(child_origin.x(), transform_from_child.matrix().getFloat(0, 3));
EXPECT_EQ(child_origin.y(), transform_from_child.matrix().getFloat(1, 3));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment