Update from https://crrev.com/314320

cc/debug/rasterize_and_record_benchmark.h

 // Copyright 2013 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_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_
 #define CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_
 
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 20 matching lines @@
 
   // Implements MicroBenchmark interface.
   void DidUpdateLayers(LayerTreeHost* host) override;
   void RunOnLayer(PictureLayer* layer) override;
 
   scoped_ptr<MicroBenchmarkImpl> CreateBenchmarkImpl(
       scoped_refptr<base::MessageLoopProxy> origin_loop) override;
 
  private:
   void Run(Layer* layer);
+  void RunOnDisplayListLayer(PictureLayer* layer,
+                             const gfx::Rect& visible_content_rect);
+  void RunOnPictureLayer(PictureLayer* layer,
+                         const gfx::Rect& visible_content_rect);
 
   void RecordRasterResults(scoped_ptr<base::Value> results);
 
   struct RecordResults {
     RecordResults();
     ~RecordResults();
 
     int pixels_recorded;
     size_t bytes_used;
     base::TimeDelta total_best_time[Picture::RECORDING_MODE_COUNT];
   };
 
   RecordResults record_results_;
   int record_repeat_count_;
   scoped_ptr<base::Value> settings_;
   scoped_ptr<base::DictionaryValue> results_;
 
   // The following is used in DCHECKs.
   bool main_thread_benchmark_done_;
 
   LayerTreeHost* host_;
 
   base::WeakPtrFactory<RasterizeAndRecordBenchmark> weak_ptr_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_DEBUG_RASTERIZE_AND_RECORD_BENCHMARK_H_