Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211264 => 211265)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-27 08:02:01 UTC (rev 211264)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-27 08:02:05 UTC (rev 211265)
@@ -1,5 +1,30 @@
2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211229. rdar://problem/30216981
+
+ 2017-01-26 Chris Dumez <cdu...@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 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211220. rdar://problem/29578619
2017-01-26 Brady Eidson <beid...@apple.com>
Modified: branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (211264 => 211265)
--- branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-27 08:02:01 UTC (rev 211264)
+++ branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-27 08:02:05 UTC (rev 211265)
@@ -523,7 +523,7 @@
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()
Modified: branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp (211264 => 211265)
--- branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-27 08:02:01 UTC (rev 211264)
+++ branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-27 08:02:05 UTC (rev 211265)
@@ -58,6 +58,11 @@
return ASCIILiteral("postPageBackgrounding");
}
+String DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey()
+{
+ return ASCIILiteral("pageHandlesWebGLContextLoss");
+}
+
String DiagnosticLoggingKeys::postPageLoadKey()
{
return ASCIILiteral("postPageLoad");
@@ -483,11 +488,6 @@
return ASCIILiteral("source");
}
-String DiagnosticLoggingKeys::stateKey()
-{
- return ASCIILiteral("state");
-}
-
String DiagnosticLoggingKeys::streamingMedia()
{
return ASCIILiteral("streamingMedia");
@@ -658,11 +658,6 @@
return ASCIILiteral("font");
}
-String DiagnosticLoggingKeys::handlesContextLossKey()
-{
- return ASCIILiteral("handlesContextLoss");
-}
-
String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
{
return ASCIILiteral("pruned.memoryPressure");
@@ -688,9 +683,9 @@
return ASCIILiteral("notInCache");
}
-String WebCore::DiagnosticLoggingKeys::webGLKey()
+String WebCore::DiagnosticLoggingKeys::webGLStateKey()
{
- return ASCIILiteral("webGL");
+ return ASCIILiteral("webGLState");
}
String DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage)
Modified: branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h (211264 => 211265)
--- branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-27 08:02:01 UTC (rev 211264)
+++ branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-27 08:02:05 UTC (rev 211265)
@@ -56,7 +56,6 @@
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 @@
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 @@
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 @@
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();
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211264 => 211265)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:01 UTC (rev 211264)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:05 UTC (rev 211265)
@@ -1,5 +1,23 @@
2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211229. rdar://problem/30216981
+
+ 2017-01-26 Chris Dumez <cdu...@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 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211223. rdar://problem/30181179
2017-01-26 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp (211264 => 211265)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp 2017-01-27 08:02:01 UTC (rev 211264)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp 2017-01-27 08:02:05 UTC (rev 211265)
@@ -72,7 +72,7 @@
else if (isUsingHighPerformanceWebGL)
state = DiagnosticLoggingKeys::activeInBackgroundTabOnlyKey();
- firstPage->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::stateKey(), state, false);
+ firstPage->logDiagnosticMessage(DiagnosticLoggingKeys::webGLStateKey(), state, false);
}
} // namespace WebKit
