Skip to content
Permalink
Browse files
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):


Canonical link: https://commits.webkit.org/184505@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@211229 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Jan 26, 2017
1 parent 30437e7 commit e7cbcf0cced0a6ad547bb62d05d2e7aaa18dcb4a
@@ -1,3 +1,24 @@
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>

Simple line layout: Add support for -webkit-hyphenate-limit-lines
@@ -501,7 +501,7 @@ void WebGLRenderingContextBase::checkForContextLossHandling()
return;

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);
}

void WebGLRenderingContextBase::registerWithWebGLStateTracker()
@@ -58,6 +58,11 @@ String DiagnosticLoggingKeys::postPageBackgroundingKey()
return ASCIILiteral("postPageBackgrounding");
}

String DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey()
{
return ASCIILiteral("pageHandlesWebGLContextLoss");
}

String DiagnosticLoggingKeys::postPageLoadKey()
{
return ASCIILiteral("postPageLoad");
@@ -483,11 +488,6 @@ String DiagnosticLoggingKeys::sourceKey()
return ASCIILiteral("source");
}

String DiagnosticLoggingKeys::stateKey()
{
return ASCIILiteral("state");
}

String DiagnosticLoggingKeys::streamingMedia()
{
return ASCIILiteral("streamingMedia");
@@ -658,11 +658,6 @@ String DiagnosticLoggingKeys::fontKey()
return ASCIILiteral("font");
}

String DiagnosticLoggingKeys::handlesContextLossKey()
{
return ASCIILiteral("handlesContextLoss");
}

String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
{
return ASCIILiteral("pruned.memoryPressure");
@@ -688,9 +683,9 @@ String DiagnosticLoggingKeys::notInCacheKey()
return ASCIILiteral("notInCache");
}

String WebCore::DiagnosticLoggingKeys::webGLKey()
String WebCore::DiagnosticLoggingKeys::webGLStateKey()
{
return ASCIILiteral("webGL");
return ASCIILiteral("webGLState");
}

String DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage)
@@ -56,7 +56,6 @@ class DiagnosticLoggingKeys {
WEBCORE_EXPORT static String entryWronglyNotWarmedUpKey();
static String expiredKey();
static String fontKey();
static String handlesContextLossKey();
static String hasPluginsKey();
static String httpsNoStoreKey();
static String imageKey();
@@ -101,6 +100,7 @@ class DiagnosticLoggingKeys {
static String pageContainsAtLeastOnePluginKey();
static String pageContainsMediaEngineKey();
static String pageContainsPluginKey();
static String pageHandlesWebGLContextLossKey();
static String pageLoadedKey();
static String playedKey();
static String pluginLoadedKey();
@@ -128,7 +128,6 @@ class DiagnosticLoggingKeys {
static String sameLoadKey();
static String scriptKey();
static String sourceKey();
WEBCORE_EXPORT static String stateKey();
WEBCORE_EXPORT static String streamingMedia();
static String styleSheetKey();
WEBCORE_EXPORT static String successfulSpeculativeWarmupWithRevalidationKey();
@@ -158,7 +157,7 @@ class DiagnosticLoggingKeys {
WEBCORE_EXPORT static String visibleAndActiveStateKey();
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();
WEBCORE_EXPORT static String zoomedKey();
@@ -1,3 +1,17 @@
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>

Add support for recognizing data interaction gestures in WebKit2
@@ -72,7 +72,7 @@ void HighPerformanceGraphicsUsageSampler::timerFired()
else if (isUsingHighPerformanceWebGL)
state = DiagnosticLoggingKeys::activeInBackgroundTabOnlyKey();

firstPage->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::stateKey(), state, false);
firstPage->logDiagnosticMessage(DiagnosticLoggingKeys::webGLStateKey(), state, false);
}

} // namespace WebKit

0 comments on commit e7cbcf0

Please sign in to comment.