cc: Refactor ResourceProvider.

cc/resources/resource_provider.cc

 // Copyright 2012 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/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 997 matching lines @@
 
   base::TimeDelta upload_one_texture_time =
       base::TimeDelta::FromMicroseconds(
           base::Time::kMicrosecondsPerSecond * kTextureUploadTickRate) /
       uploads_per_tick;
 
   size_t total_uploads = NumBlockingUploads() + uploads_per_tick;
   return gfx::FrameTime::Now() + upload_one_texture_time * total_uploads;
 }
 
-void ResourceProvider::Flush() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  GLES2Interface* gl = ContextGL();
-  if (gl)
-    gl->Flush();
-}
-
-void ResourceProvider::Finish() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  GLES2Interface* gl = ContextGL();
-  if (gl)
-    gl->Finish();
-}
-
-bool ResourceProvider::ShallowFlushIfSupported() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  GLES2Interface* gl = ContextGL();
-  if (!gl)
-    return false;
-
-  gl->ShallowFlushCHROMIUM();
-  return true;
-}
-
 ResourceProvider::Resource* ResourceProvider::GetResource(ResourceId id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   ResourceMap::iterator it = resources_.find(id);
   CHECK(it != resources_.end());
   return &it->second;
 }
 
 const ResourceProvider::Resource* ResourceProvider::LockForRead(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(!resource->locked_for_write ||
@@ skipping 170 matching lines @@
   ResourceProvider::PopulateSkBitmapWithResource(
       &sk_bitmap_, resource_provider->LockForWrite(resource_id));
   DCHECK(valid());
   sk_canvas_.reset(new SkCanvas(sk_bitmap_));
 }
 
 ResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware() {
   resource_provider_->UnlockForWrite(resource_id_);
 }
 
-ResourceProvider::ScopedGpuRaster::ScopedGpuRaster(
-    ResourceProvider* resource_provider)
-    : resource_provider_(resource_provider) {
-  resource_provider_->BeginGpuRaster();
-}
-
-ResourceProvider::ScopedGpuRaster::~ScopedGpuRaster() {
-  resource_provider_->EndGpuRaster();
-}
-
 ResourceProvider::ResourceProvider(OutputSurface* output_surface,
                                    SharedBitmapManager* shared_bitmap_manager,
                                    int highp_threshold_min,
                                    bool use_rgba_4444_texture_format,
                                    size_t id_allocation_chunk_size,
                                    bool use_distance_field_text)
     : output_surface_(output_surface),
       shared_bitmap_manager_(shared_bitmap_manager),
       lost_output_surface_(false),
       highp_threshold_min_(highp_threshold_min),
@@ skipping 72 matching lines @@
   for (ResourceMap::const_iterator itr = resources_.begin();
        itr != resources_.end();
        ++itr) {
     DCHECK_NE(GLTexture, itr->second.type);
   }
 #endif  // DCHECK_IS_ON
 
   texture_uploader_.reset();
   texture_id_allocator_.reset();
   buffer_id_allocator_.reset();
-  Finish();
+  gl->Finish();
 }
 
 int ResourceProvider::CreateChild(const ReturnCallback& return_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Child child_info;
   child_info.return_callback = return_callback;
 
   int child = next_child_++;
   children_[child] = child_info;
@@ skipping 931 matching lines @@
 GLES2Interface* ResourceProvider::ContextGL() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->ContextGL() : NULL;
 }
 
 class GrContext* ResourceProvider::GrContext() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
-void ResourceProvider::BeginGpuRaster() {
-  GLES2Interface* gl = ContextGL();
+ScopedGpuRaster::ScopedGpuRaster(ResourceProvider* resource_provider)

[danakj, 2014/07/10 17:01:44]

This class should take a ContextProvider* instead of a ResourceProvider*

[sohanjg, 2014/07/11 16:43:32]

Done.

+    : resource_provider_(resource_provider) {
+  BeginGpuRaster();
+}
+
+ScopedGpuRaster::~ScopedGpuRaster() {
+  EndGpuRaster();
+}
+
+void ScopedGpuRaster::BeginGpuRaster() {
+  GLES2Interface* gl = resource_provider_->ContextGL();
   DCHECK(gl);
 
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function
   // arguments even when tracing is disabled.
   gl->PushGroupMarkerEXT(0, "GpuRasterization");
 
-  class GrContext* gr_context = GrContext();
+  class GrContext* gr_context = resource_provider_->GrContext();
   if (gr_context)
     gr_context->resetContext();
 }
 
-void ResourceProvider::EndGpuRaster() {
-  GLES2Interface* gl = ContextGL();
+void ScopedGpuRaster::EndGpuRaster() {
+  GLES2Interface* gl = resource_provider_->ContextGL();
   DCHECK(gl);
 
-  class GrContext* gr_context = GrContext();
+  class GrContext* gr_context = resource_provider_->GrContext();
   if (gr_context)
     gr_context->flush();
 
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function
   // arguments even when tracing is disabled.
   gl->PopGroupMarkerEXT();
 }
 
 }  // namespace cc