<!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>[191973] trunk/Source</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/191973">191973</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-03 13:37:40 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Move ScriptDebugServer::Task to WorkerScriptDebugServer where it is actually used
https://bugs.webkit.org/show_bug.cgi?id=150847
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-11-03
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/ScriptDebugServer.h:
Remove Task from here, it isn't needed in the general case.
* parser/SourceProvider.h:
Remove unimplemented method.
Source/WebCore:
* bindings/js/WorkerScriptDebugServer.cpp:
(WebCore::WorkerScriptDebugServer::interruptAndRunTask):
* bindings/js/WorkerScriptDebugServer.h:
* inspector/WorkerDebuggerAgent.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceProviderh">trunk/Source/JavaScriptCore/parser/SourceProvider.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-11-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Move ScriptDebugServer::Task to WorkerScriptDebugServer where it is actually used
+ https://bugs.webkit.org/show_bug.cgi?id=150847
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/ScriptDebugServer.h:
+ Remove Task from here, it isn't needed in the general case.
+
+ * parser/SourceProvider.h:
+ Remove unimplemented method.
+
+2015-11-03 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Handle or Remove ParseHTML Timeline Event Records
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150689
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -59,13 +59,6 @@
</span><span class="cx">
</span><span class="cx"> const BreakpointActions& getActionsForBreakpoint(JSC::BreakpointID);
</span><span class="cx">
</span><del>- class Task {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- virtual ~Task() { }
- virtual void run() = 0;
- };
-
</del><span class="cx"> protected:
</span><span class="cx"> typedef HashSet<ScriptDebugListener*> ListenerSet;
</span><span class="cx"> typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceProvider.h (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceProvider.h        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/JavaScriptCore/parser/SourceProvider.h        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> void setSourceMappingURLDirective(const String& sourceMappingURL) { m_sourceMappingURLDirective = sourceMappingURL; }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void getID();
</span><del>- Vector<size_t>& lineStarts();
</del><span class="cx">
</span><span class="cx"> String m_url;
</span><span class="cx"> String m_sourceURLDirective;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/WebCore/ChangeLog        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-03 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Move ScriptDebugServer::Task to WorkerScriptDebugServer where it is actually used
+ https://bugs.webkit.org/show_bug.cgi?id=150847
+
+ Reviewed by Timothy Hatcher.
+
+ * bindings/js/WorkerScriptDebugServer.cpp:
+ (WebCore::WorkerScriptDebugServer::interruptAndRunTask):
+ * bindings/js/WorkerScriptDebugServer.h:
+ * inspector/WorkerDebuggerAgent.cpp:
+
</ins><span class="cx"> 2015-11-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> WebCore::reportException(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerScriptDebugServer::interruptAndRunTask(std::unique_ptr<ScriptDebugServer::Task>)
</del><ins>+void WorkerScriptDebugServer::interruptAndRunTask(std::unique_ptr<Task>)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -43,12 +43,19 @@
</span><span class="cx"> WorkerScriptDebugServer(WorkerGlobalScope&, const String&);
</span><span class="cx"> ~WorkerScriptDebugServer() { }
</span><span class="cx">
</span><ins>+ class Task {
+ WTF_MAKE_FAST_ALLOCATED;
+ public:
+ virtual ~Task() { }
+ virtual void run() = 0;
+ };
+
</ins><span class="cx"> virtual void recompileAllJSFunctions() override;
</span><span class="cx">
</span><span class="cx"> void addListener(Inspector::ScriptDebugListener*);
</span><span class="cx"> void removeListener(Inspector::ScriptDebugListener*, bool skipRecompile);
</span><span class="cx">
</span><del>- void interruptAndRunTask(std::unique_ptr<ScriptDebugServer::Task>);
</del><ins>+ void interruptAndRunTask(std::unique_ptr<Task>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual ListenerSet& getListeners() override { return m_listeners; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (191972 => 191973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp        2015-11-03 21:28:55 UTC (rev 191972)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp        2015-11-03 21:37:40 UTC (rev 191973)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> return agents;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class RunInspectorCommandsTask : public ScriptDebugServer::Task {
</del><ins>+class RunInspectorCommandsTask : public WorkerScriptDebugServer::Task {
</ins><span class="cx"> public:
</span><span class="cx"> RunInspectorCommandsTask(WorkerThread* thread, WorkerGlobalScope* workerGlobalScope)
</span><span class="cx"> : m_thread(thread)
</span></span></pre>
</div>
</div>
</body>
</html>