Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webmidi / MIDIAccess.cpp

diff --git a/src/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp b/src/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
index 1dab7f5..504bf4b 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
+++ b/src/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
@@ -38,8 +38,6 @@
 #include "modules/webmidi/MIDIAccessPromise.h"
 #include "modules/webmidi/MIDIConnectionEvent.h"
 #include "modules/webmidi/MIDIController.h"
-#include "modules/webmidi/MIDIInput.h"
-#include "modules/webmidi/MIDIOutput.h"
 #include "modules/webmidi/MIDIPort.h"
 
 namespace WebCore {
@@ -82,7 +80,7 @@ void MIDIAccess::didAddInputPort(const String& id, const String& manufacturer, c
 {
     ASSERT(isMainThread());
 
-    m_inputs.append(MIDIInput::create(this, executionContext(), id, manufacturer, name, version));
+    m_inputs.append(MIDIInput::create(this, id, manufacturer, name, version));
 }
 
 void MIDIAccess::didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version)
@@ -90,7 +88,7 @@ void MIDIAccess::didAddOutputPort(const String& id, const String& manufacturer,
     ASSERT(isMainThread());
 
     unsigned portIndex = m_outputs.size();
-    m_outputs.append(MIDIOutput::create(this, portIndex, executionContext(), id, manufacturer, name, version));
+    m_outputs.append(MIDIOutput::create(this, portIndex, id, manufacturer, name, version));
 }
 
 void MIDIAccess::didStartSession(bool success)
@@ -123,7 +121,7 @@ void MIDIAccess::didReceiveMIDIData(unsigned portIndex, const unsigned char* dat
 
 void MIDIAccess::sendMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStampInMilliseconds)
 {
-    if (m_hasAccess && portIndex < m_outputs.size() && data && length > 1) {
+    if (m_hasAccess && portIndex < m_outputs.size() && data && length > 0) {
         // Convert from a time in milliseconds (a DOMHighResTimeStamp) according to the same time coordinate system as performance.now()
         // into a time in seconds which is based on the time coordinate system of monotonicallyIncreasingTime().
         double timeStamp;
@@ -154,8 +152,6 @@ void MIDIAccess::stop()
     MIDIController* controller = MIDIController::from(document->page());
     ASSERT(controller);
     controller->cancelSysExPermissionRequest(this);
-
-    m_accessor.clear();
 }
 
 void MIDIAccess::startRequest()