Remove the concept of OutputSurface from ResourceProvider.

cc/raster/one_copy_raster_buffer_provider.cc

 // Copyright 2014 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/one_copy_raster_buffer_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
 #include "base/macros.h"
 #include "cc/base/math_util.h"
-#include "cc/raster/staging_buffer_pool.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/resource_format.h"
 #include "cc/resources/resource_util.h"
 #include "cc/resources/scoped_resource.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "ui/gfx/buffer_format_util.h"
 
 namespace cc {
@@ skipping 34 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
 // 4MiB is the size of 4 512x512 tiles, which has proven to be a good
 // default batch size for copy operations.
 const int kMaxBytesPerCopyOperation = 1024 * 1024 * 4;
 
 }  // namespace
 
-// static
-std::unique_ptr<RasterBufferProvider> OneCopyRasterBufferProvider::Create(
-    base::SequencedTaskRunner* task_runner,
-    ContextProvider* context_provider,
-    ResourceProvider* resource_provider,
-    int max_copy_texture_chromium_size,
-    bool use_partial_raster,
-    int max_staging_buffer_usage_in_bytes,
-    ResourceFormat preferred_tile_format) {
-  return base::WrapUnique<RasterBufferProvider>(new OneCopyRasterBufferProvider(
-      task_runner, resource_provider, max_copy_texture_chromium_size,
-      use_partial_raster, max_staging_buffer_usage_in_bytes,
-      preferred_tile_format));
-}
-
 OneCopyRasterBufferProvider::OneCopyRasterBufferProvider(
     base::SequencedTaskRunner* task_runner,
+    ContextProvider* compositor_context_provider,
+    ContextProvider* worker_context_provider,
     ResourceProvider* resource_provider,
     int max_copy_texture_chromium_size,
     bool use_partial_raster,
     int max_staging_buffer_usage_in_bytes,
     ResourceFormat preferred_tile_format)
-    : resource_provider_(resource_provider),
+    : compositor_context_provider_(compositor_context_provider),
+      worker_context_provider_(worker_context_provider),
+      resource_provider_(resource_provider),
       max_bytes_per_copy_operation_(
           max_copy_texture_chromium_size
               ? std::min(kMaxBytesPerCopyOperation,
                          max_copy_texture_chromium_size)
               : kMaxBytesPerCopyOperation),
       use_partial_raster_(use_partial_raster),
       bytes_scheduled_since_last_flush_(0),
