content/renderer/pepper/pepper_plugin_delegate_impl.cc - Issue 16256018: Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 16256018: Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix incorrectly modified code Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture_impl.cc ('k') | content/renderer/pepper/pepper_video_source_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc

diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc

index 2b0bcda5a48249c7ed4e51f61cbc1d5ea640242a..58408375dd3a403da128703afd4eaa02c45d5d34 100644

--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc

+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc

@@ -930,17 +930,17 @@ void PepperPluginDelegateImpl::OnPpapiBrokerPermissionResult(

DCHECK(client_ptr.get());

pending_permission_requests_.Remove(request_id);

base::WeakPtr<webkit::ppapi::PPB_Broker_Impl> client = *client_ptr;

- if (!client)

+ if (!client.get())

return;

webkit::ppapi::PluginModule* plugin_module =

- webkit::ppapi::ResourceHelper::GetPluginModule(client);

+ webkit::ppapi::ResourceHelper::GetPluginModule(client.get());

if (!plugin_module)

return;

PepperBrokerImpl* broker =

static_cast<PepperBrokerImpl*>(plugin_module->GetBroker());

- broker->OnBrokerPermissionResult(client, result);

+ broker->OnBrokerPermissionResult(client.get(), result);

}

bool PepperPluginDelegateImpl::AsyncOpenFile(