Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc |
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
index 5f3e00aae81f8a9e0a182305e7e9e77b372b73e9..c27720bc14f6a18a1c888b33ec8616cb35fb22e3 100644 |
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
@@ -481,7 +481,7 @@ PluginInstance::~PluginInstance() { |
delegate_->InstanceDeleted(this); |
module_->InstanceDeleted(this); |
// If we switched from the NaCl plugin module, notify it too. |
- if (original_module_) |
+ if (original_module_.get()) |
original_module_->InstanceDeleted(this); |
// This should be last since some of the above "instance deleted" calls will |
@@ -574,14 +574,14 @@ void PluginInstance::ScrollRect(int dx, int dy, const gfx::Rect& rect) { |
} |
unsigned PluginInstance::GetBackingTextureId() { |
- if (bound_graphics_3d_) |
+ if (bound_graphics_3d_.get()) |
return bound_graphics_3d_->GetBackingTextureId(); |
return 0; |
} |
void PluginInstance::CommitBackingTexture() { |
- if (texture_layer_) |
+ if (texture_layer_.get()) |
texture_layer_->SetNeedsDisplay(); |
} |
@@ -995,14 +995,14 @@ void PluginInstance::PageVisibilityChanged(bool is_visible) { |
void PluginInstance::ViewWillInitiatePaint() { |
if (GetBoundGraphics2D()) |
GetBoundGraphics2D()->ViewWillInitiatePaint(); |
- else if (bound_graphics_3d_) |
+ else if (bound_graphics_3d_.get()) |
bound_graphics_3d_->ViewWillInitiatePaint(); |
} |
void PluginInstance::ViewInitiatedPaint() { |
if (GetBoundGraphics2D()) |
GetBoundGraphics2D()->ViewInitiatedPaint(); |
- else if (bound_graphics_3d_) |
+ else if (bound_graphics_3d_.get()) |
bound_graphics_3d_->ViewInitiatedPaint(); |
} |
@@ -1011,7 +1011,7 @@ void PluginInstance::ViewFlushedPaint() { |
scoped_refptr<PluginInstance> ref(this); |
if (GetBoundGraphics2D()) |
GetBoundGraphics2D()->ViewFlushedPaint(); |
- else if (bound_graphics_3d_) |
+ else if (bound_graphics_3d_.get()) |
bound_graphics_3d_->ViewFlushedPaint(); |
} |
@@ -1791,7 +1791,7 @@ void PluginInstance::UpdateLayer() { |
layer_bound_to_fullscreen_ == !!fullscreen_container_) |
return; |
- if (texture_layer_) { |
+ if (texture_layer_.get()) { |
texture_layer_->ClearClient(); |
if (!layer_bound_to_fullscreen_) |
container_->setWebLayer(NULL); |
@@ -1957,7 +1957,7 @@ PP_Bool PluginInstance::BindGraphics(PP_Instance instance, |
// The Graphics3D instance can't be destroyed until we call |
// UpdateLayer(). |
scoped_refptr< ::ppapi::Resource> old_graphics = bound_graphics_3d_.get(); |
- if (bound_graphics_3d_) { |
+ if (bound_graphics_3d_.get()) { |
bound_graphics_3d_->BindToInstance(false); |
bound_graphics_3d_ = NULL; |
} |
@@ -2239,7 +2239,7 @@ PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) { |
NOTIMPLEMENTED(); |
return NULL; |
case ::ppapi::GAMEPAD_SINGLETON_ID: |
- return gamepad_impl_; |
+ return gamepad_impl_.get(); |
} |
NOTREACHED(); |