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

Mon, 13 Jun 2011 11:38:23 -0700

Title: [88662] trunk/Source/WebCore
Revision
88662
Author
[email protected]
Date
2011-06-13 11:37:35 -0700 (Mon, 13 Jun 2011)

Log Message

2011-06-13  Adam Barth  <[email protected]>

        Reviewed by Darin Adler.

        r87539 broke HTMLMediaElement url logging
        https://bugs.webkit.org/show_bug.cgi?id=62551

        Returning pointers to temporaries is bad times!

        * html/HTMLMediaElement.cpp:
        (WebCore::urlForLogging):
        (WebCore::HTMLMediaElement::loadResource):
        (WebCore::HTMLMediaElement::isSafeToLoadURL):
        (WebCore::HTMLMediaElement::selectNextSourceChild):
        (WebCore::HTMLMediaElement::sourceWasAdded):
        (WebCore::HTMLMediaElement::sourceWillBeRemoved):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (88661 => 88662)


--- trunk/Source/WebCore/ChangeLog	2011-06-13 18:36:21 UTC (rev 88661)
+++ trunk/Source/WebCore/ChangeLog	2011-06-13 18:37:35 UTC (rev 88662)
@@ -1,3 +1,20 @@
+2011-06-13  Adam Barth  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        r87539 broke HTMLMediaElement url logging
+        https://bugs.webkit.org/show_bug.cgi?id=62551
+
+        Returning pointers to temporaries is bad times!
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::urlForLogging):
+        (WebCore::HTMLMediaElement::loadResource):
+        (WebCore::HTMLMediaElement::isSafeToLoadURL):
+        (WebCore::HTMLMediaElement::selectNextSourceChild):
+        (WebCore::HTMLMediaElement::sourceWasAdded):
+        (WebCore::HTMLMediaElement::sourceWillBeRemoved):
+
 2011-06-13  Tony Chang  <[email protected]>
 
         Reviewed by Dimitri Glazkov.

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (88661 => 88662)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2011-06-13 18:36:21 UTC (rev 88661)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2011-06-13 18:37:35 UTC (rev 88662)
@@ -86,13 +86,13 @@
 namespace WebCore {
 
 #if !LOG_DISABLED
-static const char* urlForLogging(const KURL& url)
+static String urlForLogging(const KURL& url)
 {
     static const unsigned maximumURLLengthForLogging = 128;
 
     if (url.string().length() < maximumURLLengthForLogging)
-        return url.string().utf8().data();
-    return String(url.string().substring(0, maximumURLLengthForLogging) + "...").utf8().data();
+        return url.string();
+    return url.string().substring(0, maximumURLLengthForLogging) + "...";
 }
 
 static const char* boolString(bool val)
@@ -675,7 +675,7 @@
 {
     ASSERT(isSafeToLoadURL(initialURL, Complain));
 
-    LOG(Media, "HTMLMediaElement::loadResource(%s, %s)", urlForLogging(initialURL), contentType.raw().utf8().data());
+    LOG(Media, "HTMLMediaElement::loadResource(%s, %s)", urlForLogging(initialURL).utf8().data(), contentType.raw().utf8().data());
 
     Frame* frame = document()->frame();
     if (!frame)
@@ -690,7 +690,7 @@
 
     m_currentSrc = url;
 
-    LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLogging(m_currentSrc));
+    LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLogging(m_currentSrc).utf8().data());
 
     if (m_sendProgressEvents) 
         startProgressEventTimer();
@@ -720,7 +720,7 @@
 bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidSourceAction actionIfInvalid)
 {
     if (!url.isValid()) {
-        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE because url is invalid", urlForLogging(url));
+        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE because url is invalid", urlForLogging(url).utf8().data());
         return false;
     }
 
@@ -728,7 +728,7 @@
     if (!frame || !document()->securityOrigin()->canDisplay(url)) {
         if (actionIfInvalid == Complain)
             FrameLoader::reportLocalLoadFailed(frame, url.string());
-        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE rejected by SecurityOrigin", urlForLogging(url));
+        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE rejected by SecurityOrigin", urlForLogging(url).utf8().data());
         return false;
     }
 
@@ -1730,7 +1730,7 @@
         mediaURL = source->getNonEmptyURLAttribute(srcAttr);
 #if !LOG_DISABLED
         if (shouldLog)
-            LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLogging(mediaURL));
+            LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLogging(mediaURL).utf8().data());
 #endif
         if (mediaURL.isEmpty())
             goto check_again;
@@ -1781,7 +1781,7 @@
 
 #if !LOG_DISABLED
     if (shouldLog)
-        LOG(Media, "HTMLMediaElement::selectNextSourceChild -> %p, %s", m_currentSourceNode, canUse ? urlForLogging(mediaURL) : "");
+        LOG(Media, "HTMLMediaElement::selectNextSourceChild -> %p, %s", m_currentSourceNode, canUse ? urlForLogging(mediaURL).utf8().data() : "");
 #endif
     return canUse ? mediaURL : KURL();
 }
@@ -1793,7 +1793,7 @@
 #if !LOG_DISABLED
     if (source->hasTagName(sourceTag)) {
         KURL url = ""
-        LOG(Media, "HTMLMediaElement::sourceWasAdded - 'src' is %s", urlForLogging(url));
+        LOG(Media, "HTMLMediaElement::sourceWasAdded - 'src' is %s", urlForLogging(url).utf8().data());
     }
 #endif
     
@@ -1840,7 +1840,7 @@
 #if !LOG_DISABLED
     if (source->hasTagName(sourceTag)) {
         KURL url = ""
-        LOG(Media, "HTMLMediaElement::sourceWillBeRemoved - 'src' is %s", urlForLogging(url));
+        LOG(Media, "HTMLMediaElement::sourceWillBeRemoved - 'src' is %s", urlForLogging(url).utf8().data());
     }
 #endif
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to