cc: fix for Ganesh in MSAA mode.

cc/resources/gpu_rasterizer.cc

 // Copyright 2015 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/gpu_rasterizer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 65 matching lines @@
 
     scoped_ptr<ScopedResource> resource;
     if (!analysis.is_solid_color) {
       resource = resource_pool->AcquireResource(tile->desired_texture_size(),
                                                 resource_format);
       AddToMultiPictureDraw(tile, resource.get(), &locks);
     }
     update_tile_draw_info.Run(tile, resource.Pass(), analysis);
   }
 
-  multi_picture_draw_.draw();
+  // If MSAA is enabled, tell Skia to resolve each render target after draw.
+  multi_picture_draw_.draw(msaa_sample_count_ > 0);
 }
 
 void GpuRasterizer::PerformSolidColorAnalysis(
     const Tile* tile,
     RasterSource::SolidColorAnalysis* analysis) {
   const void* tile_id = static_cast<const void*>(tile);
   frame_viewer_instrumentation::ScopedAnalyzeTask analyze_task(
       tile_id, tile->combined_priority().resolution,
       tile->source_frame_number(), tile->layer_id());
 
@@ skipping 43 matching lines @@
   tile->raster_source()->PlaybackToCanvas(canvas.get(), tile->content_rect(),
                                           tile->contents_scale());
   canvas->restore();
 
   // Add the canvas and recorded picture to |multi_picture_draw_|.
   skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
   multi_picture_draw_.add(sk_surface->getCanvas(), picture.get());
 }
 
 }  // namespace cc