Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp b/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp
index daaa1c9..4139e3b 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp
+++ b/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp
@@ -47,8 +47,12 @@ NavigatorWebMIDI::NavigatorWebMIDI(LocalFrame* frame)
 {
 }
 
-NavigatorWebMIDI::~NavigatorWebMIDI()
+DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorWebMIDI);
+
+void NavigatorWebMIDI::trace(Visitor* visitor)
 {
+    WillBeHeapSupplement<Navigator>::trace(visitor);
+    DOMWindowProperty::trace(visitor);
 }
 
 const char* NavigatorWebMIDI::supplementName()
@@ -66,12 +70,12 @@ NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator)
     return *supplement;
 }
 
-ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, Navigator& navigator, const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, Navigator& navigator, const MIDIOptions& options)
 {
     return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState, options);
 }
 
-ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, const MIDIOptions& options)
 {
     if (!frame() || frame()->document()->activeDOMObjectsAreStopped()) {
         RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
@@ -81,7 +85,7 @@ ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, cons
         return promise;
     }
 
-    return MIDIAccessInitializer::start(scriptState, MIDIOptions(options));
+    return MIDIAccessInitializer::start(scriptState, options);
 }
 
 } // namespace blink