Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webmidi / MIDIAccessor.h

diff --git a/src/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h b/src/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h
index 0d5c6d4..9802b3c 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h
+++ b/src/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h
@@ -36,11 +36,11 @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
-namespace WebCore {
+namespace blink {
 
 class MIDIAccessorClient;
 
-class MIDIAccessor FINAL : public blink::WebMIDIAccessorClient {
+class MIDIAccessor FINAL : public WebMIDIAccessorClient {
 public:
     static PassOwnPtr<MIDIAccessor> create(MIDIAccessorClient*);
 
@@ -48,20 +48,24 @@ public:
 
     void startSession();
     void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp);
+    // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient.
+    // MIDIAccessInitializer is the first client and MIDIAccess takes over it
+    // once the initialization successfully finishes.
+    void setClient(MIDIAccessorClient* client) { m_client = client; }
 
-    // blink::WebMIDIAccessorClient
-    virtual void didAddInputPort(const blink::WebString& id, const blink::WebString& manufacturer, const blink::WebString& name, const blink::WebString& version) OVERRIDE;
-    virtual void didAddOutputPort(const blink::WebString& id, const blink::WebString& manufacturer, const blink::WebString& name, const blink::WebString& version) OVERRIDE;
-    virtual void didStartSession(bool success) OVERRIDE;
+    // WebMIDIAccessorClient
+    virtual void didAddInputPort(const WebString& id, const WebString& manufacturer, const WebString& name, const WebString& version) OVERRIDE;
+    virtual void didAddOutputPort(const WebString& id, const WebString& manufacturer, const WebString& name, const WebString& version) OVERRIDE;
+    virtual void didStartSession(bool success, const WebString& error, const WebString& message) OVERRIDE;
     virtual void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp) OVERRIDE;
 
 private:
     explicit MIDIAccessor(MIDIAccessorClient*);
 
     MIDIAccessorClient* m_client;
-    OwnPtr<blink::WebMIDIAccessor> m_accessor;
+    OwnPtr<WebMIDIAccessor> m_accessor;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // MIDIAccessor_h