Changeset 251872 in webkit

Timestamp:

Oct 31, 2019 1:22:26 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Debugger: make sure the blackbox config is removed before iterating all existing scripts
​https://bugs.webkit.org/show_bug.cgi?id=203666

Reviewed by Matt Baker.

• inspector/agents/InspectorDebuggerAgent.h:
• inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::InspectorDebuggerAgent::setShouldBlackboxURL):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/agents/InspectorDebuggerAgent.cpp (modified) (2 diffs)
• inspector/agents/InspectorDebuggerAgent.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-10-31  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Debugger: make sure the blackbox config is removed before iterating all existing scripts
+        https://bugs.webkit.org/show_bug.cgi?id=203666
+
+        Reviewed by Matt Baker.
+
+        * inspector/agents/InspectorDebuggerAgent.h:
+        * inspector/agents/InspectorDebuggerAgent.cpp:
+        (Inspector::InspectorDebuggerAgent::setShouldBlackboxURL):
+
 2019-10-31  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp

@@ -906 +906 @@
     }
 
+    BlackboxConfig config { url, caseSensitive, isRegex };
     if (shouldBlackbox)
-        m_blackboxedURLs.append({ url, caseSensitive, isRegex });
+        m_blackboxedURLs.appendIfNotContains(config);
+    else
+        m_blackboxedURLs.removeAll(config);
 
     auto blackboxType = shouldBlackbox ? Optional<JSC::Debugger::BlackboxType>(JSC::Debugger::BlackboxType::Deferred) : WTF::nullopt;
@@ -916 +919 @@
             continue;
         m_scriptDebugServer.setBlackboxType(sourceID, blackboxType);
-    }
-
-    if (!shouldBlackbox) {
-        m_blackboxedURLs.removeAllMatching([&] (const auto& blackboxConfig) {
-            return blackboxConfig.url == url
-                && blackboxConfig.caseSensitive == caseSensitive
-                && blackboxConfig.isRegex == isRegex;
-        });
     }
 }

trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h

@@ -193 +193 @@
         bool caseSensitive { false };
         bool isRegex { false };
+
+        inline bool operator==(const BlackboxConfig& other) const
+        {
+            return url == other.url
+                && caseSensitive == other.caseSensitive
+                && isRegex == other.isRegex;
+        }
     };
     Vector<BlackboxConfig> m_blackboxedURLs;