Remove implicit conversions from scoped_refptr to T* in content/renderer/pepper/

content/renderer/pepper/pepper_compositor_host.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 "content/renderer/pepper/pepper_compositor_host.h"
 
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 201 matching lines @@
   gfx::Transform transform(gfx::Transform::kSkipInitialization);
   transform.matrix().setColMajorf(new_layer->common.transform.matrix);
   layer->SetTransform(transform);
 
   // Consider a (0,0,0,0) rect as no clip rect.
   if (new_layer->common.clip_rect.point.x != 0 ||
       new_layer->common.clip_rect.point.y != 0 ||
       new_layer->common.clip_rect.size.width != 0 ||
       new_layer->common.clip_rect.size.height != 0) {
     scoped_refptr<cc::Layer> clip_parent = layer->parent();
-    if (clip_parent == layer_) {
+    if (clip_parent.get() == layer_.get()) {
       // Create a clip parent layer, if it does not exist.
       clip_parent = cc::Layer::Create();
       clip_parent->SetMasksToBounds(true);
       clip_parent->SetIsDrawable(true);
-      layer_->ReplaceChild(layer, clip_parent);
+      layer_->ReplaceChild(layer.get(), clip_parent);
       clip_parent->AddChild(layer);
     }
     gfx::Point position = PP_ToGfxPoint(new_layer->common.clip_rect.point);
     clip_parent->SetPosition(position);
     clip_parent->SetBounds(PP_ToGfxSize(new_layer->common.clip_rect.size));
     layer->SetPosition(gfx::Point(-position.x(), -position.y()));
-  } else if (layer->parent() != layer_) {
+  } else if (layer->parent() != layer_.get()) {
     // Remove the clip parent layer.
     layer_->ReplaceChild(layer->parent(), layer);
     layer->SetPosition(gfx::Point());
   }
 
   if (new_layer->color) {
     layer->SetBackgroundColor(SkColorSetARGBMacro(
         new_layer->color->alpha * 255,
         new_layer->color->red * 255,
         new_layer->color->green * 255,
@@ skipping 96 matching lines @@
 
   // ResetLayers() has been called, we need rebuild layer stack.
   if (reset) {
     layer_->RemoveAllChildren();
     layers_.clear();
   }
 
   for (size_t i = 0; i < layers.size(); ++i) {
     const ppapi::CompositorLayerData* pp_layer = &layers[i];
     LayerData* data = i >= layers_.size() ? NULL : &layers_[i];
-    DCHECK(!data || data->cc_layer);
+    DCHECK(!data || data->cc_layer.get());
     scoped_refptr<cc::Layer> cc_layer = data ? data->cc_layer : NULL;
     ppapi::CompositorLayerData* old_layer = data ? &data->pp_layer : NULL;
 
-    if (!cc_layer) {
+    if (!cc_layer.get()) {
       if (pp_layer->color)
         cc_layer = cc::SolidColorLayer::Create();
       else if (pp_layer->texture || pp_layer->image)
         cc_layer = cc::TextureLayer::CreateForMailbox(NULL);
       layer_->AddChild(cc_layer);
     }
 
     UpdateLayer(cc_layer, old_layer, pp_layer, image_shms[i].Pass());
 
     if (old_layer)
@@ skipping 10 matching lines @@
 
   // If the host is not bound to the instance, return PP_OK immediately.
   if (!bound_instance_)
     return PP_OK;
 
   commit_layers_reply_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace content