Revert of "Converted LayerImpl::bounds() to return SizeF."

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 182 matching lines @@
     layer->SetHideLayerAndSubtree(false);
     layer->SetIsDrawable(false);
   }
 
   void VerifyAfterValues(LayerImpl* layer) {
     switch (static_cast<Properties>(index_)) {
       case STARTUP:
       case DONE:
         break;
       case BOUNDS:
-        EXPECT_EQ(gfx::SizeF(20, 20).ToString(), layer->bounds().ToString());
+        EXPECT_EQ(gfx::Size(20, 20).ToString(), layer->bounds().ToString());
         break;
       case HIDE_LAYER_AND_SUBTREE:
         EXPECT_TRUE(layer->hide_layer_and_subtree());
         break;
       case DRAWS_CONTENT:
         EXPECT_TRUE(layer->DrawsContent());
         break;
     }
   }
 
@@ skipping 2202 matching lines @@
     LayerTreeHostTest::SetupTree();
   }
 
   virtual void BeginTest() override { PostSetNeedsCommitToMainThread(); }
   virtual void AfterTest() override {}
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     num_commits_++;
     if (num_commits_ == 1) {
       LayerImpl* root_layer = host_impl->active_tree()->root_layer();
-      EXPECT_SIZE_EQ(gfx::SizeF(1, 1), root_layer->bounds());
+      EXPECT_SIZE_EQ(gfx::Size(1, 1), root_layer->bounds());
     } else {
       LayerImpl* root_layer = host_impl->active_tree()->root_layer();
-      EXPECT_SIZE_EQ(gfx::SizeF(2, 2), root_layer->bounds());
+      EXPECT_SIZE_EQ(gfx::Size(2, 2), root_layer->bounds());
       EndTest();
     }
   }
 
  private:
   SetBoundsClient client_;
   int num_commits_;
 };
 
 SINGLE_THREAD_TEST_F(LayerTreeHostTestChangeLayerPropertiesInPaintContents);
@@ skipping 1623 matching lines @@
     }
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer();
     LayerImpl* parent = root->children()[0];
     LayerImpl* child = parent->children()[0];
 
     switch (impl->active_tree()->source_frame_number()) {
       case 1:
-        EXPECT_EQ(gfx::SizeF(5, 5).ToString(), child->bounds().ToString());
+        EXPECT_EQ(gfx::Size(5, 5).ToString(), child->bounds().ToString());
         break;
     }
   }
 
   virtual void AfterTest() override {}
 
   scoped_refptr<Layer> root_layer_;
   scoped_refptr<SolidColorLayer> parent_layer_;
   scoped_refptr<SolidColorLayer> child_layer_;
 };
@@ skipping 989 matching lines @@
   bool visible_;
 
   FakeContentLayerClient client_;
   scoped_refptr<FakePictureLayer> picture_layer_;
 };
 
 // TODO(vmpstr): Enable with single thread impl-side painting.
 MULTI_THREAD_TEST_F(LayerTreeHostTestActivateOnInvisible);
 
 }  // namespace cc