Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2644)

Unified Diff: Source/modules/webmidi/MIDIAccessInitializer.cpp

Issue 805263004: Oilpan: cancel MIDI permission request when prefinalizing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 | « Source/modules/webmidi/MIDIAccessInitializer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webmidi/MIDIAccessInitializer.cpp
diff --git a/Source/modules/webmidi/MIDIAccessInitializer.cpp b/Source/modules/webmidi/MIDIAccessInitializer.cpp
index 7fff2affa7b652bf8ba6a71304a0d224c7b5a4fb..ffa49a1ac4e2362eeac0240dad2b45ff1762b04f 100644
--- a/Source/modules/webmidi/MIDIAccessInitializer.cpp
+++ b/Source/modules/webmidi/MIDIAccessInitializer.cpp
@@ -27,7 +27,10 @@ MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MID
MIDIAccessInitializer::~MIDIAccessInitializer()
{
haraken 2014/12/18 14:42:46 What happens if MIDIAccessInitializer gets destruc
sof 2014/12/18 14:53:54 A permissions request will be made with the contro
haraken 2014/12/18 15:02:28 I'm wondering if it's possible that the MIDIAccess
sof 2014/12/18 15:17:57 If that's a concern, I can rephrase this to be a r
haraken 2014/12/18 15:44:02 Yeah, I guess a more straightforward approach woul
- // It is safe to cancel a request which is already finished or canceld.
+}
+
+void MIDIAccessInitializer::cancel()
+{
Document* document = toDocument(executionContext());
ASSERT(document);
MIDIController* controller = MIDIController::from(document->frame());
@@ -35,6 +38,13 @@ MIDIAccessInitializer::~MIDIAccessInitializer()
controller->cancelSysexPermissionRequest(this);
}
+void MIDIAccessInitializer::stop()
+{
+ // It is safe to cancel a request which is already finished or canceld.
haraken 2014/12/18 14:42:46 canceled
+ cancel();
+ ScriptPromiseResolver::stop();
+}
+
ScriptPromise MIDIAccessInitializer::start()
{
ScriptPromise promise = this->promise();
« no previous file with comments | « Source/modules/webmidi/MIDIAccessInitializer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698