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

Tue, 11 Dec 2012 16:16:33 -0800

Title: [137378] trunk/Source/WebCore
Revision
137378
Author
roger_f...@apple.com
Date
2012-12-11 16:18:20 -0800 (Tue, 11 Dec 2012)

Log Message

Make Video Track compile on Windows in debug mode.
https://bugs.webkit.org/show_bug.cgi?id=104720.

Reviewed by Alexey Proskuryakov.

urlForLogging method was defined in both HTMLMediaElement.cpp and HTMLTrackElement.cpp. 
On Windows all the HTMLElements sources are included in an AllInOne source file, 
so the definitions conflicted. Fixed by renaming the definition in each source file.

* html/HTMLMediaElement.cpp:
(WebCore::urlForLoggingMedia):
(WebCore::HTMLMediaElement::loadResource):
(WebCore::HTMLMediaElement::isSafeToLoadURL):
(WebCore::HTMLMediaElement::didRemoveTrack):
(WebCore::HTMLMediaElement::selectNextSourceChild):
(WebCore::HTMLMediaElement::sourceWasAdded):
(WebCore::HTMLMediaElement::sourceWasRemoved):
* html/HTMLTrackElement.cpp:
(WebCore::urlForLoggingTrack):
(WebCore::HTMLTrackElement::canLoadUrl):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (137377 => 137378)


--- trunk/Source/WebCore/ChangeLog	2012-12-12 00:18:08 UTC (rev 137377)
+++ trunk/Source/WebCore/ChangeLog	2012-12-12 00:18:20 UTC (rev 137378)
@@ -1,3 +1,26 @@
+2012-12-11  Roger Fong  <roger_f...@apple.com>
+
+        Make Video Track compile on Windows in debug mode.
+        https://bugs.webkit.org/show_bug.cgi?id=104720.
+
+        Reviewed by Alexey Proskuryakov.
+
+        urlForLogging method was defined in both HTMLMediaElement.cpp and HTMLTrackElement.cpp. 
+        On Windows all the HTMLElements sources are included in an AllInOne source file, 
+        so the definitions conflicted. Fixed by renaming the definition in each source file.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::urlForLoggingMedia):
+        (WebCore::HTMLMediaElement::loadResource):
+        (WebCore::HTMLMediaElement::isSafeToLoadURL):
+        (WebCore::HTMLMediaElement::didRemoveTrack):
+        (WebCore::HTMLMediaElement::selectNextSourceChild):
+        (WebCore::HTMLMediaElement::sourceWasAdded):
+        (WebCore::HTMLMediaElement::sourceWasRemoved):
+        * html/HTMLTrackElement.cpp:
+        (WebCore::urlForLoggingTrack):
+        (WebCore::HTMLTrackElement::canLoadUrl):
+
 2012-12-11  Ryosuke Niwa  <rn...@webkit.org>
 
         Mail hangs when resizing the font size of a large RTL text

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (137377 => 137378)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-12-12 00:18:08 UTC (rev 137377)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-12-12 00:18:20 UTC (rev 137378)
@@ -126,7 +126,7 @@
 namespace WebCore {
 
 #if !LOG_DISABLED
-static String urlForLogging(const KURL& url)
+static String urlForLoggingMedia(const KURL& url)
 {
     static const unsigned maximumURLLengthForLogging = 128;
 
@@ -940,7 +940,7 @@
 {
     ASSERT(isSafeToLoadURL(initialURL, Complain));
 
-    LOG(Media, "HTMLMediaElement::loadResource(%s, %s, %s)", urlForLogging(initialURL).utf8().data(), contentType.raw().utf8().data(), keySystem.utf8().data());
+    LOG(Media, "HTMLMediaElement::loadResource(%s, %s, %s)", urlForLoggingMedia(initialURL).utf8().data(), contentType.raw().utf8().data(), keySystem.utf8().data());
 
     Frame* frame = document()->frame();
     if (!frame) {
@@ -992,11 +992,11 @@
 #if !PLATFORM(CHROMIUM)
     if (resource) {
         url = ""
-        LOG(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLoggingMedia(url).utf8().data());
     }
 #endif
 
-    LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLogging(m_currentSrc).utf8().data());
+    LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLoggingMedia(m_currentSrc).utf8().data());
 
     if (m_sendProgressEvents) 
         startProgressEventTimer();
@@ -1397,7 +1397,7 @@
 bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionIfInvalid)
 {
     if (!url.isValid()) {
-        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE because url is invalid", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE because url is invalid", urlForLoggingMedia(url).utf8().data());
         return false;
     }
 
@@ -1405,12 +1405,12 @@
     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).utf8().data());
