<!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>[161771] 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/161771">161771</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 11:31:26 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ScriptDebugServer should use a separate member function for its timer handler
https://bugs.webkit.org/show_bug.cgi?id=126819
Reviewed by Sam Weinig.
It's weird to have subclasses override a timer handler and sometimes invoke
the timer handler directly so make it a separate member function instead.
* bindings/js/PageScriptDebugServer.cpp:
(WebCore::PageScriptDebugServer::recompileAllJSFunctions):
* bindings/js/PageScriptDebugServer.h:
* bindings/js/ScriptDebugServer.cpp:
(WebCore::ScriptDebugServer::ScriptDebugServer):
(WebCore::ScriptDebugServer::recompileAllJSFunctionsTimerFired):
* bindings/js/ScriptDebugServer.h:
* bindings/js/WorkerScriptDebugServer.cpp:
(WebCore::WorkerScriptDebugServer::addListener):
(WebCore::WorkerScriptDebugServer::recompileAllJSFunctions):
* bindings/js/WorkerScriptDebugServer.h:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::InspectorProfilerAgent::start):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsPageScriptDebugServercpp">trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsPageScriptDebugServerh">trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptDebugServercpp">trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptDebugServerh">trunk/Source/WebCore/bindings/js/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServerh">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-01-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ ScriptDebugServer should use a separate member function for its timer handler
+ https://bugs.webkit.org/show_bug.cgi?id=126819
+
+ Reviewed by Sam Weinig.
+
+ It's weird to have subclasses override a timer handler and sometimes invoke
+ the timer handler directly so make it a separate member function instead.
+
+ * bindings/js/PageScriptDebugServer.cpp:
+ (WebCore::PageScriptDebugServer::recompileAllJSFunctions):
+ * bindings/js/PageScriptDebugServer.h:
+ * bindings/js/ScriptDebugServer.cpp:
+ (WebCore::ScriptDebugServer::ScriptDebugServer):
+ (WebCore::ScriptDebugServer::recompileAllJSFunctionsTimerFired):
+ * bindings/js/ScriptDebugServer.h:
+ * bindings/js/WorkerScriptDebugServer.cpp:
+ (WebCore::WorkerScriptDebugServer::addListener):
+ (WebCore::WorkerScriptDebugServer::recompileAllJSFunctions):
+ * bindings/js/WorkerScriptDebugServer.h:
+ * inspector/InspectorProfilerAgent.cpp:
+ (WebCore::InspectorProfilerAgent::start):
+
+2014-01-11 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Simplify Timer and DeferrableOneShotTimer using std::function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126816
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageScriptDebugServer::recompileAllJSFunctions(Timer<ScriptDebugServer>*)
</del><ins>+void PageScriptDebugServer::recompileAllJSFunctions()
</ins><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><span class="cx"> // If JavaScript stack is not empty postpone recompilation.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> void addListener(ScriptDebugListener*, Page*);
</span><span class="cx"> void removeListener(ScriptDebugListener*, Page*);
</span><span class="cx">
</span><del>- virtual void recompileAllJSFunctions(Timer<ScriptDebugServer>*);
</del><ins>+ virtual void recompileAllJSFunctions() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> typedef HashMap<Page*, OwnPtr<ListenerSet>> PageListenersMap;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> : Debugger(isInWorkerThread)
</span><span class="cx"> , m_doneProcessingDebuggerEvents(true)
</span><span class="cx"> , m_callingListeners(false)
</span><del>- , m_recompileTimer(this, &ScriptDebugServer::recompileAllJSFunctions)
</del><ins>+ , m_recompileTimer(this, &ScriptDebugServer::recompileAllJSFunctionsTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -285,6 +285,11 @@
</span><span class="cx"> m_recompileTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScriptDebugServer::recompileAllJSFunctionsTimerFired(Timer<ScriptDebugServer>&)
+{
+ recompileAllJSFunctions();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(JAVASCRIPT_DEBUGGER)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.h (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void clearBreakpoints();
</span><span class="cx">
</span><span class="cx"> void recompileAllJSFunctionsSoon();
</span><del>- virtual void recompileAllJSFunctions(Timer<ScriptDebugServer>* = 0) = 0;
</del><ins>+ virtual void recompileAllJSFunctions() = 0;
</ins><span class="cx">
</span><span class="cx"> class Task {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -106,6 +106,8 @@
</span><span class="cx"> virtual void handlePause(JSC::Debugger::ReasonForPause, JSC::JSGlobalObject*) OVERRIDE FINAL;
</span><span class="cx"> virtual void notifyDoneProcessingDebuggerEvents() OVERRIDE FINAL;
</span><span class="cx">
</span><ins>+ void recompileAllJSFunctionsTimerFired(Timer<ScriptDebugServer>&);
+
</ins><span class="cx"> bool m_callingListeners;
</span><span class="cx"> BreakpointIDToActionsMap m_breakpointIDToActions;
</span><span class="cx"> Timer<ScriptDebugServer> m_recompileTimer;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> if (m_listeners.isEmpty())
</span><span class="cx"> m_workerGlobalScope->script()->attachDebugger(this);
</span><span class="cx"> m_listeners.add(listener);
</span><del>- recompileAllJSFunctions(0);
</del><ins>+ recompileAllJSFunctions();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerScriptDebugServer::recompileAllJSFunctions(Timer<ScriptDebugServer>*)
</del><ins>+void WorkerScriptDebugServer::recompileAllJSFunctions()
</ins><span class="cx"> {
</span><span class="cx"> JSC::VM* vm = m_workerGlobalScope->script()->vm();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void interruptAndRunTask(PassOwnPtr<ScriptDebugServer::Task>);
</span><span class="cx">
</span><del>- void recompileAllJSFunctions(Timer<ScriptDebugServer>*);
</del><ins>+ void recompileAllJSFunctions() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) OVERRIDE { return &m_listeners; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (161770 => 161771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-01-11 19:17:55 UTC (rev 161770)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-01-11 19:31:26 UTC (rev 161771)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> return;
</span><span class="cx"> if (!enabled()) {
</span><span class="cx"> enable(true);
</span><del>- PageScriptDebugServer::shared().recompileAllJSFunctions(0);
</del><ins>+ PageScriptDebugServer::shared().recompileAllJSFunctions();
</ins><span class="cx"> }
</span><span class="cx"> m_recordingCPUProfile = true;
</span><span class="cx"> String title = getCurrentUserInitiatedProfileName(true);
</span></span></pre>
</div>
</div>
</body>
</html>