[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [158408] trunk/Source/WebCore
From: commit-queue () webkit ! org
Date: 2013-10-31 23:59:26
Message-ID: 20131101000117.1EB90303A2C () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[158408] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/158408">158408</a></dd> \
<dt>Author</dt> <dd>commit-queue@webkit.org</dd> <dt>Date</dt> <dd>2013-10-31 \
17:01:16 -0700 (Thu, 31 Oct 2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Web Inspector: Convert some InspectorObject member variables to HashSet/HashMap
https://bugs.webkit.org/show_bug.cgi?id=123579
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-10-31
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158407 => \
158408)</h4> <pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2013-10-31 Joseph Pecoraro <pecoraro@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2013-10-31 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Correct the elapsedTime calculation in SVG \
animations </span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (158407 => 158408)</h4> \
<pre class="diff"><span> <span class="info">--- \
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) </span><span class="lines">@@ -73,8 +73,6 @@
</span><span class="cx"> : \
InspectorBaseAgent<InspectorDOMDebuggerAgent>("DOMDebugger", \
instrumentingAgents, inspectorState) </span><span class="cx"> , \
m_domAgent(domAgent) </span><span class="cx"> , m_debuggerAgent(debuggerAgent)
</span><del>- , m_eventListenerBreakpoints(InspectorObject::create())
- , m_xhrBreakpoints(InspectorObject::create())
</del><span class="cx"> , m_pauseInNextEventListener(false)
</span><span class="cx"> , m_pauseOnAllXHRsEnabled(false)
</span><span class="cx"> {
</span><span class="lines">@@ -147,7 +145,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_eventListenerBreakpoints->setBoolean(eventName, true);
</del><ins>+ m_eventListenerBreakpoints.add(eventName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const \
String& eventName) </span><span class="lines">@@ -167,7 +165,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_eventListenerBreakpoints->remove(eventName);
</del><ins>+ m_eventListenerBreakpoints.remove(eventName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::didInvalidateStyleAttr(Node* \
node) </span><span class="lines">@@ -365,7 +363,7 @@
</span><span class="cx"> if (m_pauseInNextEventListener)
</span><span class="cx"> m_pauseInNextEventListener = false;
</span><span class="cx"> else {
</span><del>- if (m_eventListenerBreakpoints->find(fullEventName) == \
m_eventListenerBreakpoints->end()) </del><ins>+ if \
(!m_eventListenerBreakpoints.contains(fullEventName)) </ins><span class="cx"> \
return; </span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -384,7 +382,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_xhrBreakpoints->setBoolean(url, true);
</del><ins>+ m_xhrBreakpoints.add(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url) \
</span><span class="lines">@@ -394,7 +392,7 @@ </span><span class="cx"> \
return; </span><span class="cx"> }
</span><span class="cx">
</span><del>- m_xhrBreakpoints->remove(url);
</del><ins>+ m_xhrBreakpoints.remove(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::willSendXMLHttpRequest(const \
String& url) </span><span class="lines">@@ -403,9 +401,9 @@
</span><span class="cx"> if (m_pauseOnAllXHRsEnabled)
</span><span class="cx"> breakpointURL = "";
</span><span class="cx"> else {
</span><del>- for (InspectorObject::iterator it = \
m_xhrBreakpoints->begin(); it != m_xhrBreakpoints->end(); ++it) \
{
- if (url.contains(it->key)) {
- breakpointURL = it->key;
</del><ins>+ for (auto it = m_xhrBreakpoints.begin(), end = \
m_xhrBreakpoints.end(); it != end; ++it) { + if (url.contains(*it)) {
+ breakpointURL = *it;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (158407 => 158408)</h4> \
<pre class="diff"><span> <span class="info">--- \
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) </span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx"> InspectorDebuggerAgent* m_debuggerAgent;
</span><span class="cx"> HashMap<Node*, uint32_t> m_domBreakpoints;
</span><del>- RefPtr<InspectorObject> m_eventListenerBreakpoints;
- RefPtr<InspectorObject> m_xhrBreakpoints;
</del><ins>+ HashSet<String> m_eventListenerBreakpoints;
+ HashSet<String> m_xhrBreakpoints;
</ins><span class="cx"> bool m_pauseInNextEventListener;
</span><span class="cx"> bool m_pauseOnAllXHRsEnabled;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (158407 => 158408)</h4> \
<pre class="diff"><span> <span class="info">--- \
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) </span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><span class="cx"> , m_frontend(0)
</span><span class="cx"> , m_pausedScriptState(0)
</span><del>- , m_javaScriptBreakpoints(InspectorObject::create())
</del><span class="cx"> , m_enabled(false)
</span><span class="cx"> , m_javaScriptPauseScheduled(false)
</span><span class="cx"> , m_listener(0)
</span><span class="lines">@@ -90,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::disable()
</span><span class="cx"> {
</span><del>- m_javaScriptBreakpoints = InspectorObject::create();
</del><ins>+ m_javaScriptBreakpoints.clear();
</ins><span class="cx"> m_instrumentingAgents->setInspectorDebuggerAgent(0);
</span><span class="cx">
</span><span class="cx"> stopListeningScriptDebugServer();
</span><span class="lines">@@ -276,7 +275,7 @@
</span><span class="cx"> bool isRegex = optionalURLRegex;
</span><span class="cx">
</span><span class="cx"> String breakpointId = (isRegex ? "/" + url + \
"/" : url) + ':' + String::number(lineNumber) + ':' + \
String::number(columnNumber); </span><del>- if \
(m_javaScriptBreakpoints->find(breakpointId) != m_javaScriptBreakpoints->end()) \
{ </del><ins>+ if (m_javaScriptBreakpoints.contains(breakpointId)) {
</ins><span class="cx"> *errorString = "Breakpoint at specified location \
already exists."; </span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -294,7 +293,7 @@
</span><span class="cx"> if (!breakpointActionsFromProtocol(errorString, actions, \
&breakpointActions)) </span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_javaScriptBreakpoints->setObject(breakpointId, \
buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, \
isRegex, autoContinue)); </del><ins>+ m_javaScriptBreakpoints.set(breakpointId, \
buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, \
isRegex, autoContinue)); </ins><span class="cx">
</span><span class="cx"> ScriptBreakpoint breakpoint(lineNumber, columnNumber, \
condition, breakpointActions, autoContinue); </span><span class="cx"> for \
(ScriptsMap::iterator it = m_scripts.begin(); it != m_scripts.end(); ++it) { \
</span><span class="lines">@@ -358,7 +357,7 @@ </span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::removeBreakpoint(ErrorString*, \
const String& breakpointId) </span><span class="cx"> {
</span><del>- m_javaScriptBreakpoints->remove(breakpointId);
</del><ins>+ m_javaScriptBreakpoints.remove(breakpointId);
</ins><span class="cx">
</span><span class="cx"> BreakpointIdToDebugServerBreakpointIdsMap::iterator \
debugServerBreakpointIdsIterator = \
m_breakpointIdToDebugServerBreakpointIds.find(breakpointId); </span><span class="cx"> \
if (debugServerBreakpointIdsIterator == \
m_breakpointIdToDebugServerBreakpointIds.end()) </span><span class="lines">@@ -696,7 \
+695,7 @@ </span><span class="cx"> if (scriptURL.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (InspectorObject::iterator it = \
m_javaScriptBreakpoints->begin(); it != m_javaScriptBreakpoints->end(); ++it) { \
</del><ins>+ for (auto it = m_javaScriptBreakpoints.begin(), end = \
m_javaScriptBreakpoints.end(); it != end; ++it) { </ins><span class="cx"> \
RefPtr<InspectorObject> breakpointObject = it->value->asObject(); \
</span><span class="cx"> bool isRegex; </span><span class="cx"> \
breakpointObject->getBoolean("isRegex", &isRegex); \
</span></span></pre></div> <a \
id="trunkSourceWebCoreinspectorInspectorDebuggerAgenth"></a> <div \
class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h \
(158407 => 158408)</h4> <pre class="diff"><span>
<span class="info">--- \
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) </span><span class="lines">@@ -164,6 +164,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<String, Script> ScriptsMap;
</span><span class="cx"> typedef HashMap<String, Vector<String>> \
BreakpointIdToDebugServerBreakpointIdsMap; </span><ins>+ typedef \
HashMap<String, RefPtr<InspectorObject>> BreakpointIdToBreakpointMap; \
</ins><span class="cx"> </span><span class="cx"> InjectedScriptManager* \
m_injectedScriptManager; </span><span class="cx"> InspectorFrontend::Debugger* \
m_frontend; </span><span class="lines">@@ -171,10 +172,10 @@
</span><span class="cx"> ScriptValue m_currentCallStack;
</span><span class="cx"> ScriptsMap m_scripts;
</span><span class="cx"> BreakpointIdToDebugServerBreakpointIdsMap \
m_breakpointIdToDebugServerBreakpointIds; </span><ins>+ \
BreakpointIdToBreakpointMap m_javaScriptBreakpoints; </ins><span class="cx"> \
String m_continueToLocationBreakpointId; </span><span class="cx"> \
InspectorFrontend::Debugger::Reason::Enum m_breakReason; </span><span class="cx"> \
RefPtr<InspectorObject> m_breakAuxData; </span><del>- \
RefPtr<InspectorObject> m_javaScriptBreakpoints; </del><span class="cx"> \
bool m_enabled; </span><span class="cx"> bool m_javaScriptPauseScheduled;
</span><span class="cx"> Listener* m_listener;
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic