Record SkPicture with correct LCD text setting.

cc/layers/content_layer.h

Index: cc/layers/content_layer.h
diff --git a/cc/layers/content_layer.h b/cc/layers/content_layer.h
index 9bef22bb704728015360a4b3351ac7dfa5f2bc77..4494ecf5d78aa6e453d8d2fffb8af646b359e2a4 100644
--- a/cc/layers/content_layer.h
+++ b/cc/layers/content_layer.h
@@ -8,31 +8,12 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/tiled_layer.h"
-#include "cc/resources/layer_painter.h"
-
-class SkCanvas;
 
 namespace cc {
 
 class ContentLayerClient;
 class ContentLayerUpdater;
 
-class CC_EXPORT ContentLayerPainter : public LayerPainter {
- public:
-  static scoped_ptr<ContentLayerPainter> Create(ContentLayerClient* client);
-
-  virtual void Paint(SkCanvas* canvas,
-                     const gfx::Rect& content_rect,
-                     gfx::RectF* opaque) OVERRIDE;
-
- private:
-  explicit ContentLayerPainter(ContentLayerClient* client);
-
-  ContentLayerClient* client_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentLayerPainter);
-};
-
 // A layer that renders its contents into an SkCanvas.
 class CC_EXPORT ContentLayer : public TiledLayer {
  public:
@@ -67,11 +48,11 @@ class CC_EXPORT ContentLayer : public TiledLayer {
   // TiledLayer implementation.
   virtual void CreateUpdaterIfNeeded() OVERRIDE;
 
-  void UpdateCanUseLCDText();
+  void UpdateUseLCDText();
 
   ContentLayerClient* client_;
   scoped_refptr<ContentLayerUpdater> updater_;
-  bool can_use_lcd_text_last_frame_;
+  bool use_lcd_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentLayer);
 };