Diff
Modified: trunk/Source/WebCore/ChangeLog (158407 => 158408)
--- trunk/Source/WebCore/ChangeLog 2013-10-31 23:56:18 UTC (rev 158407)
+++ trunk/Source/WebCore/ChangeLog 2013-11-01 00:01:16 UTC (rev 158408)
@@ -1,3 +1,30 @@
+2013-10-31 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Convert some InspectorObject member variables to HashSet/HashMap
+ https://bugs.webkit.org/show_bug.cgi?id=123579
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
+ (WebCore::InspectorDOMDebuggerAgent::setBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
+ (WebCore::InspectorDOMDebuggerAgent::setXHRBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeXHRBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
+ Make m_eventListenerBreakpoints and m_xhrBreakpoints HashSet.
+
+ * inspector/InspectorDebuggerAgent.h:
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+ (WebCore::InspectorDebuggerAgent::disable):
+ (WebCore::InspectorDebuggerAgent::setBreakpointByUrl):
+ (WebCore::InspectorDebuggerAgent::removeBreakpoint):
+ (WebCore::InspectorDebuggerAgent::didParseSource):
+ Make m_javaScriptBreakpoints a HashMap.
+
2013-10-31 Youenn Fablet <[email protected]>
Correct the elapsedTime calculation in SVG animations
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (158407 => 158408)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2013-10-31 23:56:18 UTC (rev 158407)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2013-11-01 00:01:16 UTC (rev 158408)
@@ -73,8 +73,6 @@
: InspectorBaseAgent<InspectorDOMDebuggerAgent>("DOMDebugger", instrumentingAgents, inspectorState)
, m_domAgent(domAgent)
, m_debuggerAgent(debuggerAgent)
- , m_eventListenerBreakpoints(InspectorObject::create())
- , m_xhrBreakpoints(InspectorObject::create())
, m_pauseInNextEventListener(false)
, m_pauseOnAllXHRsEnabled(false)
{
@@ -147,7 +145,7 @@
return;
}
- m_eventListenerBreakpoints->setBoolean(eventName, true);
+ m_eventListenerBreakpoints.add(eventName);
}
void InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const String& eventName)
@@ -167,7 +165,7 @@
return;
}
- m_eventListenerBreakpoints->remove(eventName);
+ m_eventListenerBreakpoints.remove(eventName);
}
void InspectorDOMDebuggerAgent::didInvalidateStyleAttr(Node* node)
@@ -365,7 +363,7 @@
if (m_pauseInNextEventListener)
m_pauseInNextEventListener = false;
else {
- if (m_eventListenerBreakpoints->find(fullEventName) == m_eventListenerBreakpoints->end())
+ if (!m_eventListenerBreakpoints.contains(fullEventName))
return;
}
@@ -384,7 +382,7 @@
return;
}
- m_xhrBreakpoints->setBoolean(url, true);
+ m_xhrBreakpoints.add(url);
}
void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
@@ -394,7 +392,7 @@
return;
}
- m_xhrBreakpoints->remove(url);
+ m_xhrBreakpoints.remove(url);
}
void InspectorDOMDebuggerAgent::willSendXMLHttpRequest(const String& url)
@@ -403,9 +401,9 @@
if (m_pauseOnAllXHRsEnabled)
breakpointURL = "";
else {
- for (InspectorObject::iterator it = m_xhrBreakpoints->begin(); it != m_xhrBreakpoints->end(); ++it) {
- if (url.contains(it->key)) {
- breakpointURL = it->key;
+ for (auto it = m_xhrBreakpoints.begin(), end = m_xhrBreakpoints.end(); it != end; ++it) {
+ if (url.contains(*it)) {
+ breakpointURL = *it;
break;
}
}
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (158407 => 158408)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2013-10-31 23:56:18 UTC (rev 158407)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2013-11-01 00:01:16 UTC (rev 158408)
@@ -106,8 +106,8 @@
InspectorDOMAgent* m_domAgent;
InspectorDebuggerAgent* m_debuggerAgent;
HashMap<Node*, uint32_t> m_domBreakpoints;
- RefPtr<InspectorObject> m_eventListenerBreakpoints;
- RefPtr<InspectorObject> m_xhrBreakpoints;
+ HashSet<String> m_eventListenerBreakpoints;
+ HashSet<String> m_xhrBreakpoints;
bool m_pauseInNextEventListener;
bool m_pauseOnAllXHRsEnabled;
};
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (158407 => 158408)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-10-31 23:56:18 UTC (rev 158407)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-11-01 00:01:16 UTC (rev 158408)
@@ -60,7 +60,6 @@
, m_injectedScriptManager(injectedScriptManager)
, m_frontend(0)
, m_pausedScriptState(0)
- , m_javaScriptBreakpoints(InspectorObject::create())
, m_enabled(false)
, m_javaScriptPauseScheduled(false)
, m_listener(0)
@@ -90,7 +89,7 @@
void InspectorDebuggerAgent::disable()
{
- m_javaScriptBreakpoints = InspectorObject::create();
+ m_javaScriptBreakpoints.clear();
m_instrumentingAgents->setInspectorDebuggerAgent(0);
stopListeningScriptDebugServer();
@@ -276,7 +275,7 @@
bool isRegex = optionalURLRegex;
String breakpointId = (isRegex ? "/" + url + "/" : url) + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
- if (m_javaScriptBreakpoints->find(breakpointId) != m_javaScriptBreakpoints->end()) {
+ if (m_javaScriptBreakpoints.contains(breakpointId)) {
*errorString = "Breakpoint at specified location already exists.";
return;
}
@@ -294,7 +293,7 @@
if (!breakpointActionsFromProtocol(errorString, actions, &breakpointActions))
return;
- m_javaScriptBreakpoints->setObject(breakpointId, buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, isRegex, autoContinue));
+ m_javaScriptBreakpoints.set(breakpointId, buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, isRegex, autoContinue));
ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition, breakpointActions, autoContinue);
for (ScriptsMap::iterator it = m_scripts.begin(); it != m_scripts.end(); ++it) {
@@ -358,7 +357,7 @@
void InspectorDebuggerAgent::removeBreakpoint(ErrorString*, const String& breakpointId)
{
- m_javaScriptBreakpoints->remove(breakpointId);
+ m_javaScriptBreakpoints.remove(breakpointId);
BreakpointIdToDebugServerBreakpointIdsMap::iterator debugServerBreakpointIdsIterator = m_breakpointIdToDebugServerBreakpointIds.find(breakpointId);
if (debugServerBreakpointIdsIterator == m_breakpointIdToDebugServerBreakpointIds.end())
@@ -696,7 +695,7 @@
if (scriptURL.isEmpty())
return;
- for (InspectorObject::iterator it = m_javaScriptBreakpoints->begin(); it != m_javaScriptBreakpoints->end(); ++it) {
+ for (auto it = m_javaScriptBreakpoints.begin(), end = m_javaScriptBreakpoints.end(); it != end; ++it) {
RefPtr<InspectorObject> breakpointObject = it->value->asObject();
bool isRegex;
breakpointObject->getBoolean("isRegex", &isRegex);
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (158407 => 158408)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-10-31 23:56:18 UTC (rev 158407)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-11-01 00:01:16 UTC (rev 158408)
@@ -164,6 +164,7 @@
typedef HashMap<String, Script> ScriptsMap;
typedef HashMap<String, Vector<String>> BreakpointIdToDebugServerBreakpointIdsMap;
+ typedef HashMap<String, RefPtr<InspectorObject>> BreakpointIdToBreakpointMap;
InjectedScriptManager* m_injectedScriptManager;
InspectorFrontend::Debugger* m_frontend;
@@ -171,10 +172,10 @@
ScriptValue m_currentCallStack;
ScriptsMap m_scripts;
BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpointIds;
+ BreakpointIdToBreakpointMap m_javaScriptBreakpoints;
String m_continueToLocationBreakpointId;
InspectorFrontend::Debugger::Reason::Enum m_breakReason;
RefPtr<InspectorObject> m_breakAuxData;
- RefPtr<InspectorObject> m_javaScriptBreakpoints;
bool m_enabled;
bool m_javaScriptPauseScheduled;
Listener* m_listener;
