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

Unified Diff: third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h

Issue 2129913005: Revert of Web MIDI: use mojom::blink::PermissionService directly to ask permission (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
Index: third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h
diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h
index 9bb871dc2a9375427ca0758c638e3d28b6c80d36..ed1e4e5e77c58664779907ecc1227ae2447711f8 100644
--- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h
+++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.h
@@ -12,8 +12,6 @@
#include "modules/webmidi/MIDIAccessorClient.h"
#include "modules/webmidi/MIDIOptions.h"
#include "modules/webmidi/MIDIPort.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission.mojom-blink.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom-blink.h"
#include "wtf/Vector.h"
#include <memory>
@@ -49,7 +47,7 @@
return resolver->start();
}
- ~MIDIAccessInitializer() override = default;
+ ~MIDIAccessInitializer() override;
// Eager finalization to allow dispose() operation access
// other (non eager) heap objects.
@@ -63,22 +61,23 @@
void didStartSession(bool success, const String& error, const String& message) override;
void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp) override { }
+ void resolvePermission(bool allowed);
+ SecurityOrigin* getSecurityOrigin() const;
+
private:
MIDIAccessInitializer(ScriptState*, const MIDIOptions&);
ExecutionContext* getExecutionContext() const;
ScriptPromise start();
+ void dispose();
void contextDestroyed() override;
-
- void onPermissionsUpdated(mojo::WTFArray<mojom::blink::PermissionStatus>);
- void onPermissionUpdated(mojom::blink::PermissionStatus);
std::unique_ptr<MIDIAccessor> m_accessor;
Vector<PortDescriptor> m_portDescriptors;
MIDIOptions m_options;
-
- mojom::blink::PermissionServicePtr m_permissionService;
+ bool m_hasBeenDisposed;
+ bool m_permissionResolved;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698