Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / mediastream / MediaDevicesRequest.cpp

diff --git a/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp b/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp
index da76e85..cc436ab 100644 (file)
--- a/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp
+++ b/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp
@@ -33,14 +33,14 @@
 
 namespace blink {
 
-MediaDevicesRequest* MediaDevicesRequest::create(ExecutionContext* context, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> callback, ExceptionState& exceptionState)
+MediaDevicesRequest* MediaDevicesRequest::create(ExecutionContext* context, UserMediaController* controller, MediaDeviceInfoCallback* callback, ExceptionState& exceptionState)
 {
     MediaDevicesRequest* request = new MediaDevicesRequest(context, controller, callback);
     request->suspendIfNeeded();
     return request;
 }
 
-MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> callback)
+MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaController* controller, MediaDeviceInfoCallback* callback)
     : ActiveDOMObject(context)
     , m_controller(controller)
     , m_callback(callback)
@@ -80,4 +80,9 @@ void MediaDevicesRequest::stop()
     m_controller = 0;
 }
 
+void MediaDevicesRequest::trace(Visitor* visitor)
+{
+    visitor->trace(m_callback);
+}
+
 } // namespace blink