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

Unified Diff: cc/layers/delegated_frame_provider_unittest.cc

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rectfconvert-cc: rebase-and-sandwich-strategy Created 5 years, 3 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
« no previous file with comments | « cc/layers/delegated_frame_provider.cc ('k') | cc/layers/delegated_renderer_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_frame_provider_unittest.cc
diff --git a/cc/layers/delegated_frame_provider_unittest.cc b/cc/layers/delegated_frame_provider_unittest.cc
index 3aef0d18c7dbc0219ba7122382e35fbae99d9916..4248899641a037d8c57a04f9f45e5ed8d169d8d2 100644
--- a/cc/layers/delegated_frame_provider_unittest.cc
+++ b/cc/layers/delegated_frame_provider_unittest.cc
@@ -159,20 +159,20 @@ TEST_F(DelegatedFrameProviderTest, RefResources) {
scoped_refptr<DelegatedRendererLayer> observer2 =
DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
- gfx::RectF damage;
+ gfx::Rect damage;
// Both observers get a full frame of damage on the first request.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
- EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(5, 5), damage);
frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
- EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(5, 5), damage);
// And both get no damage on the 2nd request. This adds a second ref to the
// resources.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
- EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(), damage);
frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
- EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(), damage);
EXPECT_FALSE(ReturnAndResetResourcesAvailable());
@@ -217,7 +217,7 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProvider) {
scoped_refptr<DelegatedRendererLayer> observer2 =
DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
- gfx::RectF damage;
+ gfx::Rect damage;
// Take a ref on each observer.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
@@ -259,7 +259,7 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
scoped_refptr<DelegatedRendererLayer> observer2 =
DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
- gfx::RectF damage;
+ gfx::Rect damage;
// Take a ref on each observer.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
@@ -303,19 +303,19 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
scoped_refptr<DelegatedRendererLayer> observer2 =
DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
- gfx::RectF damage;
+ gfx::Rect damage;
// Both observers get a full frame of damage on the first request.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
- EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(5, 5), damage);
frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
- EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(5, 5), damage);
// And both get no damage on the 2nd request.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
- EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(), damage);
frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
- EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(), damage);
frame = CreateFrameData(gfx::Rect(5, 5), gfx::Rect(2, 2));
AddTextureQuad(frame.get(), 555);
@@ -324,15 +324,15 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
// Both observers get the damage for the new frame.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
- EXPECT_EQ(gfx::RectF(2.f, 2.f).ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(2, 2), damage);
frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
- EXPECT_EQ(gfx::RectF(2.f, 2.f).ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(2, 2), damage);
// And both get no damage on the 2nd request.
frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
- EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(), damage);
frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
- EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
+ EXPECT_EQ(gfx::Rect(), damage);
}
TEST_F(DelegatedFrameProviderTest, LostNothing) {
« no previous file with comments | « cc/layers/delegated_frame_provider.cc ('k') | cc/layers/delegated_renderer_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698