Remove the concept of OutputSurface from ResourceProvider.

cc/raster/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/raster/gpu_rasterizer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/frame_viewer_instrumentation.h"
 #include "cc/output/context_provider.h"
 #include "cc/playback/raster_source.h"
 #include "cc/raster/raster_buffer.h"
 #include "cc/raster/scoped_gpu_raster.h"
 #include "cc/resources/resource.h"
-#include "cc/resources/resource_provider.h"
 #include "cc/tiles/tile_manager.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace cc {
 
-GpuRasterizer::GpuRasterizer(ContextProvider* context_provider,
+GpuRasterizer::GpuRasterizer(ContextProvider* worker_context_provider,
                              ResourceProvider* resource_provider,
                              bool use_distance_field_text,
                              int msaa_sample_count)
-    : resource_provider_(resource_provider),
+    : worker_context_provider_(worker_context_provider),
+      resource_provider_(resource_provider),
       use_distance_field_text_(use_distance_field_text),
       msaa_sample_count_(msaa_sample_count) {
+  DCHECK(worker_context_provider_);
 }
 
 GpuRasterizer::~GpuRasterizer() {
 }
 
 void GpuRasterizer::RasterizeSource(
     ResourceProvider::ScopedWriteLockGr* write_lock,
     const RasterSource* raster_source,
     const gfx::Rect& raster_full_rect,
     const gfx::Rect& playback_rect,
@@ skipping 11 matching lines @@
   canvas->restore();
   sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
 
   // Turn on distance fields for layers that have ever animated.
   bool use_distance_field_text =
       use_distance_field_text_ ||
       raster_source->ShouldAttemptToUseDistanceFieldText();
 
   // Playback picture into resource.
   {
-    ScopedGpuRaster gpu_raster(
-        resource_provider_->output_surface()->worker_context_provider());
-    write_lock->InitSkSurface(use_distance_field_text,
-                              raster_source->CanUseLCDText(),
-                              msaa_sample_count_);
+    ScopedGpuRaster gpu_raster(worker_context_provider_);
+    write_lock->InitSkSurface(
+        worker_context_provider_->GrContext(), use_distance_field_text,
+        raster_source->CanUseLCDText(), msaa_sample_count_);
 
     SkSurface* sk_surface = write_lock->sk_surface();
 
     // Allocating an SkSurface will fail after a lost context.  Pretend we
     // rasterized, as the contents of the resource don't matter anymore.
     if (!sk_surface)
       return;
 
     SkMultiPictureDraw multi_picture_draw;
     multi_picture_draw.add(sk_surface->getCanvas(), picture.get());
     multi_picture_draw.draw(false);
     write_lock->ReleaseSkSurface();
   }
 }
 
 }  // namespace cc