Changeset 211211 in webkit

Timestamp:

Jan 26, 2017 7:52:52 AM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211151. rdar://problem/30171195

Location:

branches/safari-603-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContextBase.cpp (modified) (5 diffs)
• html/canvas/WebGLRenderingContextBase.h (modified) (1 diff)
• page/DiagnosticLoggingKeys.cpp (modified) (3 diffs)
• page/DiagnosticLoggingKeys.h (modified) (3 diffs)

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-25  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211151. rdar://problem/30171195
+
+    2017-01-25  Chris Dumez  <cdumez@apple.com>
+
+            Measure how common it is for content to deal with WebGL context loss
+            https://bugs.webkit.org/show_bug.cgi?id=166866
+            <rdar://problem/30171195>
+
+            Reviewed by Alex Christensen.
+
+            Add diagnostic logging to measure how common it is for sites to handle
+            WebGL context loss via the webglcontextlost & webglcontextrestored
+            events.
+
+            * html/canvas/WebGLRenderingContextBase.cpp:
+            (WebCore::WebGLRenderingContextBase::WebGLRenderingContextBase):
+            (WebCore::WebGLRenderingContextBase::checkForContextLossHandling):
+            * html/canvas/WebGLRenderingContextBase.h:
+            * page/DiagnosticLoggingKeys.cpp:
+            (WebCore::DiagnosticLoggingKeys::noKey):
+            (WebCore::DiagnosticLoggingKeys::yesKey):
+            (WebCore::DiagnosticLoggingKeys::handlesContextLossKey):
+            * page/DiagnosticLoggingKeys.h:
+
 2017-01-25  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -32 +32 @@
 #include "CachedImage.h"
 #include "DOMWindow.h"
+#include "DiagnosticLoggingClient.h"
+#include "DiagnosticLoggingKeys.h"
 #include "Document.h"
 #include "EXTBlendMinMax.h"
@@ -101 +103 @@
 const double secondsBetweenRestoreAttempts = 1.0;
 const int maxGLErrorsAllowedToConsole = 256;
+static const std::chrono::seconds checkContextLossHandlingDelay { 3 };
 
 namespace {
@@ -471 +474 @@
     , m_isPendingPolicyResolution(true)
     , m_hasRequestedPolicyResolution(false)
+    , m_checkForContextLossHandlingTimer(*this, &WebGLRenderingContextBase::checkForContextLossHandling)
 {
     registerWithWebGLStateTracker();
+    m_checkForContextLossHandlingTimer.startOneShot(checkContextLossHandlingDelay);
 }
 
@@ -490 +495 @@
     , m_isPendingPolicyResolution(false)
     , m_hasRequestedPolicyResolution(false)
+    , m_checkForContextLossHandlingTimer(*this, &WebGLRenderingContextBase::checkForContextLossHandling)
 {
     ASSERT(m_context);
@@ -503 +509 @@
     initializeNewContext();
     registerWithWebGLStateTracker();
+    m_checkForContextLossHandlingTimer.startOneShot(checkContextLossHandlingDelay);
+}
+
+// We check for context loss handling after a few seconds to give the JS a chance to register the event listeners
+// and to discard temporary GL contexts (e.g. feature detection).
+void WebGLRenderingContextBase::checkForContextLossHandling()
+{
+    if (!canvas().renderer())
+        return;
+
+    auto* page = canvas().document().page();
+    if (!page)
+        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);
 }
 

branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.h

@@ -804 +804 @@
     bool validateArrayBufferType(const char* functionName, GC3Denum type, std::optional<JSC::TypedArrayType>);
     void registerWithWebGLStateTracker();
+    void checkForContextLossHandling();
 
     WebGLStateTracker::Token m_trackerToken;
+    Timer m_checkForContextLossHandlingTimer;
 };
 

branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp

@@ -154 +154 @@
 }
 
+String DiagnosticLoggingKeys::noKey()
+{
+    return ASCIILiteral("no");
+}
+
 String DiagnosticLoggingKeys::noCacheKey()
 {
@@ -634 +639 @@
 }
 
+String DiagnosticLoggingKeys::yesKey()
+{
+    return ASCIILiteral("yes");
+}
+
 String DiagnosticLoggingKeys::zoomedKey()
 {
@@ -647 +657 @@
 {
     return ASCIILiteral("font");
+}
+
+String DiagnosticLoggingKeys::handlesContextLossKey()
+{
+    return ASCIILiteral("handlesContextLoss");
 }
 

branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -57 +57 @@
     static String expiredKey();
     static String fontKey();
+    static String handlesContextLossKey();
     static String hasPluginsKey();
     static String httpsNoStoreKey();
@@ -85 +86 @@
     WEBCORE_EXPORT static String networkProcessCrashedKey();
     WEBCORE_EXPORT static String neverSeenBeforeKey();
+    static String noKey();
     static String noCacheKey();
     static String noCurrentHistoryItemKey();
@@ -159 +161 @@
     WEBCORE_EXPORT static String webGLKey();
     WEBCORE_EXPORT static String webViewKey();
+    static String yesKey();
     WEBCORE_EXPORT static String zoomedKey();