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

cc/raster/gpu_rasterizer.h

Index: cc/raster/gpu_rasterizer.h
diff --git a/cc/raster/gpu_rasterizer.h b/cc/raster/gpu_rasterizer.h
index d1951436d538e7cee74b6ea8eff3df2b82270e16..57b419da6f17543715801787dbaf22d27442d89a 100644
--- a/cc/raster/gpu_rasterizer.h
+++ b/cc/raster/gpu_rasterizer.h
@@ -12,13 +12,14 @@
 #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:
@@ -38,12 +39,26 @@ class CC_EXPORT GpuRasterizer {
                 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);
 };