Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/layers/layer.h

 // Copyright 2010 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_LAYERS_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 224 matching lines @@
   }
   bool draw_transform_is_animating() const {
     return draw_properties_.target_space_transform_is_animating;
   }
   bool screen_space_transform_is_animating() const {
     return draw_properties_.screen_space_transform_is_animating;
   }
   bool screen_space_opacity_is_animating() const {
     return draw_properties_.screen_space_opacity_is_animating;
   }
+  bool can_use_lcd_text() const { return draw_properties_.can_use_lcd_text; }
   bool is_clipped() const { return draw_properties_.is_clipped; }
   gfx::Rect clip_rect() const { return draw_properties_.clip_rect; }
   gfx::Rect drawable_content_rect() const {
     return draw_properties_.drawable_content_rect;
   }
   gfx::Rect visible_content_rect() const {
     return draw_properties_.visible_content_rect;
   }
   Layer* render_target() {
     DCHECK(!draw_properties_.render_target ||
@@ skipping 194 matching lines @@
   }
 
   // The scale at which contents should be rastered, to match the scale at
   // which they will drawn to the screen. This scale is a component of the
   // contents scale but does not include page/device scale factors.
   // TODO(danakj): This goes away when TiledLayer goes away.
   void set_raster_scale(float scale) { raster_scale_ = scale; }
   float raster_scale() const { return raster_scale_; }
   bool raster_scale_is_unknown() const { return raster_scale_ == 0.f; }
 
+  virtual bool SupportsLCDText() const;
+
   void SetNeedsPushProperties();
   bool needs_push_properties() const { return needs_push_properties_; }
   bool descendant_needs_push_properties() const {
     return num_dependents_need_push_properties_ > 0;
   }
   void reset_needs_push_properties_for_testing() {
     needs_push_properties_ = false;
   }
 
   virtual void RunMicroBenchmark(MicroBenchmark* benchmark);
@@ skipping 242 matching lines @@
 
   std::vector<FrameTimingRequest> frame_timing_requests_;
   bool frame_timing_requests_dirty_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_