| Index: cc/playback/display_list_raster_source.cc | 
| diff --git a/cc/playback/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc | 
| index cc4f7a7807d4b95b21a292c48d7440b560fbc222..db630821b92fe352a404a5e9f63a522bdd072ddc 100644 | 
| --- a/cc/playback/display_list_raster_source.cc | 
| +++ b/cc/playback/display_list_raster_source.cc | 
| @@ -217,11 +217,10 @@ size_t DisplayListRasterSource::GetPictureMemoryUsage() const { | 
| painter_reported_memory_usage_; | 
| } | 
|  | 
| -void DisplayListRasterSource::PerformSolidColorAnalysis( | 
| +bool DisplayListRasterSource::PerformSolidColorAnalysis( | 
| const gfx::Rect& content_rect, | 
| float contents_scale, | 
| -    DisplayListRasterSource::SolidColorAnalysis* analysis) const { | 
| -  DCHECK(analysis); | 
| +    SkColor* color) const { | 
| TRACE_EVENT0("cc", "DisplayListRasterSource::PerformSolidColorAnalysis"); | 
|  | 
| gfx::Rect layer_rect = | 
| @@ -230,7 +229,7 @@ void DisplayListRasterSource::PerformSolidColorAnalysis( | 
| layer_rect.Intersect(gfx::Rect(size_)); | 
| skia::AnalysisCanvas canvas(layer_rect.width(), layer_rect.height()); | 
| RasterForAnalysis(&canvas, layer_rect, 1.0f); | 
| -  analysis->is_solid_color = canvas.GetColorIfSolid(&analysis->solid_color); | 
| +  return canvas.GetColorIfSolid(color); | 
| } | 
|  | 
| void DisplayListRasterSource::GetDiscardableImagesInRect( | 
|  |