Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/modules/webmidi/MIDIController.cpp b/src/third_party/WebKit/Source/modules/webmidi/MIDIController.cpp
index 6d3ad05..c25bd69 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webmidi/MIDIController.cpp
+++ b/src/third_party/WebKit/Source/modules/webmidi/MIDIController.cpp
@@ -41,19 +41,19 @@ const char* MIDIController::supplementName()
     return "MIDIController";
 }
 
-MIDIController::MIDIController(MIDIClient* client)
+MIDIController::MIDIController(PassOwnPtr<MIDIClient> client)
     : m_client(client)
 {
-    ASSERT(client);
+    ASSERT(m_client);
 }
 
 MIDIController::~MIDIController()
 {
 }
 
-PassOwnPtr<MIDIController> MIDIController::create(MIDIClient* client)
+PassOwnPtrWillBeRawPtr<MIDIController> MIDIController::create(PassOwnPtr<MIDIClient> client)
 {
-    return adoptPtr(new MIDIController(client));
+    return adoptPtrWillBeNoop(new MIDIController(client));
 }
 
 void MIDIController::requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess> access)
@@ -66,7 +66,7 @@ void MIDIController::cancelSysexPermissionRequest(MIDIAccess* access)
     m_client->cancelSysexPermissionRequest(access);
 }
 
-void provideMIDITo(Page& page, MIDIClient* client)
+void provideMIDITo(Page& page, PassOwnPtr<MIDIClient> client)
 {
     MIDIController::provideTo(page, MIDIController::supplementName(), MIDIController::create(client));
 }