Index: Source/core/html/HTMLMediaElement.cpp |
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp |
index d0654b41cbff8d044e34b5f2b2786eec99212547..49b8f1d634c74373a0280210af6eec61ac118b00 100644 |
--- a/Source/core/html/HTMLMediaElement.cpp |
+++ b/Source/core/html/HTMLMediaElement.cpp |
@@ -2081,9 +2081,9 @@ String HTMLMediaElement::preload() const |
return String(); |
} |
-void HTMLMediaElement::setPreload(const String& preload) |
+void HTMLMediaElement::setPreload(const AtomicString& preload) |
{ |
- WTF_LOG(Media, "HTMLMediaElement::setPreload(%s)", preload.utf8().data()); |
+ WTF_LOG(Media, "HTMLMediaElement::setPreload(%s)", preload.string().utf8().data()); |
eseidel
2014/01/02 19:18:28
Yup, definitely should add an AtomicString::utf8()
|
setAttribute(preloadAttr, preload); |
} |
@@ -2534,7 +2534,7 @@ void HTMLMediaElement::removeAllInbandTracks() |
} |
} |
-PassRefPtr<TextTrack> HTMLMediaElement::addTextTrack(const String& kind, const String& label, const String& language, ExceptionState& exceptionState) |
+PassRefPtr<TextTrack> HTMLMediaElement::addTextTrack(const AtomicString& kind, const AtomicString& label, const AtomicString& language, ExceptionState& exceptionState) |
{ |
ASSERT(RuntimeEnabledFeatures::videoTrackEnabled()); |
@@ -2645,7 +2645,7 @@ static int textTrackLanguageSelectionScore(const TextTrack& track) |
if (track.language().isEmpty()) |
return 0; |
- Vector<String> languages = userPreferredLanguages(); |
+ Vector<AtomicString> languages = userPreferredLanguages(); |
size_t languageMatchIndex = indexOfBestMatchingLanguageInList(track.language(), languages); |
if (languageMatchIndex >= languages.size()) |
return 0; |