Commit 6e3dc073 authored by Johannes Henkel's avatar Johannes Henkel Committed by Commit Bot

Use IsEmpty for map keys.

And a small refactoring for readability of finding an xhr breakpoint.

I introduced IsEmpty in this PR:
https://chromium-review.googlesource.com/c/chromium/src/+/1154038

Change-Id: I7b02c9d4d4ae1e051688790f5043d8710cf1c692
Reviewed-on: https://chromium-review.googlesource.com/1154190Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579495}
parent 4a9f8298
...@@ -711,20 +711,20 @@ Response InspectorDOMDebuggerAgent::removeXHRBreakpoint(const String& url) { ...@@ -711,20 +711,20 @@ Response InspectorDOMDebuggerAgent::removeXHRBreakpoint(const String& url) {
return Response::OK(); return Response::OK();
} }
void InspectorDOMDebuggerAgent::WillSendXMLHttpOrFetchNetworkRequest( // Returns the breakpoint url if a match is found, or WTF::String().
const String& url) { String InspectorDOMDebuggerAgent::MatchXHRBreakpoints(const String& url) const {
String breakpoint_url; if (pause_on_all_xhrs_.Get())
if (pause_on_all_xhrs_.Get()) { return "";
breakpoint_url = "";
} else {
for (const WTF::String& breakpoint : xhr_breakpoints_.Keys()) { for (const WTF::String& breakpoint : xhr_breakpoints_.Keys()) {
if (url.Contains(breakpoint)) { if (url.Contains(breakpoint))
breakpoint_url = breakpoint; return breakpoint;
break;
}
}
} }
return WTF::String();
}
void InspectorDOMDebuggerAgent::WillSendXMLHttpOrFetchNetworkRequest(
const String& url) {
String breakpoint_url = MatchXHRBreakpoints(url);
if (breakpoint_url.IsNull()) if (breakpoint_url.IsNull())
return; return;
...@@ -754,9 +754,9 @@ void InspectorDOMDebuggerAgent::DidAddBreakpoint() { ...@@ -754,9 +754,9 @@ void InspectorDOMDebuggerAgent::DidAddBreakpoint() {
void InspectorDOMDebuggerAgent::DidRemoveBreakpoint() { void InspectorDOMDebuggerAgent::DidRemoveBreakpoint() {
if (!dom_breakpoints_.IsEmpty()) if (!dom_breakpoints_.IsEmpty())
return; return;
if (!event_listener_breakpoints_.Keys().empty()) if (!event_listener_breakpoints_.IsEmpty())
return; return;
if (!xhr_breakpoints_.Keys().empty()) if (!xhr_breakpoints_.IsEmpty())
return; return;
if (pause_on_all_xhrs_.Get()) if (pause_on_all_xhrs_.Get())
return; return;
......
...@@ -133,6 +133,8 @@ class CORE_EXPORT InspectorDOMDebuggerAgent final ...@@ -133,6 +133,8 @@ class CORE_EXPORT InspectorDOMDebuggerAgent final
const v8_inspector::StringView& object_group_id); const v8_inspector::StringView& object_group_id);
private: private:
String MatchXHRBreakpoints(const String& url) const;
static void EventListenersInfoForTarget(v8::Isolate*, static void EventListenersInfoForTarget(v8::Isolate*,
v8::Local<v8::Value>, v8::Local<v8::Value>,
int depth, int depth,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment