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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/delegated_frame_provider_unittest.cc

Issue 502203003: Remove implicit conversions from scoped_refptr to T* in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to use .get() instead of rewriting local variable Created 6 years, 4 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/debug/rasterize_and_record_benchmark_impl.cc ('k') | cc/layers/delegated_frame_resource_collection_unittest.cc » ('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 5e946a51176f3ddeb4bb5e884c2c3582e9361754..8462595c5d98e4a42b54c3f39b18ad9a67ab5195 100644
--- a/cc/layers/delegated_frame_provider_unittest.cc
+++ b/cc/layers/delegated_frame_provider_unittest.cc
@@ -159,16 +159,16 @@ TEST_F(DelegatedFrameProviderTest, RefResources) {
gfx::RectF damage;
// Both observers get a full frame of damage on the first request.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
// And both get no damage on the 2nd request. This adds a second ref to the
// resources.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
EXPECT_FALSE(ReturnAndResetResourcesAvailable());
@@ -217,8 +217,8 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProvider) {
gfx::RectF damage;
// Take a ref on each observer.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_FALSE(ReturnAndResetResourcesAvailable());
@@ -259,8 +259,8 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
gfx::RectF damage;
// Take a ref on each observer.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_FALSE(ReturnAndResetResourcesAvailable());
@@ -303,15 +303,15 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
gfx::RectF damage;
// Both observers get a full frame of damage on the first request.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
// And both get no damage on the 2nd request.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
frame = CreateFrameData(gfx::Rect(5, 5), gfx::Rect(2, 2));
@@ -320,15 +320,15 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
frame_provider_->SetFrameData(frame.Pass());
// Both observers get the damage for the new frame.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
EXPECT_EQ(gfx::RectF(2.f, 2.f).ToString(), damage.ToString());
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_EQ(gfx::RectF(2.f, 2.f).ToString(), damage.ToString());
// And both get no damage on the 2nd request.
- frame_provider_->GetFrameDataAndRefResources(observer1, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
- frame_provider_->GetFrameDataAndRefResources(observer2, &damage);
+ frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
EXPECT_EQ(gfx::RectF().ToString(), damage.ToString());
}
« no previous file with comments | « cc/debug/rasterize_and_record_benchmark_impl.cc ('k') | cc/layers/delegated_frame_resource_collection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698