Chromium Code Reviews| Index: cc/output/overlay_unittest.cc |
| diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc |
| index 545b5f54eb368d6bd809ed5480ba1252880df188..ccafd790bee2595e35442b89464bc0ddaeddaa42 100644 |
| --- a/cc/output/overlay_unittest.cc |
| +++ b/cc/output/overlay_unittest.cc |
| @@ -23,6 +23,7 @@ |
| #include "cc/test/test_shared_bitmap_manager.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| +#include "ui/gfx/geometry/rect_conversions.h" |
| using testing::_; |
| using testing::Mock; |
| @@ -61,6 +62,11 @@ void SingleOverlayValidator::CheckOverlaySupport( |
| ASSERT_EQ(2U, surfaces->size()); |
| OverlayCandidate& candidate = surfaces->back(); |
| + |
| + // Reject non-integer rectangles |
| + if (!gfx::IsNearestRectWithinDistance(candidate.display_rect, 0.01f)) |
|
achaulk
2015/04/29 21:37:03
I'm not really sure this is useful - the test code
halliwell
2015/04/29 21:42:55
Agreed, will delete this test now.
|
| + return; |
| + |
| if (candidate.display_rect.width() == 64) |
| EXPECT_EQ(kOverlayBottomRightRect, candidate.display_rect); |
| else |
| @@ -589,6 +595,24 @@ TEST_F(SingleOverlayOnTopTest, AllowPositiveScaleTransform) { |
| EXPECT_EQ(2U, candidate_list.size()); |
| } |
| +TEST_F(SingleOverlayOnTopTest, CanRejectNonIntegerTranslation) { |
| + gfx::Rect rect = kOverlayRect; |
| + rect.Offset(-1, -1); |
| + rect.Inset(0, 0, -1, -1); |
| + scoped_ptr<RenderPass> pass = CreateRenderPass(); |
| + CreateCandidateQuadAt(resource_provider_.get(), |
| + pass->shared_quad_state_list.back(), pass.get(), rect); |
| + pass->shared_quad_state_list.back()->content_to_target_transform.Translate( |
| + 0.5f, 0.5f); |
| + |
| + RenderPassList pass_list; |
| + pass_list.push_back(pass.Pass()); |
| + OverlayCandidateList candidate_list; |
| + overlay_processor_->ProcessForOverlays(&pass_list, &candidate_list); |
| + ASSERT_EQ(1U, pass_list.size()); |
| + EXPECT_EQ(0U, candidate_list.size()); |
| +} |
| + |
| TEST_F(SingleOverlayOnTopTest, AllowNotTopIfNotOccluded) { |
| scoped_ptr<RenderPass> pass = CreateRenderPass(); |
| CreateCheckeredQuadAt(resource_provider_.get(), |