third_party/WebKit/Source/modules/webusb/USB.cpp - Issue 1916283003: [K6] Replace bind() + GCed pointers with retainedRef()

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/webusb/USB.cpp

Issue 1916283003: [K6] Replace bind() + GCed pointers with retainedRef() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Kuroneko_5c

Patch Set: Rebase Created 4 years, 8 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 | « third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.cpp ('k') | third_party/WebKit/Source/modules/webusb/USBDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webusb/USB.cpp

diff --git a/third_party/WebKit/Source/modules/webusb/USB.cpp b/third_party/WebKit/Source/modules/webusb/USB.cpp

index 8f4ec193593544030640364e46fbfb2017f3423b..de511f8a689c0b6b7133fa548d86f6f49794f11d 100644

--- a/third_party/WebKit/Source/modules/webusb/USB.cpp

+++ b/third_party/WebKit/Source/modules/webusb/USB.cpp

@@ -87,7 +87,7 @@ ScriptPromise USB::getDevices(ScriptState* scriptState)

resolver->reject(DOMException::create(SecurityError, errorMessage));

} else {

m_deviceManagerRequests.add(resolver);

- m_deviceManager->GetDevices(nullptr, createBaseCallback(bind<mojo::WTFArray<usb::DeviceInfoPtr>>(&USB::onGetDevices, this, resolver)));

+ m_deviceManager->GetDevices(nullptr, createBaseCallback(bind<mojo::WTFArray<usb::DeviceInfoPtr>>(&USB::onGetDevices, retainedRef(this), retainedRef(resolver))));

}

return promise;

@@ -121,7 +121,7 @@ ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques

filters.append(convertDeviceFilter(filter));

}

m_chooserServiceRequests.add(resolver);

- m_chooserService->GetPermission(std::move(filters), createBaseCallback(bind<usb::DeviceInfoPtr>(&USB::onGetPermission, this, resolver)));

+ m_chooserService->GetPermission(std::move(filters), createBaseCallback(bind<usb::DeviceInfoPtr>(&USB::onGetPermission, retainedRef(this), retainedRef(resolver))));

}

return promise;

}