Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Unified Diff: content/browser/compositor/reflector_impl_unittest.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/compositor/reflector_impl_unittest.cc
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc
index 2f0c299fcf1fd47c104dd071d2b50ce7507c1c81..867a9de10a224963725337381ad761f822e20318 100644
--- a/content/browser/compositor/reflector_impl_unittest.cc
+++ b/content/browser/compositor/reflector_impl_unittest.cc
@@ -91,8 +91,7 @@ class TestOutputSurface : public BrowserCompositorOutputSurface {
gfx::Size SurfaceSize() const override { return gfx::Size(256, 256); }
};
-const gfx::Rect kSubRect = gfx::Rect(0, 0, 64, 64);
-const SkIRect kSkSubRect = SkIRect::MakeXYWH(0, 0, 64, 64);
+const gfx::Rect kSubRect(0, 0, 64, 64);
} // namespace
@@ -161,10 +160,10 @@ TEST_F(ReflectorImplTest, CheckNormalOutputSurface) {
SetUpReflector();
UpdateTexture();
EXPECT_TRUE(mirroring_layer_->TextureFlipped());
- EXPECT_EQ(SkRegion(SkIRect::MakeXYWH(
- 0, output_surface_->SurfaceSize().height() - kSubRect.height(),
- kSubRect.width(), kSubRect.height())),
- mirroring_layer_->damaged_region());
+ gfx::Rect expected_rect =
+ kSubRect + gfx::Vector2d(0, output_surface_->SurfaceSize().height()) -
+ gfx::Vector2d(0, kSubRect.height());
+ EXPECT_EQ(expected_rect, mirroring_layer_->damaged_region());
}
TEST_F(ReflectorImplTest, CheckInvertedOutputSurface) {
@@ -172,7 +171,7 @@ TEST_F(ReflectorImplTest, CheckInvertedOutputSurface) {
SetUpReflector();
UpdateTexture();
EXPECT_FALSE(mirroring_layer_->TextureFlipped());
- EXPECT_EQ(SkRegion(kSkSubRect), mirroring_layer_->damaged_region());
+ EXPECT_EQ(kSubRect, mirroring_layer_->damaged_region());
}
#if defined(USE_OZONE)
« no previous file with comments | « content/browser/browser_url_handler_impl.cc ('k') | content/browser/compositor/software_output_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698