Changeset 211298 in webkit

Timestamp:

Jan 27, 2017 12:35:53 PM (7 years ago)

Author:

Chris Dumez

Message:

Fix diagnostic logging in media code
​https://bugs.webkit.org/show_bug.cgi?id=167510

Reviewed by Alex Christensen.

Fix diagnostic logging in media code. It should not use logDiagnosticMessageWithValue()
with a non-numeric value.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::loadResource):
(WebCore::HTMLMediaElement::updatePlayState):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• page/DiagnosticLoggingKeys.cpp (modified) (1 diff)
• page/DiagnosticLoggingKeys.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-27  Chris Dumez  <cdumez@apple.com>
+
+        Fix diagnostic logging in media code
+        https://bugs.webkit.org/show_bug.cgi?id=167510
+
+        Reviewed by Alex Christensen.
+
+        Fix diagnostic logging in media code. It should not use logDiagnosticMessageWithValue()
+        with a non-numeric value.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::loadResource):
+        (WebCore::HTMLMediaElement::updatePlayState):
+
 2017-01-27  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1456 +1456 @@
 
     // Log that we started loading a media element.
-    page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::mediaKey(), isVideo() ? DiagnosticLoggingKeys::videoKey() : DiagnosticLoggingKeys::audioKey(), DiagnosticLoggingKeys::loadingKey(), ShouldSample::No);
+    page->diagnosticLoggingClient().logDiagnosticMessage(isVideo() ? DiagnosticLoggingKeys::videoKey() : DiagnosticLoggingKeys::audioKey(), DiagnosticLoggingKeys::loadingKey(), ShouldSample::No);
 
     m_firstTimePlaying = true;
@@ -4904 +4904 @@
                 // Log that a media element was played.
                 if (auto* page = document().page())
-                    page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::mediaKey(), isVideo() ? DiagnosticLoggingKeys::videoKey() : DiagnosticLoggingKeys::audioKey(), DiagnosticLoggingKeys::playedKey(), ShouldSample::No);
+                    page->diagnosticLoggingClient().logDiagnosticMessage(isVideo() ? DiagnosticLoggingKeys::videoKey() : DiagnosticLoggingKeys::audioKey(), DiagnosticLoggingKeys::playedKey(), ShouldSample::No);
                 m_firstTimePlaying = false;
             }

trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

@@ -219 +219 @@
 }
 
-String DiagnosticLoggingKeys::mediaKey()
-{
-    return ASCIILiteral("media");
-}
-
 String DiagnosticLoggingKeys::isErrorPageKey()
 {

trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -76 +76 @@
     static String mainDocumentErrorKey();
     static String mainResourceKey();
-    static String mediaKey();
     static String mediaLoadedKey();
     static String mediaLoadingFailedKey();