+        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> FALSE rejected by SecurityOrigin", urlForLoggingMedia(url).utf8().data());
         return false;
     }
 
     if (!document()->contentSecurityPolicy()->allowMediaFromSource(url)) {
-        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> rejected by Content Security Policy", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%s) -> rejected by Content Security Policy", urlForLoggingMedia(url).utf8().data());
         return false;
     }
 
@@ -2866,7 +2866,7 @@
 #if !LOG_DISABLED
     if (trackElement->hasTagName(trackTag)) {
         KURL url = ""
-        LOG(Media, "HTMLMediaElement::didRemoveTrack - 'src' is %s", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLMediaElement::didRemoveTrack - 'src' is %s", urlForLoggingMedia(url).utf8().data());
     }
 #endif
 
@@ -3157,7 +3157,7 @@
         mediaURL = source->getNonEmptyURLAttribute(srcAttr);
 #if !LOG_DISABLED
         if (shouldLog)
-            LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLogging(mediaURL).utf8().data());
+            LOG(Media, "HTMLMediaElement::selectNextSourceChild - 'src' is %s", urlForLoggingMedia(mediaURL).utf8().data());
 #endif
         if (mediaURL.isEmpty())
             goto check_again;
@@ -3221,7 +3221,7 @@
 
 #if !LOG_DISABLED
     if (shouldLog)
-        LOG(Media, "HTMLMediaElement::selectNextSourceChild -> %p, %s", m_currentSourceNode.get(), canUseSourceElement ? urlForLogging(mediaURL).utf8().data() : "");
+        LOG(Media, "HTMLMediaElement::selectNextSourceChild -> %p, %s", m_currentSourceNode.get(), canUseSourceElement ? urlForLoggingMedia(mediaURL).utf8().data() : "");
 #endif
     return canUseSourceElement ? mediaURL : KURL();
 }
@@ -3233,7 +3233,7 @@
 #if !LOG_DISABLED
     if (source->hasTagName(sourceTag)) {
         KURL url = ""
-        LOG(Media, "HTMLMediaElement::sourceWasAdded - 'src' is %s", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLMediaElement::sourceWasAdded - 'src' is %s", urlForLoggingMedia(url).utf8().data());
     }
 #endif
     
@@ -3281,7 +3281,7 @@
 #if !LOG_DISABLED
     if (source->hasTagName(sourceTag)) {
         KURL url = ""
-        LOG(Media, "HTMLMediaElement::sourceWasRemoved - 'src' is %s", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLMediaElement::sourceWasRemoved - 'src' is %s", urlForLoggingMedia(url).utf8().data());
     }
 #endif

Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (137377 => 137378)


--- trunk/Source/WebCore/html/HTMLTrackElement.cpp	2012-12-12 00:18:08 UTC (rev 137377)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp	2012-12-12 00:18:20 UTC (rev 137378)
@@ -36,15 +36,15 @@
 #include "RuntimeEnabledFeatures.h"
 #include "ScriptCallStack.h"
 #include "ScriptEventListener.h"
-
 using namespace std;
 
+
 namespace WebCore {
 
 using namespace HTMLNames;
 
 #if !LOG_DISABLED
-static String urlForLogging(const KURL& url)
+static String urlForLoggingTrack(const KURL& url)
 {
     static const unsigned maximumURLLengthForLogging = 128;
     
@@ -231,7 +231,7 @@
     if (!document()->contentSecurityPolicy()->allowMediaFromSource(url)) {
         DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Text track load denied by Content Security Policy.")));
         document()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, consoleMessage);
-        LOG(Media, "HTMLTrackElement::canLoadUrl(%s) -> rejected by Content Security Policy", urlForLogging(url).utf8().data());
+        LOG(Media, "HTMLTrackElement::canLoadUrl(%s) -> rejected by Content Security Policy", urlForLoggingTrack(url).utf8().data());
         return false;
     }
     

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to