Plumb can_use_lcd_text, contents_opaque directly to ContentLayerClient.

cc/layers/picture_layer_impl_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/picture_layer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <utility>
@@ skipping 4482 matching lines @@
   FakeRenderingStatsInstrumentation stats_instrumentation;
 
   client.set_fill_with_nonsolid_color(!test_for_solid);
 
   Region invalidation(layer_rect);
   pile->UpdateAndExpandInvalidation(&client,
                                     &invalidation,
                                     SK_ColorWHITE,
                                     false,
                                     false,
+                                    false,
                                     layer_bounds,
                                     layer_rect,
                                     frame_number++,
                                     Picture::RECORD_NORMALLY,
                                     &stats_instrumentation);
 
   scoped_refptr<PicturePileImpl> pending_pile =
       PicturePileImpl::CreateFromOther(pile);
 
   SetupPendingTree(pending_pile);
@@ skipping 55 matching lines @@
   FakeRenderingStatsInstrumentation stats_instrumentation;
 
   client.set_fill_with_nonsolid_color(true);
 
   Region invalidation1(layer_rect);
   pile->UpdateAndExpandInvalidation(&client,
                                     &invalidation1,
                                     SK_ColorWHITE,
                                     false,
                                     false,
+                                    false,
                                     layer_bounds,
                                     layer_rect,
                                     frame_number++,
                                     Picture::RECORD_NORMALLY,
                                     &stats_instrumentation);
 
   scoped_refptr<PicturePileImpl> pending_pile1 =
       PicturePileImpl::CreateFromOther(pile);
 
   SetupPendingTree(pending_pile1);
   ActivateTree();
   host_impl_.active_tree()->UpdateDrawProperties();
 
   // We've started with a solid layer that contains some tilings.
   ASSERT_TRUE(active_layer_->tilings());
   EXPECT_NE(0u, active_layer_->tilings()->num_tilings());
 
   client.set_fill_with_nonsolid_color(false);
 
   Region invalidation2(layer_rect);
   pile->UpdateAndExpandInvalidation(&client,
                                     &invalidation2,
                                     SK_ColorWHITE,
                                     false,
                                     false,
+                                    false,
                                     layer_bounds,
                                     layer_rect,
                                     frame_number++,
                                     Picture::RECORD_NORMALLY,
                                     &stats_instrumentation);
 
   scoped_refptr<PicturePileImpl> pending_pile2 =
       PicturePileImpl::CreateFromOther(pile);
 
   SetupPendingTree(pending_pile2);
@@ skipping 123 matching lines @@
   result = layer->CalculateTileSize(gfx::Size(447, 400));
   EXPECT_EQ(result.width(), 448);
   EXPECT_EQ(result.height(), 448);
   result = layer->CalculateTileSize(gfx::Size(500, 499));
   EXPECT_EQ(result.width(), 512);
   EXPECT_EQ(result.height(), 500 + 2);
 }
 
 }  // namespace
 }  // namespace cc