Record SkPicture with correct LCD text setting.

cc/layers/tiled_layer_unittest.cc

 // Copyright 2011 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/tiled_layer.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/run_loop.h"
 #include "cc/resources/bitmap_content_layer_updater.h"
-#include "cc/resources/layer_painter.h"
+#include "cc/resources/content_layer_painter.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_update_controller.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/fake_rendering_stats_instrumentation.h"
 #include "cc/test/geometry_test_utils.h"
@@ skipping 1669 matching lines @@
       EXPECT_FALSE(child2_impl->HasResourceIdForTileAt(i, 0));
     }
   }
   layer_tree_host_->CommitComplete();
 
   ResourceManagerClearAllMemory(layer_tree_host_->contents_texture_manager(),
                                 resource_provider_.get());
   layer_tree_host_->SetRootLayer(NULL);
 }
 
-class TrackingLayerPainter : public LayerPainter {
+class TrackingLayerPainter : public ContentLayerPainter {
  public:
-  static scoped_ptr<TrackingLayerPainter> Create() {
-    return make_scoped_ptr(new TrackingLayerPainter());
+  static scoped_ptr<TrackingLayerPainter> Create(ContentLayerClient* client) {
+    return make_scoped_ptr(new TrackingLayerPainter(client));
   }
 
   virtual void Paint(SkCanvas* canvas,
                      const gfx::Rect& content_rect,
+                     bool can_paint_lcd_text,
                      gfx::RectF* opaque) OVERRIDE {
     painted_rect_ = content_rect;
   }
 
   gfx::Rect PaintedRect() const { return painted_rect_; }
   void ResetPaintedRect() { painted_rect_ = gfx::Rect(); }
 
+ protected:
+  explicit TrackingLayerPainter(ContentLayerClient* client)
+      : ContentLayerPainter(client) {}
+
  private:
   gfx::Rect painted_rect_;
 };
 
 class UpdateTrackingTiledLayer : public FakeTiledLayer {
  public:
   explicit UpdateTrackingTiledLayer(PrioritizedResourceManager* manager)
       : FakeTiledLayer(manager) {
-    scoped_ptr<TrackingLayerPainter> painter(TrackingLayerPainter::Create());
+    scoped_ptr<TrackingLayerPainter> painter(
+        TrackingLayerPainter::Create(NULL));
     tracking_layer_painter_ = painter.get();
-    layer_updater_ =
-        BitmapContentLayerUpdater::Create(painter.PassAs<LayerPainter>(),
-                                          &stats_instrumentation_,
-                                          0);
+    layer_updater_ = BitmapContentLayerUpdater::Create(
+        painter.PassAs<ContentLayerPainter>(), &stats_instrumentation_, 0);
   }
 
   TrackingLayerPainter* tracking_layer_painter() const {
     return tracking_layer_painter_;
   }
 
  private:
   virtual LayerUpdater* Updater() const OVERRIDE {
     return layer_updater_.get();
   }
@@ skipping 69 matching lines @@
   // Invalidate the entire layer in layer space. When painting, the rect given
   // to webkit should match the layer's bounds.
   layer->SetNeedsDisplayRect(layer_rect);
   layer->Update(queue_.get(), NULL);
 
   EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect());
 }
 
 }  // namespace
 }  // namespace cc