Changeset 244569 in webkit

Timestamp:

Apr 23, 2019, 3:30:06 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Debugger: remove ASSERT_NOT_REACHED where it's possible to reach
​https://bugs.webkit.org/show_bug.cgi?id=197210
<rdar://problem/48462912>

Reviewed by Joseph Pecoraro.

• inspector/agents/page/PageDebuggerAgent.cpp:

(WebCore::PageDebuggerAgent::didAddEventListener):
(WebCore::PageDebuggerAgent::didPostMessage):

• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::consoleAgentEnabled):
(WebCore::InspectorInstrumentation::timelineAgentEnabled):
Drive-by: add additional FAST_RETURN_IF_NO_FRONTENDS.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• inspector/agents/page/PageDebuggerAgent.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-23  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Debugger: remove ASSERT_NOT_REACHED where it's possible to reach
+        https://bugs.webkit.org/show_bug.cgi?id=197210
+        <rdar://problem/48462912>
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/agents/page/PageDebuggerAgent.cpp:
+        (WebCore::PageDebuggerAgent::didAddEventListener):
+        (WebCore::PageDebuggerAgent::didPostMessage):
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::consoleAgentEnabled):
+        (WebCore::InspectorInstrumentation::timelineAgentEnabled):
+        Drive-by: add additional `FAST_RETURN_IF_NO_FRONTENDS`.
+
 2019-04-23  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -1092 +1092 @@
 bool InspectorInstrumentation::consoleAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
 {
-    InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext);
-    InspectorConsoleAgent* consoleAgent = instrumentingAgents ? instrumentingAgents->webConsoleAgent() : nullptr;
-    return consoleAgent && consoleAgent->enabled();
+    FAST_RETURN_IF_NO_FRONTENDS(false);
+    if (auto* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext)) {
+        if (auto* webConsoleAgent = instrumentingAgents->webConsoleAgent())
+            return webConsoleAgent->enabled();
+    }
+    return false;
 }
 
 bool InspectorInstrumentation::timelineAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
 {
-    InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext);
-    return instrumentingAgents && instrumentingAgents->inspectorTimelineAgent();
+    FAST_RETURN_IF_NO_FRONTENDS(false);
+    if (auto* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext))
+        return instrumentingAgents->inspectorTimelineAgent();
+    return false;
 }
 

trunk/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp

@@ -170 +170 @@
 
     auto& registeredListener = eventListeners.at(position);
-    if (m_registeredEventListeners.contains(registeredListener.get())) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
+    if (m_registeredEventListeners.contains(registeredListener.get()))
+        return;
 
     JSC::ExecState* scriptState = target.scriptExecutionContext()->execState();
@@ -235 +233 @@
         return;
 
-    if (m_postMessageTimers.contains(&timer)) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
+    if (m_postMessageTimers.contains(&timer))
+        return;
 
     int postMessageIdentifier = m_nextPostMessageIdentifier++;