Changeset 243611 in webkit

Timestamp:

Mar 28, 2019, 11:08:03 AM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Canvas: unbinding a canvas should always remove the agent as an observer
​https://bugs.webkit.org/show_bug.cgi?id=196324
<rdar://problem/49357109>

Reviewed by Matt Baker.

No change in functionality.

• html/CanvasBase.cpp:

(WebCore::CanvasBase::notifyObserversCanvasChanged):
(WebCore::CanvasBase::notifyObserversCanvasResized):
(WebCore::CanvasBase::notifyObserversCanvasDestroyed):

• inspector/agents/InspectorCanvasAgent.cpp:

(WebCore::InspectorCanvasAgent::frameNavigated):
(WebCore::InspectorCanvasAgent::bindCanvas):
(WebCore::InspectorCanvasAgent::unbindCanvas):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/CanvasBase.cpp (modified) (4 diffs)
• inspector/agents/InspectorCanvasAgent.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-28  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Canvas: unbinding a canvas should always remove the agent as an observer
+        https://bugs.webkit.org/show_bug.cgi?id=196324
+        <rdar://problem/49357109>
+
+        Reviewed by Matt Baker.
+
+        No change in functionality.
+
+        * html/CanvasBase.cpp:
+        (WebCore::CanvasBase::notifyObserversCanvasChanged):
+        (WebCore::CanvasBase::notifyObserversCanvasResized):
+        (WebCore::CanvasBase::notifyObserversCanvasDestroyed):
+
+        * inspector/agents/InspectorCanvasAgent.cpp:
+        (WebCore::InspectorCanvasAgent::frameNavigated):
+        (WebCore::InspectorCanvasAgent::bindCanvas):
+        (WebCore::InspectorCanvasAgent::unbindCanvas):
+
 2019-03-28  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WebCore/html/CanvasBase.cpp

@@ -32 +32 @@
 #include "FloatRect.h"
 #include "InspectorInstrumentation.h"
+#include <wtf/Vector.h>
 
 namespace WebCore {
@@ -70 +71 @@
 void CanvasBase::notifyObserversCanvasChanged(const FloatRect& rect)
 {
-    for (auto& observer : m_observers)
+    for (auto& observer : copyToVector(m_observers))
         observer->canvasChanged(*this, rect);
 }
@@ -76 +77 @@
 void CanvasBase::notifyObserversCanvasResized()
 {
-    for (auto& observer : m_observers)
+    for (auto& observer : copyToVector(m_observers))
         observer->canvasResized(*this);
 }
@@ -84 +85 @@
     ASSERT(!m_didNotifyObserversCanvasDestroyed);
 
-    for (auto& observer : m_observers)
+    for (auto& observer : copyToVector(m_observers))
         observer->canvasDestroyed(*this);
 

trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp

@@ -379 +379 @@
 
     for (auto* inspectorCanvas : inspectorCanvases) {
-        inspectorCanvas->context().canvasBase().removeObserver(*this);
-
         String identifier = unbindCanvas(*inspectorCanvas);
         m_frontendDispatcher->canvasRemoved(identifier);
@@ -648 +646 @@
 InspectorCanvas& InspectorCanvasAgent::bindCanvas(CanvasRenderingContext& context, bool captureBacktrace)
 {
-    context.canvasBase().addObserver(*this);
-
     auto inspectorCanvas = InspectorCanvas::create(context);
     m_identifierToInspectorCanvas.set(inspectorCanvas->identifier(), inspectorCanvas.copyRef());
+
+    inspectorCanvas->context().canvasBase().addObserver(*this);
 
     m_frontendDispatcher->canvasAdded(inspectorCanvas->buildObjectForCanvas(captureBacktrace));
@@ -683 +681 @@
 #endif
 
+    inspectorCanvas.context().canvasBase().removeObserver(*this);
+
     String identifier = inspectorCanvas.identifier();
     m_identifierToInspectorCanvas.remove(identifier);