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

Side by Side Diff: third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp

Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5) (Closed)
Patch Set: Revert Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/webmidi/MIDIAccessInitializer.h" 5 #include "modules/webmidi/MIDIAccessInitializer.h"
6 6
7 #include "bindings/core/v8/ScriptPromise.h" 7 #include "bindings/core/v8/ScriptPromise.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
11 #include "core/dom/ExceptionCode.h" 11 #include "core/dom/ExceptionCode.h"
12 #include "core/dom/ExecutionContext.h"
13 #include "core/frame/LocalFrame.h" 12 #include "core/frame/LocalFrame.h"
14 #include "core/frame/Navigator.h" 13 #include "core/frame/Navigator.h"
15 #include "modules/permissions/PermissionUtils.h" 14 #include "modules/permissions/PermissionUtils.h"
16 #include "modules/webmidi/MIDIAccess.h" 15 #include "modules/webmidi/MIDIAccess.h"
17 #include "modules/webmidi/MIDIOptions.h" 16 #include "modules/webmidi/MIDIOptions.h"
18 #include "modules/webmidi/MIDIPort.h" 17 #include "modules/webmidi/MIDIPort.h"
19 #include "platform/UserGestureIndicator.h" 18 #include "platform/UserGestureIndicator.h"
20 #include "platform/mojo/MojoHelper.h" 19 #include "platform/mojo/MojoHelper.h"
21 #include "public/platform/InterfaceProvider.h" 20 #include "public/platform/InterfaceProvider.h"
22 #include "public/platform/modules/permissions/permission.mojom-blink.h" 21 #include "public/platform/modules/permissions/permission.mojom-blink.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 case Result::INITIALIZATION_ERROR: 100 case Result::INITIALIZATION_ERROR:
102 return Reject(DOMException::Create( 101 return Reject(DOMException::Create(
103 kInvalidStateError, "Platform dependent initialization failed.")); 102 kInvalidStateError, "Platform dependent initialization failed."));
104 } 103 }
105 NOTREACHED(); 104 NOTREACHED();
106 Reject(DOMException::Create(kInvalidStateError, 105 Reject(DOMException::Create(kInvalidStateError,
107 "Unknown internal error occurred.")); 106 "Unknown internal error occurred."));
108 } 107 }
109 108
110 ExecutionContext* MIDIAccessInitializer::GetExecutionContext() const { 109 ExecutionContext* MIDIAccessInitializer::GetExecutionContext() const {
111 return ExecutionContext::From(GetScriptState()); 110 return GetScriptState()->GetExecutionContext();
112 } 111 }
113 112
114 void MIDIAccessInitializer::OnPermissionsUpdated(PermissionStatus status) { 113 void MIDIAccessInitializer::OnPermissionsUpdated(PermissionStatus status) {
115 permission_service_.reset(); 114 permission_service_.reset();
116 if (status == PermissionStatus::GRANTED) 115 if (status == PermissionStatus::GRANTED)
117 accessor_->StartSession(); 116 accessor_->StartSession();
118 else 117 else
119 Reject(DOMException::Create(kSecurityError)); 118 Reject(DOMException::Create(kSecurityError));
120 } 119 }
121 120
122 void MIDIAccessInitializer::OnPermissionUpdated(PermissionStatus status) { 121 void MIDIAccessInitializer::OnPermissionUpdated(PermissionStatus status) {
123 permission_service_.reset(); 122 permission_service_.reset();
124 if (status == PermissionStatus::GRANTED) 123 if (status == PermissionStatus::GRANTED)
125 accessor_->StartSession(); 124 accessor_->StartSession();
126 else 125 else
127 Reject(DOMException::Create(kSecurityError)); 126 Reject(DOMException::Create(kSecurityError));
128 } 127 }
129 128
130 } // namespace blink 129 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698