Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/resources/display_list_recording_source.cc

 // Copyright 2014 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/resources/display_list_recording_source.h"
 
 #include <algorithm>
 
 #include "cc/base/region.h"
 #include "cc/layers/content_layer_client.h"
@@ skipping 10 matching lines @@
 // We don't perform solid color analysis on images that have more than 10 skia
 // operations.
 const int kOpCountThatIsOkToAnalyze = 10;
 
 }  // namespace
 
 namespace cc {
 
 DisplayListRecordingSource::DisplayListRecordingSource()
     : slow_down_raster_scale_factor_for_debug_(0),
+      can_use_lcd_text_(true),
       requires_clear_(false),
       is_solid_color_(false),
       solid_color_(SK_ColorTRANSPARENT),
       background_color_(SK_ColorTRANSPARENT),
       pixel_record_distance_(kPixelDistanceToRecord),
       is_suitable_for_gpu_rasterization_(true) {
 }
 
 DisplayListRecordingSource::~DisplayListRecordingSource() {
 }
 
 bool DisplayListRecordingSource::UpdateAndExpandInvalidation(
     ContentLayerClient* painter,
     Region* invalidation,
+    bool can_use_lcd_text,
     const gfx::Size& layer_size,
     const gfx::Rect& visible_layer_rect,
     int frame_number,
     RecordingMode recording_mode) {
   bool updated = false;
 
   if (size_ != layer_size) {
     size_ = layer_size;
     updated = true;
   }
 
+  if (can_use_lcd_text_ != can_use_lcd_text) {
+    can_use_lcd_text_ = can_use_lcd_text;
+    invalidation->Union(gfx::Rect(GetSize()));
+    updated = true;
+  }
+
   gfx::Rect old_recorded_viewport = recorded_viewport_;
   recorded_viewport_ = visible_layer_rect;
   recorded_viewport_.Inset(-pixel_record_distance_, -pixel_record_distance_);
   recorded_viewport_.Intersect(gfx::Rect(GetSize()));
 
   if (recorded_viewport_ != old_recorded_viewport) {
     // Invalidate newly-exposed and no-longer-exposed areas.
     Region newly_exposed_region(recorded_viewport_);
     newly_exposed_region.Subtract(old_recorded_viewport);
     invalidation->Union(newly_exposed_region);
@@ skipping 71 matching lines @@
 }
 
 void DisplayListRecordingSource::SetUnsuitableForGpuRasterizationForTesting() {
   is_suitable_for_gpu_rasterization_ = false;
 }
 
 bool DisplayListRecordingSource::IsSuitableForGpuRasterization() const {
   return is_suitable_for_gpu_rasterization_;
 }
 
-scoped_refptr<RasterSource> DisplayListRecordingSource::CreateRasterSource(
-    bool can_use_lcd_text) const {
+scoped_refptr<RasterSource> DisplayListRecordingSource::CreateRasterSource()
+    const {
   return scoped_refptr<RasterSource>(
-      DisplayListRasterSource::CreateFromDisplayListRecordingSource(
-          this, can_use_lcd_text));
+      DisplayListRasterSource::CreateFromDisplayListRecordingSource(this));
 }
 
 gfx::Size DisplayListRecordingSource::GetTileGridSizeForTesting() const {
   return gfx::Size();
 }
 
 void DisplayListRecordingSource::DetermineIfSolidColor() {
   DCHECK(display_list_.get());
   is_solid_color_ = false;
   solid_color_ = SK_ColorTRANSPARENT;
 
   if (display_list_->ApproximateOpCount() > kOpCountThatIsOkToAnalyze)
     return;
 
   gfx::Size layer_size = GetSize();
   skia::AnalysisCanvas canvas(layer_size.width(), layer_size.height());
   display_list_->Raster(&canvas, nullptr, 1.f);
   is_solid_color_ = canvas.GetColorIfSolid(&solid_color_);
 }
 
 void DisplayListRecordingSource::Clear() {
   recorded_viewport_ = gfx::Rect();
   display_list_ = NULL;
   is_solid_color_ = false;
 }
 
 }  // namespace cc