Commit 8eb43804 authored by toyoshim@chromium.org's avatar toyoshim@chromium.org

Web MIDI API renaming: the last step of three step changes

Remove old functions. Now there are no 'SysEx' and 'sysEx' strings
in Web MIDI implementation after this change.

Here are a series of changes on this renaming. 
1. https://codereview.chromium.org/208243014/
2. https://codereview.chromium.org/210003002/
3. this change

BUG=349538
TEST=LayoutTests/webmidi

Review URL: https://codereview.chromium.org/208423016

git-svn-id: svn://svn.chromium.org/blink/trunk@170062 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 28f5c22f
...@@ -8,10 +8,6 @@ ...@@ -8,10 +8,6 @@
description("Test if sysex permission request is handled."); description("Test if sysex permission request is handled.");
// FIXME: remove following workaround once testRunner in Chromium has a new interface.
if (!testRunner.setMIDISysexPermission)
testRunner.setMIDISysexPermission = testRunner.setMIDISysExPermission;
shouldBeDefined("testRunner.setMIDISysexPermission"); shouldBeDefined("testRunner.setMIDISysexPermission");
shouldBeDefined("navigator.requestMIDIAccess"); shouldBeDefined("navigator.requestMIDIAccess");
...@@ -22,7 +18,7 @@ var finishSuccessfully = function () { ...@@ -22,7 +18,7 @@ var finishSuccessfully = function () {
finishJSTest(); finishJSTest();
} }
var rejectSysEx = function (next) { var rejectSysex = function (next) {
testRunner.setMIDISysexPermission(false); testRunner.setMIDISysexPermission(false);
promise = navigator.requestMIDIAccess({sysex: true}); promise = navigator.requestMIDIAccess({sysex: true});
shouldBeDefined("promise"); shouldBeDefined("promise");
...@@ -39,7 +35,7 @@ var rejectSysEx = function (next) { ...@@ -39,7 +35,7 @@ var rejectSysEx = function (next) {
}); });
} }
var acceptSysEx = function (next) { var acceptSysex = function (next) {
testRunner.setMIDISysexPermission(true); testRunner.setMIDISysexPermission(true);
promise = navigator.requestMIDIAccess({sysex: true}); promise = navigator.requestMIDIAccess({sysex: true});
shouldBeDefined("promise"); shouldBeDefined("promise");
...@@ -60,7 +56,7 @@ var acceptSysEx = function (next) { ...@@ -60,7 +56,7 @@ var acceptSysEx = function (next) {
}); });
} }
rejectSysEx(acceptSysEx); rejectSysex(acceptSysex);
</script> </script>
</body> </body>
......
...@@ -8,10 +8,6 @@ ...@@ -8,10 +8,6 @@
description("Test if various kinds of MIDI messages can be validated."); description("Test if various kinds of MIDI messages can be validated.");
// FIXME: remove following workaround once testRunner in Chromium has a new interface.
if (!testRunner.setMIDISysexPermission)
testRunner.setMIDISysexPermission = testRunner.setMIDISysExPermission;
shouldBeDefined("testRunner.setMIDISysexPermission"); shouldBeDefined("testRunner.setMIDISysexPermission");
shouldBeDefined("navigator.requestMIDIAccess"); shouldBeDefined("navigator.requestMIDIAccess");
......
...@@ -46,18 +46,16 @@ MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client) ...@@ -46,18 +46,16 @@ MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client)
void MIDIClientProxy::requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess> access) void MIDIClientProxy::requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess> access)
{ {
// FIXME: call new function once Chromium implements it.
if (m_client) if (m_client)
m_client->requestSysExPermission(WebMIDIPermissionRequest(access)); m_client->requestSysexPermission(WebMIDIPermissionRequest(access));
else else
access->setSysexEnabled(false); access->setSysexEnabled(false);
} }
void MIDIClientProxy::cancelSysexPermissionRequest(MIDIAccess* access) void MIDIClientProxy::cancelSysexPermissionRequest(MIDIAccess* access)
{ {
// FIXME: call new function once Chromium implements it.
if (m_client) if (m_client)
m_client->cancelSysExPermissionRequest(WebMIDIPermissionRequest(access)); m_client->cancelSysexPermissionRequest(WebMIDIPermissionRequest(access));
} }
} // namespace blink } // namespace blink
...@@ -39,14 +39,9 @@ public: ...@@ -39,14 +39,9 @@ public:
virtual ~WebMIDIClient() { } virtual ~WebMIDIClient() { }
// Request a permission to use system exclusive messages. Called when MIDIOptions.sysex is true. // Request a permission to use system exclusive messages. Called when MIDIOptions.sysex is true.
// FIXME: Make following new functions pure virtual once Chromium implements them. virtual void requestSysexPermission(const WebMIDIPermissionRequest&) = 0;
virtual void requestSysexPermission(const WebMIDIPermissionRequest&) { };
// Cancel the request since the requesting frame may be moving to a new page. // Cancel the request since the requesting frame may be moving to a new page.
virtual void cancelSysexPermissionRequest(const WebMIDIPermissionRequest&) { }; virtual void cancelSysexPermissionRequest(const WebMIDIPermissionRequest&) = 0;
// FIXME: Remove following old functions once Chromium usess new functions.
virtual void requestSysExPermission(const WebMIDIPermissionRequest&) { };
virtual void cancelSysExPermissionRequest(const WebMIDIPermissionRequest&) { };
}; };
} // namespace blink } // namespace blink
......
...@@ -49,18 +49,10 @@ public: ...@@ -49,18 +49,10 @@ public:
BLINK_EXPORT void setSysexPermission(bool); BLINK_EXPORT void setSysexPermission(bool);
BLINK_EXPORT void resetMock(); BLINK_EXPORT void resetMock();
// FIXME: Remove following function once Chromium stop using it.
void setSysExPermission(bool permission) { setSysexPermission(permission); }
// WebMIDIClient // WebMIDIClient
virtual void requestSysexPermission(const WebMIDIPermissionRequest&) OVERRIDE; virtual void requestSysexPermission(const WebMIDIPermissionRequest&) OVERRIDE;
virtual void cancelSysexPermissionRequest(const WebMIDIPermissionRequest&) OVERRIDE; virtual void cancelSysexPermissionRequest(const WebMIDIPermissionRequest&) OVERRIDE;
// FIXME: Remove following old functions once Chromium uses new functions.
virtual void requestSysExPermission(const WebMIDIPermissionRequest& request) { requestSysexPermission(request); }
virtual void cancelSysExPermissionRequest(const WebMIDIPermissionRequest& request) { cancelSysexPermissionRequest(request); }
private: private:
BLINK_EXPORT void reset(); BLINK_EXPORT void reset();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment