Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / exported / WebMediaStreamTrack.cpp

diff --git a/src/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp b/src/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
index c394606..4f7c2fe 100644 (file)
--- a/src/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
+++ b/src/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
@@ -32,9 +32,6 @@
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebMediaStreamSource.h"
 #include "public/platform/WebString.h"
-#include "wtf/Vector.h"
-
-using namespace WebCore;
 
 namespace blink {
 
@@ -58,23 +55,23 @@ WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner()
     return WebMediaStreamTrack(m_owner);
 }
 
-void WebMediaStreamTrack::ExtraData::setOwner(WebCore::MediaStreamComponent* owner)
+void WebMediaStreamTrack::ExtraData::setOwner(MediaStreamComponent* owner)
 {
     ASSERT(!m_owner);
     m_owner = owner;
 }
 
-WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponent> mediaStreamComponent)
+WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<MediaStreamComponent> mediaStreamComponent)
     : m_private(mediaStreamComponent)
 {
 }
 
-WebMediaStreamTrack::WebMediaStreamTrack(WebCore::MediaStreamComponent* mediaStreamComponent)
+WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamComponent)
     : m_private(mediaStreamComponent)
 {
 }
 
-WebMediaStreamTrack& WebMediaStreamTrack::operator=(WebCore::MediaStreamComponent* mediaStreamComponent)
+WebMediaStreamTrack& WebMediaStreamTrack::operator=(MediaStreamComponent* mediaStreamComponent)
 {
     m_private = mediaStreamComponent;
     return *this;
@@ -111,16 +108,16 @@ bool WebMediaStreamTrack::isEnabled() const
     return m_private->enabled();
 }
 
-WebString WebMediaStreamTrack::id() const
+bool WebMediaStreamTrack::isMuted() const
 {
     ASSERT(!m_private.isNull());
-    return m_private->id();
+    return m_private->muted();
 }
 
-WebMediaStream WebMediaStreamTrack::stream() const
+WebString WebMediaStreamTrack::id() const
 {
     ASSERT(!m_private.isNull());
-    return WebMediaStream(m_private->stream());
+    return m_private->id();
 }
 
 WebMediaStreamSource WebMediaStreamTrack::source() const