Revert of Pinch/Zoom Infrastructure & Plumbing CL

cc/layers/layer_perftest.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/layer.h"
 
 #include "cc/resources/layer_painter.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
@@ skipping 62 matching lines @@
 
   // Properties changed.
   timer_.Reset();
   do {
     test_layer->SetNeedsDisplayRect(gfx::RectF(0.f, 0.f, 5.f, 5.f));
     test_layer->SetAnchorPointZ(anchor_point_z);
     test_layer->SetContentsOpaque(contents_opaque);
     test_layer->SetDoubleSided(double_sided);
     test_layer->SetHideLayerAndSubtree(hide_layer_and_subtree);
     test_layer->SetMasksToBounds(masks_to_bounds);
-    test_layer->SetScrollClipLayer(scrollable ? test_layer : NULL);
+    test_layer->SetScrollable(scrollable);
     test_layer->PushPropertiesTo(impl_layer.get());
 
     anchor_point_z += 0.01f;
     scrollable = !scrollable;
     contents_opaque = !contents_opaque;
     double_sided = !double_sided;
     hide_layer_and_subtree = !hide_layer_and_subtree;
     masks_to_bounds = !masks_to_bounds;
 
     timer_.NextLap();
@@ skipping 17 matching lines @@
                          "",
                          "props_didnt_change",
                          timer_.LapsPerSecond(),
                          "runs/s",
                          true);
 }
 
 
 }  // namespace
 }  // namespace cc