Changeset 211229 in webkit

Timestamp:

Jan 26, 2017 1:34:45 PM (7 years ago)

Author:

Chris Dumez

Message:

Fix WebGL diagnostic logging
​https://bugs.webkit.org/show_bug.cgi?id=167463
<rdar://problem/30216981>

Reviewed by Alex Christensen.

Fix WebGL diagnostic logging so that it no longer uses logDiagnosticMessageWithValue().
This is because the value apparently needs to be numeric on Mac.

Source/WebCore:

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::checkForContextLossHandling):

• page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey):
(WebCore::WebCore::DiagnosticLoggingKeys::webGLStateKey):
(WebCore::DiagnosticLoggingKeys::stateKey): Deleted.
(WebCore::DiagnosticLoggingKeys::handlesContextLossKey): Deleted.
(WebCore::WebCore::DiagnosticLoggingKeys::webGLKey): Deleted.

• page/DiagnosticLoggingKeys.h:

Source/WebKit2:

• UIProcess/HighPerformanceGraphicsUsageSampler.cpp:

(WebKit::HighPerformanceGraphicsUsageSampler::timerFired):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (1 diff)
• WebCore/page/DiagnosticLoggingKeys.cpp (modified) (4 diffs)
• WebCore/page/DiagnosticLoggingKeys.h (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-26  Chris Dumez  <cdumez@apple.com>
+
+        Fix WebGL diagnostic logging
+        https://bugs.webkit.org/show_bug.cgi?id=167463
+        <rdar://problem/30216981>
+
+        Reviewed by Alex Christensen.
+
+        Fix WebGL diagnostic logging so that it no longer uses logDiagnosticMessageWithValue().
+        This is because the value apparently needs to be numeric on Mac.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::checkForContextLossHandling):
+        * page/DiagnosticLoggingKeys.cpp:
+        (WebCore::DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey):
+        (WebCore::WebCore::DiagnosticLoggingKeys::webGLStateKey):
+        (WebCore::DiagnosticLoggingKeys::stateKey): Deleted.
+        (WebCore::DiagnosticLoggingKeys::handlesContextLossKey): Deleted.
+        (WebCore::WebCore::DiagnosticLoggingKeys::webGLKey): Deleted.
+        * page/DiagnosticLoggingKeys.h:
+
 2017-01-26  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -502 +502 @@
 
     bool handlesContextLoss = canvas().hasEventListeners(eventNames().webglcontextlostEvent) && canvas().hasEventListeners(eventNames().webglcontextrestoredEvent);
-    page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::handlesContextLossKey(), handlesContextLoss ? DiagnosticLoggingKeys::yesKey() : DiagnosticLoggingKeys::noKey(), ShouldSample::No);
+    page->diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey(), handlesContextLoss ? DiagnosticLoggingKeys::yesKey() : DiagnosticLoggingKeys::noKey(), ShouldSample::No);
 }
 

trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

@@ -59 +59 @@
 }
 
+String DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey()
+{
+    return ASCIILiteral("pageHandlesWebGLContextLoss");
+}
+
 String DiagnosticLoggingKeys::postPageLoadKey()
 {
@@ -484 +489 @@
 }
 
-String DiagnosticLoggingKeys::stateKey()
-{
-    return ASCIILiteral("state");
-}
-
 String DiagnosticLoggingKeys::streamingMedia()
 {
@@ -659 +659 @@
 }
 
-String DiagnosticLoggingKeys::handlesContextLossKey()
-{
-    return ASCIILiteral("handlesContextLoss");
-}
-
 String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
 {
@@ -689 +684 @@
 }
 
-String WebCore::DiagnosticLoggingKeys::webGLKey()
-{
-    return ASCIILiteral("webGL");
+String WebCore::DiagnosticLoggingKeys::webGLStateKey()
+{
+    return ASCIILiteral("webGLState");
 }
 

trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -57 +57 @@
     static String expiredKey();
     static String fontKey();
-    static String handlesContextLossKey();
     static String hasPluginsKey();
     static String httpsNoStoreKey();
@@ -102 +101 @@
     static String pageContainsMediaEngineKey();
     static String pageContainsPluginKey();
+    static String pageHandlesWebGLContextLossKey();
     static String pageLoadedKey();
     static String playedKey();
@@ -129 +129 @@
     static String scriptKey();
     static String sourceKey();
-    WEBCORE_EXPORT static String stateKey();
     WEBCORE_EXPORT static String streamingMedia();
     static String styleSheetKey();
@@ -159 +158 @@
     WEBCORE_EXPORT static String wastedSpeculativeWarmupWithRevalidationKey();
     WEBCORE_EXPORT static String wastedSpeculativeWarmupWithoutRevalidationKey();
-    WEBCORE_EXPORT static String webGLKey();
+    WEBCORE_EXPORT static String webGLStateKey();
     WEBCORE_EXPORT static String webViewKey();
     static String yesKey();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-26  Chris Dumez  <cdumez@apple.com>
+
+        Fix WebGL diagnostic logging
+        https://bugs.webkit.org/show_bug.cgi?id=167463
+        <rdar://problem/30216981>
+
+        Reviewed by Alex Christensen.
+
+        Fix WebGL diagnostic logging so that it no longer uses logDiagnosticMessageWithValue().
+        This is because the value apparently needs to be numeric on Mac.
+
+        * UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
+        (WebKit::HighPerformanceGraphicsUsageSampler::timerFired):
+
 2017-01-26  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp

@@ -73 +73 @@
         state = DiagnosticLoggingKeys::activeInBackgroundTabOnlyKey();
 
-    firstPage->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::stateKey(), state, false);
+    firstPage->logDiagnosticMessage(DiagnosticLoggingKeys::webGLStateKey(), state, false);
 }