Title: [138097] trunk/Source/WebCore
- Revision
- 138097
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-18 18:14:03 -0800 (Tue, 18 Dec 2012)
Log Message
Minor improvements to HTMLMediaElement
https://bugs.webkit.org/show_bug.cgi?id=105353
Patch by Joseph Pecoraro <pecor...@apple.com> on 2012-12-18
Reviewed by Eric Carlson.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::canPlayType):
(WebCore::createFileURLForApplicationCacheResource):
(WebCore::stringForNetworkState):
(WebCore::HTMLMediaElement::preload):
(WebCore::HTMLMediaElement::getPluginProxyParams):
Use ASCIILiteral for literal strings becoming WTFStrings.
(WebCore::HTMLMediaElement::setLoop):
By going through setAttribute, parseAttribute would already take care of
updating the disable sleep, so the call here is not needed.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138096 => 138097)
--- trunk/Source/WebCore/ChangeLog 2012-12-19 02:11:13 UTC (rev 138096)
+++ trunk/Source/WebCore/ChangeLog 2012-12-19 02:14:03 UTC (rev 138097)
@@ -1,3 +1,22 @@
+2012-12-18 Joseph Pecoraro <pecor...@apple.com>
+
+ Minor improvements to HTMLMediaElement
+ https://bugs.webkit.org/show_bug.cgi?id=105353
+
+ Reviewed by Eric Carlson.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::canPlayType):
+ (WebCore::createFileURLForApplicationCacheResource):
+ (WebCore::stringForNetworkState):
+ (WebCore::HTMLMediaElement::preload):
+ (WebCore::HTMLMediaElement::getPluginProxyParams):
+ Use ASCIILiteral for literal strings becoming WTFStrings.
+
+ (WebCore::HTMLMediaElement::setLoop):
+ By going through setAttribute, parseAttribute would already take care of
+ updating the disable sleep, so the call here is not needed.
+
2012-12-18 Levi Weintraub <le...@chromium.org>
Input elements with default touch handlers don't update handler counts when changing documents
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (138096 => 138097)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-12-19 02:11:13 UTC (rev 138096)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-12-19 02:14:03 UTC (rev 138097)
@@ -665,13 +665,13 @@
switch (support)
{
case MediaPlayer::IsNotSupported:
- canPlay = "";
+ canPlay = ASCIILiteral("");
break;
case MediaPlayer::MayBeSupported:
- canPlay = "maybe";
+ canPlay = ASCIILiteral("maybe");
break;
case MediaPlayer::IsSupported:
- canPlay = "probably";
+ canPlay = ASCIILiteral("probably");
break;
}
@@ -929,7 +929,7 @@
#else
KURL url;
- url.setProtocol("file");
+ url.setProtocol(ASCIILiteral("file"));
url.setPath(path);
#endif
return url;
@@ -1571,13 +1571,13 @@
static String stringForNetworkState(MediaPlayer::NetworkState state)
{
switch (state) {
- case MediaPlayer::Empty: return "Empty";
- case MediaPlayer::Idle: return "Idle";
- case MediaPlayer::Loading: return "Loading";
- case MediaPlayer::Loaded: return "Loaded";
- case MediaPlayer::FormatError: return "FormatError";
- case MediaPlayer::NetworkError: return "NetworkError";
- case MediaPlayer::DecodeError: return "DecodeError";
+ case MediaPlayer::Empty: return ASCIILiteral("Empty");
+ case MediaPlayer::Idle: return ASCIILiteral("Idle");
+ case MediaPlayer::Loading: return ASCIILiteral("Loading");
+ case MediaPlayer::Loaded: return ASCIILiteral("Loaded");
+ case MediaPlayer::FormatError: return ASCIILiteral("FormatError");
+ case MediaPlayer::NetworkError: return ASCIILiteral("NetworkError");
+ case MediaPlayer::DecodeError: return ASCIILiteral("DecodeError");
default: return emptyString();
}
}
@@ -2310,13 +2310,13 @@
{
switch (m_preload) {
case MediaPlayer::None:
- return "none";
+ return ASCIILiteral("none");
break;
case MediaPlayer::MetaData:
- return "metadata";
+ return ASCIILiteral("metadata");
break;
case MediaPlayer::Auto:
- return "auto";
+ return ASCIILiteral("auto");
break;
}
@@ -2520,9 +2520,6 @@
{
LOG(Media, "HTMLMediaElement::setLoop(%s)", boolString(b));
setBooleanAttribute(loopAttr, b);
-#if PLATFORM(MAC)
- updateDisableSleep();
-#endif
}
bool HTMLMediaElement::controls() const
@@ -3966,14 +3963,14 @@
if (isVideo()) {
KURL posterURL = getNonEmptyURLAttribute(posterAttr);
if (!posterURL.isEmpty() && frame && frame->loader()->willLoadMediaElementURL(posterURL)) {
- names.append("_media_element_poster_");
+ names.append(ASCIILiteral("_media_element_poster_"));
values.append(posterURL.string());
}
}
if (controls()) {
- names.append("_media_element_controls_");
- values.append("true");
+ names.append(ASCIILiteral("_media_element_controls_"));
+ values.append(ASCIILiteral("true"));
}
url = ""
@@ -3982,7 +3979,7 @@
m_currentSrc = url;
if (url.isValid() && frame && frame->loader()->willLoadMediaElementURL(url)) {
- names.append("_media_element_src_");
+ names.append(ASCIILiteral("_media_element_src_"));
values.append(m_currentSrc.string());
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
