Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/layers/picture_layer.h

Index: cc/layers/picture_layer.h
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h
index 767de273302a37e1ff24f406b607689bfd01ff1e..648d1c93f142ea1d3c313f9a840cec9c478e9f98 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -33,6 +33,7 @@ class CC_EXPORT PictureLayer : public Layer {
   bool Update(ResourceUpdateQueue* queue,
               const OcclusionTracker<Layer>* occlusion) override;
   void SetIsMask(bool is_mask) override;
+  bool SupportsLCDText() const override;
   skia::RefPtr<SkPicture> GetPicture() const override;
   bool IsSuitableForGpuRasterization() const override;
 
@@ -55,6 +56,8 @@ class CC_EXPORT PictureLayer : public Layer {
   bool is_mask() const { return is_mask_; }
 
  private:
+  bool UpdateCanUseLCDText();
+
   ContentLayerClient* client_;
   scoped_ptr<RecordingSource> recording_source_;
   devtools_instrumentation::
@@ -66,6 +69,7 @@ class CC_EXPORT PictureLayer : public Layer {
   gfx::Rect last_updated_visible_content_rect_;
 
   int update_source_frame_number_;
+  bool can_use_lcd_text_for_update_;
   bool is_mask_;
   bool nearest_neighbor_;