Remove the concept of OutputSurface from ResourceProvider.

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"
@@ skipping 13 matching lines @@
  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_; }
+  ResourceProvider* resource_provider() const { return resource_provider_; }
+  ContextProvider* worker_context_provider() const {
+    return worker_context_provider_;
+  }
 
  private:
-  GpuRasterizer(ContextProvider* context_provider,
+  GpuRasterizer(ContextProvider* worker_context_provider,
                 ResourceProvider* resource_provider,
                 bool use_distance_filed_text,
                 int msaa_sample_count);
 
+  ContextProvider* worker_context_provider_;
   ResourceProvider* resource_provider_;
 
   bool use_distance_field_text_;
   int msaa_sample_count_;
 
   friend class GpuRasterBufferProvider;
   DISALLOW_COPY_AND_ASSIGN(GpuRasterizer);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_GPU_RASTERIZER_H_