Changeset 250434 in webkit

Timestamp:

Sep 27, 2019 10:54:22 AM (5 years ago)

Author:

Devin Rousso

Message:

Flaky Test: inspector/canvas/updateShader.html
​https://bugs.webkit.org/show_bug.cgi?id=202186
<rdar://problem/55716053>

Reviewed by Joseph Pecoraro.

If the WebGLProgram outlives it's WebGLRenderingContext, the ScriptExecutionContext*
that was provided in the constructor won't be invalidated leading to the bad access crash.

Rather than pass the ScriptExecutionContext* directly, have WebGLProgram inherit from
ContextDestructionObserver so that it can propertly invalidate (and notify Web Inspector)
when the related context is about to be destroyed.

Test: inspector/canvas/updateShader.html

• html/canvas/WebGLProgram.h:

(WebCore::WebGLProgram::scriptExecutionContext const): Deleted.

• html/canvas/WebGLProgram.cpp:

(WebCore::WebGLProgram::WebGLProgram):
(WebCore::WebGLProgram::contextDestroyed): Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLProgram.cpp (modified) (2 diffs)
• html/canvas/WebGLProgram.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-27  Devin Rousso  <drousso@apple.com>
+
+        Flaky Test: inspector/canvas/updateShader.html
+        https://bugs.webkit.org/show_bug.cgi?id=202186
+        <rdar://problem/55716053>
+
+        Reviewed by Joseph Pecoraro.
+
+        If the `WebGLProgram` outlives it's `WebGLRenderingContext`, the `ScriptExecutionContext*`
+        that was provided in the constructor won't be invalidated leading to the bad access crash.
+
+        Rather than pass the `ScriptExecutionContext*` directly, have `WebGLProgram` inherit from
+        `ContextDestructionObserver` so that it can propertly invalidate (and notify Web Inspector)
+        when the related context is about to be destroyed.
+
+        Test: inspector/canvas/updateShader.html
+
+        * html/canvas/WebGLProgram.h:
+        (WebCore::WebGLProgram::scriptExecutionContext const): Deleted.
+        * html/canvas/WebGLProgram.cpp:
+        (WebCore::WebGLProgram::WebGLProgram):
+        (WebCore::WebGLProgram::contextDestroyed): Added.
+
 2019-09-27  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -63 +63 @@
 WebGLProgram::WebGLProgram(WebGLRenderingContextBase& ctx)
     : WebGLSharedObject(ctx)
-    , m_scriptExecutionContext(ctx.scriptExecutionContext())
-{
-    ASSERT(m_scriptExecutionContext);
+    , ContextDestructionObserver(ctx.scriptExecutionContext())
+{
+    ASSERT(scriptExecutionContext());
 
     {
@@ -86 +86 @@
         instances(lock).remove(this);
     }
+}
+
+void WebGLProgram::contextDestroyed()
+{
+    InspectorInstrumentation::willDestroyWebGLProgram(*this);
+
+    ContextDestructionObserver::contextDestroyed();
 }
 

trunk/Source/WebCore/html/canvas/WebGLProgram.h

@@ -28 +28 @@
 #if ENABLE(WEBGL)
 
+#include "ContextDestructionObserver.h"
 #include "WebGLSharedObject.h"
 #include <wtf/Forward.h>
@@ -37 +38 @@
 class WebGLShader;
 
-class WebGLProgram final : public WebGLSharedObject {
+class WebGLProgram final : public WebGLSharedObject, public ContextDestructionObserver {
 public:
     static Ref<WebGLProgram> create(WebGLRenderingContextBase&);
@@ -45 +46 @@
     static Lock& instancesMutex();
 
-    ScriptExecutionContext* scriptExecutionContext() const { return m_scriptExecutionContext; }
+    void contextDestroyed() final;
 
     unsigned numActiveAttribLocations();
@@ -76 +77 @@
     void cacheInfoIfNeeded();
 
-    ScriptExecutionContext* m_scriptExecutionContext;
-
     Vector<GC3Dint> m_activeAttribLocations;