cc: GPU rasterize to an auxiliary surface when using MSAA renderbuffers

cc/raster/gpu_rasterizer.h

 // 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.
 
 #ifndef CC_RASTER_GPU_RASTERIZER_H_
 #define CC_RASTER_GPU_RASTERIZER_H_
 
 #include <vector>
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/raster_source.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/tiles/tile.h"
-#include "third_party/skia/include/core/SkMultiPictureDraw.h"
+#include "third_party/skia/include/core/SkSurface.h"
 
 namespace cc {
 
 class ContextProvider;
 class RasterSource;
 class ResourceProvider;
+class ScopedGpuRaster;
 
 class CC_EXPORT GpuRasterizer {
  public:
   ~GpuRasterizer();
 
   void RasterizeSource(ResourceProvider::ScopedWriteLockGr* write_lock,
                        const RasterSource* raster_source,
                        const gfx::Rect& raster_full_rect,
                        const gfx::Rect& playback_rect,
                        float scale,
                        const RasterSource::PlaybackSettings& playback_settings);
 
   ResourceProvider* resource_provider() { return resource_provider_; }
 
  private:
   GpuRasterizer(ContextProvider* context_provider,
                 ResourceProvider* resource_provider,
                 bool use_distance_filed_text,
                 int msaa_sample_count);
+  SkSurface* AcquireSurface(const ScopedGpuRaster&,
+                            ContextProvider*,
+                            ResourceProvider::ScopedWriteLockGr*,
+                            bool use_device_independent_fonts,
+                            bool can_use_lcd_text);
+  void ReleaseSurface(const ScopedGpuRaster&,
+                      ResourceProvider::ScopedWriteLockGr*);
+  void AllocateMSAASurfaceIfNeeded(const SkImageInfo&,
+                                   bool use_device_independent_fonts,
+                                   bool can_use_lcd_text);
 
   ResourceProvider* resource_provider_;
 
-  bool use_distance_field_text_;
+  bool use_device_independent_fonts_;
   int msaa_sample_count_;
 
+  sk_sp<SkSurface> msaa_surface_;
+  SkImageInfo msaa_surface_image_info_;
+  bool msaa_surface_use_device_independent_fonts_;
+  bool msaa_surface_can_use_lcd_text_;
   friend class GpuTileTaskWorkerPool;
   DISALLOW_COPY_AND_ASSIGN(GpuRasterizer);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_GPU_RASTERIZER_H_