third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp - Issue 2049003002: Wrap GCed raw pointer parameters of WTF::bind with Persistent

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: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2049003002: Wrap GCed raw pointer parameters of WTF::bind with Persistent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: revert "unretained" part and "disallow pointers" part Created 4 years, 6 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

« third_party/WebKit/Source/core/html/HTMLSlotElement.cpp ('K') | « third_party/WebKit/Source/modules/geolocation/Geolocation.cpp ('k') | third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

index 721eb200dc2099f32d5c30e6830fdd2ae5e6eca9..2888e27ca62e1521e4ae052696f5cb048a5c1417 100644

--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

@@ -92,7 +92,7 @@ ScriptPromise ImageCapture::getPhotoCapabilities(ScriptState* scriptState, Excep

// m_streamTrack->component()->source()->id() is the renderer "name" of the camera;

// TODO(mcasas) consider sending the security origin as well:

// scriptState->getExecutionContext()->getSecurityOrigin()->toString()

- m_service->GetCapabilities(m_streamTrack->component()->source()->id(), createBaseCallback(bind<media::mojom::blink::PhotoCapabilitiesPtr>(&ImageCapture::onCapabilities, this, resolver)));

+ m_service->GetCapabilities(m_streamTrack->component()->source()->id(), createBaseCallback(bind<media::mojom::blink::PhotoCapabilitiesPtr>(&ImageCapture::onCapabilities, wrapCrossThreadPersistent(this), wrapCrossThreadPersistent(resolver))));

return promise;

}

@@ -117,7 +117,7 @@ ScriptPromise ImageCapture::takePhoto(ScriptState* scriptState, ExceptionState&

// m_streamTrack->component()->source()->id() is the renderer "name" of the camera;

// TODO(mcasas) consider sending the security origin as well:

// scriptState->getExecutionContext()->getSecurityOrigin()->toString()

- m_service->TakePhoto(m_streamTrack->component()->source()->id(), createBaseCallback(bind<String, mojo::WTFArray<uint8_t>>(&ImageCapture::onTakePhoto, this, resolver)));

+ m_service->TakePhoto(m_streamTrack->component()->source()->id(), createBaseCallback(bind<String, mojo::WTFArray<uint8_t>>(&ImageCapture::onTakePhoto, wrapCrossThreadPersistent(this), wrapCrossThreadPersistent(resolver))));

return promise;

}