Index: Source/core/html/HTMLMediaElement.cpp |
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp |
index 608390e31002930cf2cd7594880257f0dc9ea7d3..182f164a9b3e9a7fab21f09327080e275b2288f5 100644 |
--- a/Source/core/html/HTMLMediaElement.cpp |
+++ b/Source/core/html/HTMLMediaElement.cpp |
@@ -89,11 +89,6 @@ |
#include "public/platform/WebAudioSourceProvider.h" |
#endif |
-using blink::WebInbandTextTrack; |
-using blink::WebMediaPlayer; |
-using blink::WebMimeRegistry; |
-using blink::WebMediaPlayerClient; |
- |
namespace blink { |
#if !LOG_DISABLED |
@@ -2269,7 +2264,7 @@ void HTMLMediaElement::audioTracksTimerFired(Timer<HTMLMediaElement>*) |
webMediaPlayer()->enabledAudioTracksChanged(enabledTrackIds); |
} |
-WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const WebString& id, blink::WebMediaPlayerClient::AudioTrackKind kind, const WebString& label, const WebString& language, bool enabled) |
+WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const WebString& id, WebMediaPlayerClient::AudioTrackKind kind, const WebString& label, const WebString& language, bool enabled) |
{ |
AtomicString kindString = AudioKindToString(kind); |
WTF_LOG(Media, "HTMLMediaElement::addAudioTrack(%p, '%s', '%s', '%s', '%s', %d)", |
@@ -2313,7 +2308,7 @@ void HTMLMediaElement::selectedVideoTrackChanged(WebMediaPlayer::TrackId* select |
webMediaPlayer()->selectedVideoTrackChanged(selectedTrackId); |
} |
-WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const WebString& id, blink::WebMediaPlayerClient::VideoTrackKind kind, const WebString& label, const WebString& language, bool selected) |
+WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const WebString& id, WebMediaPlayerClient::VideoTrackKind kind, const WebString& label, const WebString& language, bool selected) |
{ |
AtomicString kindString = VideoKindToString(kind); |
WTF_LOG(Media, "HTMLMediaElement::addVideoTrack(%p, '%s', '%s', '%s', '%s', %d)", |
@@ -3628,7 +3623,7 @@ WebMediaPlayer::CORSMode HTMLMediaElement::corsMode() const |
return WebMediaPlayer::CORSModeAnonymous; |
} |
-void HTMLMediaElement::setWebLayer(blink::WebLayer* webLayer) |
+void HTMLMediaElement::setWebLayer(WebLayer* webLayer) |
{ |
if (webLayer == m_webLayer) |
return; |