Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1076)

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 1115553002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaSource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index d970453a0d86580201289e48f1229c31ec8e083d..214862aea367bfeba004bd1695efcc675e53bdb7 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -241,7 +241,7 @@ static bool canLoadURL(const KURL& url, const ContentType& contentType, const St
// when used with parameters, e.g. "application/octet-stream;codecs=theora", is a type that the user agent knows
// it cannot render.
if (contentMIMEType != "application/octet-stream" || contentTypeCodecs.isEmpty()) {
- WebMimeRegistry::SupportsType supported = blink::Platform::current()->mimeRegistry()->supportsMediaMIMEType(contentMIMEType, contentTypeCodecs, keySystem.lower());
+ WebMimeRegistry::SupportsType supported = Platform::current()->mimeRegistry()->supportsMediaMIMEType(contentMIMEType, contentTypeCodecs, keySystem.lower());
return supported > WebMimeRegistry::IsNotSupported;
}
@@ -266,7 +266,7 @@ enum AutoplayMetrics {
static void recordAutoplayMetric(AutoplayMetrics metric)
{
- blink::Platform::current()->histogramEnumeration("Blink.MediaElement.Autoplay", metric, NumberOfAutoplayMetrics);
+ Platform::current()->histogramEnumeration("Blink.MediaElement.Autoplay", metric, NumberOfAutoplayMetrics);
}
WebMimeRegistry::SupportsType HTMLMediaElement::supportsType(const ContentType& contentType, const String& keySystem)
@@ -290,7 +290,7 @@ WebMimeRegistry::SupportsType HTMLMediaElement::supportsType(const ContentType&
if (type == "application/octet-stream")
return WebMimeRegistry::IsNotSupported;
- return blink::Platform::current()->mimeRegistry()->supportsMediaMIMEType(type, typeCodecs, system);
+ return Platform::current()->mimeRegistry()->supportsMediaMIMEType(type, typeCodecs, system);
}
URLRegistry* HTMLMediaElement::s_mediaStreamRegistry = 0;
@@ -2230,7 +2230,7 @@ void HTMLMediaElement::audioTracksTimerFired(Timer<HTMLMediaElement>*)
webMediaPlayer()->enabledAudioTracksChanged(enabledTrackIds);
}
-WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const String& id, blink::WebMediaPlayerClient::AudioTrackKind kind, const AtomicString& label, const AtomicString& language, bool enabled)
+WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const String& id, WebMediaPlayerClient::AudioTrackKind kind, const AtomicString& label, const AtomicString& language, bool enabled)
{
AtomicString kindString = AudioKindToString(kind);
WTF_LOG(Media, "HTMLMediaElement::addAudioTrack(%p, '%s', '%s', '%s', '%s', %d)",
@@ -2274,7 +2274,7 @@ void HTMLMediaElement::selectedVideoTrackChanged(WebMediaPlayer::TrackId* select
webMediaPlayer()->selectedVideoTrackChanged(selectedTrackId);
}
-WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const String& id, blink::WebMediaPlayerClient::VideoTrackKind kind, const AtomicString& label, const AtomicString& language, bool selected)
+WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const String& id, WebMediaPlayerClient::VideoTrackKind kind, const AtomicString& label, const AtomicString& language, bool selected)
{
AtomicString kindString = VideoKindToString(kind);
WTF_LOG(Media, "HTMLMediaElement::addVideoTrack(%p, '%s', '%s', '%s', '%s', %d)",
@@ -3155,7 +3155,7 @@ void HTMLMediaElement::willStopBeingFullscreenElement()
document().layoutView()->compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
}
-blink::WebLayer* HTMLMediaElement::platformLayer() const
+WebLayer* HTMLMediaElement::platformLayer() const
{
return m_webLayer;
}
@@ -3566,7 +3566,7 @@ WebMediaPlayer::CORSMode HTMLMediaElement::corsMode() const
return WebMediaPlayer::CORSModeAnonymous;
}
-void HTMLMediaElement::mediaPlayerSetWebLayer(blink::WebLayer* webLayer)
+void HTMLMediaElement::mediaPlayerSetWebLayer(WebLayer* webLayer)
{
if (webLayer == m_webLayer)
return;
@@ -3586,7 +3586,7 @@ void HTMLMediaElement::mediaPlayerSetWebLayer(blink::WebLayer* webLayer)
GraphicsLayer::registerContentsLayer(m_webLayer);
}
-void HTMLMediaElement::mediaPlayerMediaSourceOpened(blink::WebMediaSource* webMediaSource)
+void HTMLMediaElement::mediaPlayerMediaSourceOpened(WebMediaSource* webMediaSource)
{
m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource));
}
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698