Chromium Code Reviews| Index: content/renderer/pepper/pepper_plugin_instance_impl.cc |
| diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
| index 8bd0a1c0e8e9b28ccb71e002400c1fd6c0b19a29..8b5e9ab0d7638927da51efdbe067f18d6ee9e702 100644 |
| --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc |
| +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
| @@ -1748,7 +1748,7 @@ int PepperPluginInstanceImpl::PrintBegin(const WebPrintParams& print_params) { |
| if (!num_pages) |
| return 0; |
| current_print_settings_ = print_settings; |
| - canvas_.clear(); |
| + canvas_.reset(); |
| ranges_.clear(); |
| return num_pages; |
| } |
| @@ -1767,7 +1767,7 @@ void PepperPluginInstanceImpl::PrintPage(int page_number, |
| #endif // defined(OS_MACOSX) |
| if (save_for_later) { |
| ranges_.push_back(page_range); |
| - canvas_ = skia::SharePtr(canvas); |
| + canvas_ = sk_sp<SkCanvas>(canvas); |
|
piman
2016/04/06 18:23:29
Shouldn't this be sk_ref_sp?
f(malita)
2016/04/06 18:37:21
+1
tomhudson
2016/04/06 19:00:23
Done.
|
| } else { |
| PrintPageHelper(&page_range, 1, canvas); |
| } |
| @@ -1800,7 +1800,7 @@ void PepperPluginInstanceImpl::PrintEnd() { |
| scoped_refptr<PepperPluginInstanceImpl> ref(this); |
| if (!ranges_.empty()) |
| PrintPageHelper(&(ranges_.front()), ranges_.size(), canvas_.get()); |
| - canvas_.clear(); |
| + canvas_.reset(); |
| ranges_.clear(); |
| DCHECK(plugin_print_interface_); |