Revert 213493 "cc: Use a struct for CalcDrawProps inputs"

> cc: Use a struct for CalcDrawProps inputs
> 
> This is just a refactoring and should not change any behavior.
> 
> R=danakj@chromium.org
> BUG=none
> 
> Review URL: https://chromiumcodereview.appspot.com/19935003

TBR=enne@chromium.org

Review URL: https://codereview.chromium.org/20110002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213495 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 26 insertions, 8 deletions

diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index db019c5..5a1aae1 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -309,12 +309,21 @@ template <typename Types> class OcclusionTrackerTest : public testing::Test {
 
   void CalcDrawEtc(TestContentLayerImpl* root) {
     DCHECK(root == root_.get());
+    int dummy_max_texture_size = 512;
+
     DCHECK(!root->render_surface());
 
-    LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-        root, root->bounds(), &render_surface_layer_list_impl_);
-    inputs.can_adjust_raster_scales = true;
-    LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+    LayerTreeHostCommon::CalculateDrawProperties(
+        root,
+        root->bounds(),
+        gfx::Transform(),
+        1.f,
+        1.f,
+        NULL,
+        dummy_max_texture_size,
+        false,  // can_use_lcd_text
+        true,  // can_adjust_raster_scales
+        &render_surface_layer_list_impl_);
 
     layer_iterator_ = layer_iterator_begin_ =
         Types::TestLayerIterator::Begin(&render_surface_layer_list_impl_);
@@ -322,13 +331,22 @@ template <typename Types> class OcclusionTrackerTest : public testing::Test {
 
   void CalcDrawEtc(TestContentLayer* root) {
     DCHECK(root == root_.get());
+    int dummy_max_texture_size = 512;
+
     DCHECK(!root->render_surface());
 
     render_surface_layer_list_.reset(new RenderSurfaceLayerList);
-    LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
-        root, root->bounds(), render_surface_layer_list_.get());
-    inputs.can_adjust_raster_scales = true;
-    LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+    LayerTreeHostCommon::CalculateDrawProperties(
+        root,
+        root->bounds(),
+        gfx::Transform(),
+        1.f,
+        1.f,
+        NULL,
+        dummy_max_texture_size,
+        false,  // can_use_lcd_text
+        true,  // can_adjust_raster_scales
+        render_surface_layer_list_.get());
 
     layer_iterator_ = layer_iterator_begin_ =
         Types::TestLayerIterator::Begin(render_surface_layer_list_.get());