Plumb can_use_lcd_text, contents_opaque directly to ContentLayerClient.

cc/resources/picture.h

 // Copyright 2012 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.
 
 #ifndef CC_RESOURCES_PICTURE_H_
 #define CC_RESOURCES_PICTURE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 36 matching lines @@
   enum RecordingMode {
     RECORD_NORMALLY,
     RECORD_WITH_SK_NULL_CANVAS,
     RECORD_WITH_PAINTING_DISABLED,
     RECORDING_MODE_COUNT,  // Must be the last entry.
   };
 
   static scoped_refptr<Picture> Create(
       const gfx::Rect& layer_rect,
       ContentLayerClient* client,
+      bool can_use_lcd_text,
+      bool contents_opaque,
       const SkTileGridFactory::TileGridInfo& tile_grid_info,
       bool gather_pixels_refs,
       RecordingMode recording_mode);
   static scoped_refptr<Picture> CreateFromValue(const base::Value* value);
   static scoped_refptr<Picture> CreateFromSkpValue(const base::Value* value);
 
   gfx::Rect LayerRect() const { return layer_rect_; }
 
   // Has Record() been called yet?
   bool HasRecording() const { return picture_.get() != NULL; }
@@ skipping 66 matching lines @@
   Picture(const skia::RefPtr<SkPicture>&,
           const gfx::Rect& layer_rect,
           const PixelRefMap& pixel_refs);
   // This constructor will call AdoptRef on the SkPicture.
   Picture(SkPicture*, const gfx::Rect& layer_rect);
   ~Picture();
 
   // Record a paint operation. To be able to safely use this SkPicture for
   // playback on a different thread this can only be called once.
   void Record(ContentLayerClient* client,
+              bool can_use_lcd_text,
+              bool contents_opaque,
               const SkTileGridFactory::TileGridInfo& tile_grid_info,
               RecordingMode recording_mode);
 
   // Gather pixel refs from recording.
   void GatherPixelRefs(const SkTileGridFactory::TileGridInfo& tile_grid_info);
 
   gfx::Rect layer_rect_;
   skia::RefPtr<SkPicture> picture_;
 
   PixelRefMap pixel_refs_;
   gfx::Point min_pixel_cell_;
   gfx::Point max_pixel_cell_;
   gfx::Size cell_size_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat>
     AsTraceableRasterData(float scale) const;
   scoped_refptr<base::debug::ConvertableToTraceFormat>
     AsTraceableRecordData() const;
 
   friend class base::RefCountedThreadSafe<Picture>;
   friend class PixelRefIterator;
   DISALLOW_COPY_AND_ASSIGN(Picture);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_H_