-      preferred_tile_format_(preferred_tile_format) {
-  staging_pool_ = StagingBufferPool::Create(task_runner, resource_provider,
-                                            use_partial_raster,
-                                            max_staging_buffer_usage_in_bytes);
+      preferred_tile_format_(preferred_tile_format),
+      staging_pool_(task_runner,
+                    worker_context_provider,
+                    resource_provider,
+                    use_partial_raster,
+                    max_staging_buffer_usage_in_bytes) {
+  DCHECK(compositor_context_provider_);
+  DCHECK(worker_context_provider);
 }
 
 OneCopyRasterBufferProvider::~OneCopyRasterBufferProvider() {}
 
 std::unique_ptr<RasterBuffer>
 OneCopyRasterBufferProvider::AcquireBufferForRaster(
     const Resource* resource,
     uint64_t resource_content_id,
     uint64_t previous_content_id) {
   // TODO(danakj): If resource_content_id != 0, we only need to copy/upload
   // the dirty rect.
   return base::WrapUnique<RasterBuffer>(
       new RasterBufferImpl(this, resource_provider_, resource->format(),
                            resource, previous_content_id));
 }
 
 void OneCopyRasterBufferProvider::ReleaseBufferForRaster(
     std::unique_ptr<RasterBuffer> buffer) {
   // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
 }
 
 void OneCopyRasterBufferProvider::OrderingBarrier() {
   TRACE_EVENT0("cc", "OneCopyRasterBufferProvider::OrderingBarrier");
-
-  resource_provider_->output_surface()
-      ->context_provider()
-      ->ContextGL()
-      ->OrderingBarrierCHROMIUM();
+  compositor_context_provider_->ContextGL()->OrderingBarrierCHROMIUM();
 }
 
 ResourceFormat OneCopyRasterBufferProvider::GetResourceFormat(
     bool must_support_alpha) const {
   if (resource_provider_->IsResourceFormatSupported(preferred_tile_format_) &&
       (DoesResourceFormatSupportAlpha(preferred_tile_format_) ||
        !must_support_alpha)) {
     return preferred_tile_format_;
   }
 
   return resource_provider_->best_texture_format();
 }
 
 bool OneCopyRasterBufferProvider::GetResourceRequiresSwizzle(
     bool must_support_alpha) const {
   return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
 }
 
 void OneCopyRasterBufferProvider::Shutdown() {
-  staging_pool_->Shutdown();
+  staging_pool_.Shutdown();
 }
 
 void OneCopyRasterBufferProvider::PlaybackAndCopyOnWorkerThread(
     const Resource* resource,
     ResourceProvider::ScopedWriteLockGL* resource_lock,
     const RasterSource* raster_source,
     const gfx::Rect& raster_full_rect,
     const gfx::Rect& raster_dirty_rect,
     float scale,
     const RasterSource::PlaybackSettings& playback_settings,
     uint64_t previous_content_id,
     uint64_t new_content_id) {
   std::unique_ptr<StagingBuffer> staging_buffer =
-      staging_pool_->AcquireStagingBuffer(resource, previous_content_id);
+      staging_pool_.AcquireStagingBuffer(resource, previous_content_id);
 
   PlaybackToStagingBuffer(staging_buffer.get(), resource, raster_source,
                           raster_full_rect, raster_dirty_rect, scale,
                           playback_settings, previous_content_id,
                           new_content_id);
 
   CopyOnWorkerThread(staging_buffer.get(), resource, resource_lock,
                      raster_source, previous_content_id, new_content_id);
 
-  staging_pool_->ReleaseStagingBuffer(std::move(staging_buffer));
+  staging_pool_.ReleaseStagingBuffer(std::move(staging_buffer));
 }
 
 void OneCopyRasterBufferProvider::PlaybackToStagingBuffer(
     StagingBuffer* staging_buffer,
     const Resource* resource,
     const RasterSource* raster_source,
     const gfx::Rect& raster_full_rect,
     const gfx::Rect& raster_dirty_rect,
     float scale,
     const RasterSource::PlaybackSettings& playback_settings,
@@ skipping 40 matching lines @@
   }
 }
 
 void OneCopyRasterBufferProvider::CopyOnWorkerThread(
     StagingBuffer* staging_buffer,
     const Resource* resource,
     ResourceProvider::ScopedWriteLockGL* resource_lock,
     const RasterSource* raster_source,
     uint64_t previous_content_id,
     uint64_t new_content_id) {
-  ContextProvider* context_provider =
-      resource_provider_->output_surface()->worker_context_provider();
-  DCHECK(context_provider);
-
   {
-    ContextProvider::ScopedContextLock scoped_context(context_provider);
+    ContextProvider::ScopedContextLock scoped_context(worker_context_provider_);
 
     gpu::gles2::GLES2Interface* gl = scoped_context.ContextGL();
     DCHECK(gl);
 
     unsigned image_target =
         resource_provider_->GetImageTextureTarget(resource->format());
 
     // Create and bind staging texture.
     if (!staging_buffer->texture_id) {
       gl->GenTextures(1, &staging_buffer->texture_id);
@@ skipping 87 matching lines @@
     gl->OrderingBarrierCHROMIUM();
 
     // Generate sync token after the barrier for cross context synchronization.
     gpu::SyncToken sync_token;
     gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
     resource_lock->UpdateResourceSyncToken(sync_token);
   }
 }
 
 }  // namespace cc