content/renderer/pepper/pepper_device_enumeration_host_helper.cc - Issue 653243003: Pepper: Access PepperMediaDeviceManager through a WeakPtr

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_device_enumeration_host_helper.cc

Issue 653243003: Pepper: Access PepperMediaDeviceManager through a WeakPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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_device_enumeration_host_helper.h ('k') | content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_device_enumeration_host_helper.cc

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

index d983f4a5816f70ae16d72aaa0959eb165a03503f..edc0840bb92a4c4307b7bc50bc717ae6b5813391 100644

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

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

@@ -46,6 +46,7 @@ class PepperDeviceEnumerationHostHelper::ScopedRequest

// EnumerateDevicesCallbackBody() to ensure that we always call |callback|

// asynchronously.

sync_call_ = true;

+ DCHECK(owner_->delegate_);

request_id_ = owner_->delegate_->EnumerateDevices(

owner_->device_type_,

owner_->document_url_,

@@ -54,7 +55,7 @@ class PepperDeviceEnumerationHostHelper::ScopedRequest

}

~ScopedRequest() {

- if (requested_) {

+ if (requested_ && owner_->delegate_) {

owner_->delegate_->StopEnumerateDevices(request_id_);

}

@@ -91,7 +92,7 @@ class PepperDeviceEnumerationHostHelper::ScopedRequest

PepperDeviceEnumerationHostHelper::PepperDeviceEnumerationHostHelper(

ppapi::host::ResourceHost* resource_host,

- Delegate* delegate,

+ base::WeakPtr<Delegate> delegate,

PP_DeviceType_Dev device_type,

const GURL& document_url)

: resource_host_(resource_host),