Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/trees/occlusion_tracker_perftest.cc

 // Copyright 2014 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/occlusion_tracker.h"
 
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/solid_color_layer_impl.h"
@@ skipping 75 matching lines @@
 
   scoped_ptr<SolidColorLayerImpl> opaque_layer =
       SolidColorLayerImpl::Create(active_tree(), 2);
   opaque_layer->SetBackgroundColor(SK_ColorRED);
   opaque_layer->SetContentsOpaque(true);
   opaque_layer->SetDrawsContent(true);
   opaque_layer->SetBounds(viewport_rect.size());
   opaque_layer->SetContentBounds(viewport_rect.size());
   active_tree()->root_layer()->AddChild(opaque_layer.Pass());
 
-  bool update_lcd_text = false;
-  active_tree()->UpdateDrawProperties(update_lcd_text);
+  active_tree()->UpdateDrawProperties();
   const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList();
   ASSERT_EQ(1u, rsll.size());
   EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size());
 
   LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll);
   LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll);
 
   LayerIteratorPosition<LayerImpl> pos = begin;
 
   // The opaque_layer adds occlusion over the whole viewport.
@@ skipping 50 matching lines @@
     opaque_layer->SetContentsOpaque(true);
     opaque_layer->SetDrawsContent(true);
     opaque_layer->SetBounds(
         gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2));
     opaque_layer->SetContentBounds(
         gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2));
     opaque_layer->SetPosition(gfx::Point(i, i));
     active_tree()->root_layer()->AddChild(opaque_layer.Pass());
   }
 
-  bool update_lcd_text = false;
-  active_tree()->UpdateDrawProperties(update_lcd_text);
+  active_tree()->UpdateDrawProperties();
   const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList();
   ASSERT_EQ(1u, rsll.size());
   EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers),
             rsll[0]->render_surface()->layer_list().size());
 
   LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll);
   LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll);
 
   // The opaque_layers add occlusion.
   for (int i = 0; i < kNumOpaqueLayers - 1; ++i) {
@@ skipping 28 matching lines @@
   EXPECT_EQ(active_tree()->root_layer(), next.current_layer);
 
   ++begin;
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 }  // namespace
 }  // namespace cc