Revert "Speculative revert by sheriff"

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/histograms.h"
 #include "cc/base/region.h"
@@ skipping 101 matching lines @@
 
   int repeat_count = 1;
   if (slow_down_raster_scale_factor_for_debug_ > 1) {
     repeat_count = slow_down_raster_scale_factor_for_debug_;
     if (painting_control !=
         ContentLayerClient::DISPLAY_LIST_CONSTRUCTION_DISABLED) {
       painting_control = ContentLayerClient::DISPLAY_LIST_CACHING_DISABLED;
     }
   }
   for (int i = 0; i < repeat_count; ++i) {
-    display_list_ = painter->PaintContentsToDisplayList(recorded_viewport_,
-                                                        painting_control);
+    const bool use_cached_picture = true;
+    display_list_ =
+        DisplayItemList::Create(recorded_viewport_, use_cached_picture);
+    painter->PaintContentsToDisplayList(display_list_.get(), recorded_viewport_,
+                                        painting_control);
   }
-  display_list_->set_layer_rect(recorded_viewport_);
+  display_list_->CreateAndCacheSkPicture();
+
   is_suitable_for_gpu_rasterization_ =
       display_list_->IsSuitableForGpuRasterization();
-
   DetermineIfSolidColor();
   display_list_->EmitTraceSnapshot();
-
-  display_list_->CreateAndCacheSkPicture();
   if (gather_pixel_refs_)
     display_list_->GatherPixelRefs(grid_cell_size_);
 
   return true;
 }
 
 gfx::Size DisplayListRecordingSource::GetSize() const {
   return size_;
 }
 
@@ skipping 51 matching lines @@
   is_solid_color_ = canvas.GetColorIfSolid(&solid_color_);
 }
 
 void DisplayListRecordingSource::Clear() {
   recorded_viewport_ = gfx::Rect();
   display_list_ = NULL;
   is_solid_color_ = false;
 }
 
 }  // namespace cc