Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
index 20356848272833e76ea1b62a678b52ab3487c72d..a75fd9d9ccc01ea02fdb92823938153478d116ab 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
@@ -76,7 +76,6 @@ |
#include "platform/Histogram.h" |
#include "platform/LayoutTestSupport.h" |
#include "platform/MIMETypeFromURL.h" |
-#include "platform/MIMETypeRegistry.h" |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/UserGestureIndicator.h" |
#include "platform/audio/AudioBus.h" |
@@ -262,10 +261,8 @@ bool canLoadURL(const KURL& url, const ContentType& contentType) { |
// knows it cannot render. |
if (contentMIMEType != "application/octet-stream" || |
contentTypeCodecs.isEmpty()) { |
- WebMimeRegistry::SupportsType supported = |
- Platform::current()->mimeRegistry()->supportsMediaMIMEType( |
- contentMIMEType, contentTypeCodecs); |
- return supported > WebMimeRegistry::IsNotSupported; |
+ return MIMETypeRegistry::supportsMediaMIMEType(contentMIMEType, |
+ contentTypeCodecs); |
} |
return false; |
@@ -357,7 +354,7 @@ void HTMLMediaElement::recordAutoplayMetric(AutoplayMetrics metric) { |
autoplayHistogram.count(metric); |
} |
-WebMimeRegistry::SupportsType HTMLMediaElement::supportsType( |
+MIMETypeRegistry::SupportsType HTMLMediaElement::supportsType( |
const ContentType& contentType) { |
DEFINE_STATIC_LOCAL(const String, codecs, ("codecs")); |
@@ -367,16 +364,15 @@ WebMimeRegistry::SupportsType HTMLMediaElement::supportsType( |
String typeCodecs = contentType.parameter(codecs); |
if (type.isEmpty()) |
- return WebMimeRegistry::IsNotSupported; |
+ return MIMETypeRegistry::IsNotSupported; |
// 4.8.10.3 MIME types - The canPlayType(type) method must return the empty |
// string if type is a type that the user agent knows it cannot render or is |
// the type "application/octet-stream" |
if (type == "application/octet-stream") |
- return WebMimeRegistry::IsNotSupported; |
+ return MIMETypeRegistry::IsNotSupported; |
- return Platform::current()->mimeRegistry()->supportsMediaMIMEType(type, |
- typeCodecs); |
+ return MIMETypeRegistry::supportsMediaMIMEType(type, typeCodecs); |
} |
URLRegistry* HTMLMediaElement::s_mediaStreamRegistry = 0; |
@@ -719,18 +715,18 @@ HTMLMediaElement::NetworkState HTMLMediaElement::getNetworkState() const { |
} |
String HTMLMediaElement::canPlayType(const String& mimeType) const { |
- WebMimeRegistry::SupportsType support = supportsType(ContentType(mimeType)); |
+ MIMETypeRegistry::SupportsType support = supportsType(ContentType(mimeType)); |
String canPlay; |
// 4.8.10.3 |
switch (support) { |
- case WebMimeRegistry::IsNotSupported: |
+ case MIMETypeRegistry::IsNotSupported: |
canPlay = emptyString(); |
break; |
- case WebMimeRegistry::MayBeSupported: |
+ case MIMETypeRegistry::MayBeSupported: |
canPlay = "maybe"; |
break; |
- case WebMimeRegistry::IsSupported: |
+ case MIMETypeRegistry::IsSupported: |
canPlay = "probably"; |
break; |
} |