cc: Remove implicit conversions from Rect to RectF in src/cc/.

cc/layers/delegated_frame_provider_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/resource_provider.h"
@@ skipping 141 matching lines @@
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
       DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   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());
 
   frame = CreateFrameData(gfx::Rect(5, 5), gfx::Rect(2, 2));
   AddTextureQuad(frame.get(), 555);
   AddTransferableResource(frame.get(), 555);
   frame_provider_->SetFrameData(frame.Pass());
 
   // The resources from the first frame are still reffed by the observers.
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
@@ skipping 24 matching lines @@
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
       DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   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);
   frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
 
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
 
   // Release both refs. But there's still a ref held in the frame
   // provider itself.
   frame_provider_->UnrefResourcesOnMainThread(returned);
@@ skipping 21 matching lines @@
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
       DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   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);
   frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
 
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
 
   // Release both refs. But there's still a ref held in the frame
   // provider itself.
   frame_provider_->UnrefResourcesOnMainThread(returned);
@@ skipping 23 matching lines @@
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
       DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   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);
   AddTransferableResource(frame.get(), 555);
   frame_provider_->SetFrameData(frame.Pass());
 
   // 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) {
   scoped_ptr<DelegatedFrameData> frame =
       CreateFrameData(gfx::Rect(5, 5), gfx::Rect(5, 5));
 
   TransferableResourceArray reffed = frame->resource_list;
 
   SetFrameProvider(frame.Pass());
 
@@ skipping 45 matching lines @@
 
   frame_provider_ = nullptr;
 
   // Nothing is returned twice.
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
   EXPECT_EQ(0u, resources_.size());
 }
 
 }  // namespace
 }  // namespace cc