Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.cpp b/src/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.cpp
index 14bbf37..e598543 100644 (file)
--- a/src/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.cpp
+++ b/src/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.cpp
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "modules/mediastream/RTCDTMFSender.h"
 
-#include "bindings/v8/ExceptionMessages.h"
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionMessages.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/mediastream/MediaStreamTrack.h"
@@ -36,7 +36,7 @@
 #include "public/platform/WebRTCDTMFSenderHandler.h"
 #include "public/platform/WebRTCPeerConnectionHandler.h"
 
-namespace WebCore {
+namespace blink {
 
 static const long minToneDurationMs = 70;
 static const long defaultToneDurationMs = 100;
@@ -44,21 +44,20 @@ static const long maxToneDurationMs = 6000;
 static const long minInterToneGapMs = 50;
 static const long defaultInterToneGapMs = 50;
 
-PassRefPtrWillBeRawPtr<RTCDTMFSender> RTCDTMFSender::create(ExecutionContext* context, blink::WebRTCPeerConnectionHandler* peerConnectionHandler, PassRefPtrWillBeRawPtr<MediaStreamTrack> prpTrack, ExceptionState& exceptionState)
+RTCDTMFSender* RTCDTMFSender::create(ExecutionContext* context, WebRTCPeerConnectionHandler* peerConnectionHandler, MediaStreamTrack* track, ExceptionState& exceptionState)
 {
-    RefPtrWillBeRawPtr<MediaStreamTrack> track = prpTrack;
-    OwnPtr<blink::WebRTCDTMFSenderHandler> handler = adoptPtr(peerConnectionHandler->createDTMFSender(track->component()));
+    OwnPtr<WebRTCDTMFSenderHandler> handler = adoptPtr(peerConnectionHandler->createDTMFSender(track->component()));
     if (!handler) {
         exceptionState.throwDOMException(NotSupportedError, "The MediaStreamTrack provided is not an element of a MediaStream that's currently in the local streams set.");
         return nullptr;
     }
 
-    RefPtrWillBeRawPtr<RTCDTMFSender> dtmfSender = adoptRefWillBeRefCountedGarbageCollected(new RTCDTMFSender(context, track, handler.release()));
+    RTCDTMFSender* dtmfSender = adoptRefCountedGarbageCollectedWillBeNoop(new RTCDTMFSender(context, track, handler.release()));
     dtmfSender->suspendIfNeeded();
-    return dtmfSender.release();
+    return dtmfSender;
 }
 
-RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, PassRefPtrWillBeRawPtr<MediaStreamTrack> track, PassOwnPtr<blink::WebRTCDTMFSenderHandler> handler)
+RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, MediaStreamTrack* track, PassOwnPtr<WebRTCDTMFSenderHandler> handler)
     : ActiveDOMObject(context)
     , m_track(track)
     , m_duration(defaultToneDurationMs)
@@ -124,7 +123,7 @@ void RTCDTMFSender::insertDTMF(const String& tones, long duration, long interTon
         exceptionState.throwDOMException(SyntaxError, "Could not send provided tones, '" + tones + "'.");
 }
 
-void RTCDTMFSender::didPlayTone(const blink::WebString& tone)
+void RTCDTMFSender::didPlayTone(const WebString& tone)
 {
     scheduleDispatchEvent(RTCDTMFToneChangeEvent::create(tone));
 }
@@ -173,4 +172,4 @@ void RTCDTMFSender::trace(Visitor* visitor)
     EventTargetWithInlineData::trace(visitor);
 }
 
-} // namespace WebCore
+} // namespace blink