Revert of Cache gpu suitability in DisplayItemList, remove SetUnsuitable...ForTesting

cc/playback/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/playback/display_list_recording_source.h"
 
 #include <algorithm>
 
 #include "cc/base/histograms.h"
 #include "cc/base/region.h"
@@ skipping 34 matching lines @@
     const gfx::Size& grid_cell_size)
     : slow_down_raster_scale_factor_for_debug_(0),
       gather_images_(false),
       requires_clear_(false),
       is_solid_color_(false),
       clear_canvas_with_debug_color_(kDefaultClearCanvasSetting),
       solid_color_(SK_ColorTRANSPARENT),
       background_color_(SK_ColorTRANSPARENT),
       pixel_record_distance_(kPixelDistanceToRecord),
       grid_cell_size_(grid_cell_size),
-      painter_reported_memory_usage_(0) {}
+      painter_reported_memory_usage_(0),
+      is_suitable_for_gpu_rasterization_(true) {}
 
 DisplayListRecordingSource::~DisplayListRecordingSource() {
 }
 
 // This method only really makes sense to call if the size of the layer didn't
 // change.
 bool DisplayListRecordingSource::ExposesEnoughNewArea(
     const gfx::Rect& current_recorded_viewport,
     const gfx::Rect& potential_new_recorded_viewport,
     const gfx::Size& layer_size) {
@@ skipping 109 matching lines @@
       // case RecordingSource::RECORD_WITH_SK_NULL_CANVAS should not be reached
       NOTREACHED();
   }
 
   // TODO(vmpstr): Add a slow_down_recording_scale_factor_for_debug_ to be able
   // to slow down recording.
   display_list_ =
       painter->PaintContentsToDisplayList(recorded_viewport_, painting_control);
   painter_reported_memory_usage_ = painter->GetApproximateUnsharedMemoryUsage();
 
+  is_suitable_for_gpu_rasterization_ =
+      display_list_->IsSuitableForGpuRasterization();
   DetermineIfSolidColor();
   display_list_->EmitTraceSnapshot();
   if (gather_images_)
     display_list_->GatherDiscardableImages(grid_cell_size_);
 
   return true;
 }
 
 gfx::Size DisplayListRecordingSource::GetSize() const {
   return size_;
@@ skipping 14 matching lines @@
 }
 
 void DisplayListRecordingSource::SetBackgroundColor(SkColor background_color) {
   background_color_ = background_color;
 }
 
 void DisplayListRecordingSource::SetRequiresClear(bool requires_clear) {
   requires_clear_ = requires_clear;
 }
 
+void DisplayListRecordingSource::SetUnsuitableForGpuRasterizationForTesting() {
+  is_suitable_for_gpu_rasterization_ = false;
+}
+
 bool DisplayListRecordingSource::IsSuitableForGpuRasterization() const {
-  // The display list needs to be created (see: UpdateAndExpandInvalidation)
-  // before checking for suitability.
-  DCHECK(display_list_);
-  return display_list_->IsSuitableForGpuRasterization();
+  return is_suitable_for_gpu_rasterization_;
 }
 
 scoped_refptr<RasterSource> DisplayListRecordingSource::CreateRasterSource(
     bool can_use_lcd_text) const {
   return scoped_refptr<RasterSource>(
       DisplayListRasterSource::CreateFromDisplayListRecordingSource(
           this, can_use_lcd_text));
 }
 
 void DisplayListRecordingSource::DetermineIfSolidColor() {
-  DCHECK(display_list_);
+  DCHECK(display_list_.get());
   is_solid_color_ = false;
   solid_color_ = SK_ColorTRANSPARENT;
 
   if (!display_list_->ShouldBeAnalyzedForSolidColor())
     return;
 
   gfx::Size layer_size = GetSize();
   skia::AnalysisCanvas canvas(layer_size.width(), layer_size.height());
   display_list_->Raster(&canvas, nullptr, gfx::Rect(), 1.f);
   is_solid_color_ = canvas.GetColorIfSolid(&solid_color_);
 }
 
 void DisplayListRecordingSource::Clear() {
   recorded_viewport_ = gfx::Rect();
-  display_list_ = nullptr;
+  display_list_ = NULL;
   painter_reported_memory_usage_ = 0;
   is_solid_color_ = false;
 }
 
 }  // namespace cc