[webkit-changes] [139006] trunk/Source/WebCore

[joepeck]

Title: [139006] trunk/Source/WebCore

Revision

139006

Author

joep...@webkit.org

Date

2013-01-07 15:57:33 -0800 (Mon, 07 Jan 2013)

Log Message

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.

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/html/HTMLMediaElement.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (139005 => 139006)

--- trunk/Source/WebCore/ChangeLog	2013-01-07 23:57:30 UTC (rev 139005)
+++ trunk/Source/WebCore/ChangeLog	2013-01-07 23:57:33 UTC (rev 139006)
@@ -1,5 +1,24 @@
 2013-01-07  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.
+
+2013-01-07  Joseph Pecoraro  <pecor...@apple.com>
+
         String improvements in geolocation and notifications modules
         https://bugs.webkit.org/show_bug.cgi?id=105352
 

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (139005 => 139006)

--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2013-01-07 23:57:30 UTC (rev 139005)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2013-01-07 23:57:33 UTC (rev 139006)
@@ -684,13 +684,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;
     }
     
@@ -948,7 +948,7 @@
 #else
     KURL url;
 
-    url.setProtocol("file");
+    url.setProtocol(ASCIILiteral("file"));
     url.setPath(path);
 #endif
     return url;
@@ -1597,13 +1597,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();
     }
 }
@@ -2336,13 +2336,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;
     }
 
@@ -2546,9 +2546,6 @@
 {
     LOG(Media, "HTMLMediaElement::setLoop(%s)", boolString(b));
     setBooleanAttribute(loopAttr, b);
-#if PLATFORM(MAC)
-    updateDisableSleep();
-#endif
 }
 
 bool HTMLMediaElement::controls() const
@@ -3983,14 +3980,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 = ""
@@ -3999,7 +3996,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