Remove implicit conversions from scoped_refptr to T* in cc/

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 1042 matching lines @@
         shared_bitmap_manager_->GetSharedBitmapFromId(
             resource->size, resource->shared_bitmap_id);
     if (bitmap) {
       resource->shared_bitmap = bitmap.release();
       resource->pixels = resource->shared_bitmap->pixels();
     }
   }
 
   resource->lock_for_read_count++;
   if (resource->read_lock_fences_enabled) {
-    if (current_read_lock_fence_)
+    if (current_read_lock_fence_.get())
       current_read_lock_fence_->Set();
     resource->read_lock_fence = current_read_lock_fence_;
   }
 
   return resource;
 }
 
 void ResourceProvider::UnlockForRead(ResourceId id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   ResourceMap::iterator it = resources_.find(id);
@@ skipping 443 matching lines @@
 
     CHECK_GE(resource->exported_count, returned.count);
     resource->exported_count -= returned.count;
     resource->lost |= returned.lost;
     if (resource->exported_count)
       continue;
 
     // Need to wait for the current read lock fence to pass before we can
     // recycle this resource.
     if (resource->read_lock_fences_enabled) {
-      if (current_read_lock_fence_)
+      if (current_read_lock_fence_.get())
         current_read_lock_fence_->Set();
       resource->read_lock_fence = current_read_lock_fence_;
     }
 
     if (returned.sync_point) {
       DCHECK(!resource->has_shared_bitmap_id);
       if (resource->origin == Resource::Internal) {
         DCHECK(resource->gl_id);
         GLC(gl, gl->WaitSyncPointCHROMIUM(returned.sync_point));
       } else {
@@ skipping 716 matching lines @@
   resource->mailbox.set_sync_point(0);
 }
 
 GLint ResourceProvider::GetActiveTextureUnit(GLES2Interface* gl) {
   GLint active_unit = 0;
   gl->GetIntegerv(GL_ACTIVE_TEXTURE, &active_unit);
   return active_unit;
 }
 
 GLES2Interface* ResourceProvider::ContextGL() const {
-  ContextProvider* context_provider = output_surface_->context_provider();
+  scoped_refptr<ContextProvider> context_provider =

[enne (OOO), 2014/08/25 23:39:12]

This is a local alias, not an ownership transfer.  No need for this
scoped_refptr.

[dcheng, 2014/08/25 23:44:56]

Done.

+      output_surface_->context_provider();
   return context_provider ? context_provider->ContextGL() : NULL;
 }
 
 class GrContext* ResourceProvider::GrContext() const {
-  ContextProvider* context_provider = output_surface_->context_provider();

[enne (OOO), 2014/08/25 23:39:11]

This is a local alias, not an ownership transfer.  No need for this
scoped_refptr.

[enne (OOO), 2014/08/25 23:39:12]

Same here.

[dcheng, 2014/08/25 23:44:56]

Done.

+  scoped_refptr<ContextProvider> context_provider =
+      output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc