<!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>[162550] 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/162550">162550</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-22 13:02:16 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed rollout of <a href="http://trac.webkit.org/projects/webkit/changeset/162534">r162534</a>, this caused inspector test failures.
* bindings/js/PageScriptDebugServer.cpp:
(WebCore::PageScriptDebugServer::addListener):
(WebCore::PageScriptDebugServer::removeListener):
(WebCore::PageScriptDebugServer::recompileAllJSFunctions):
(WebCore::PageScriptDebugServer::didRemoveLastListener):
* bindings/js/PageScriptDebugServer.h:
* bindings/js/ScriptDebugServer.cpp:
(WebCore::ScriptDebugServer::ScriptDebugServer):
(WebCore::ScriptDebugServer::recompileAllJSFunctionsSoon):
(WebCore::ScriptDebugServer::recompileAllJSFunctionsTimerFired):
* bindings/js/ScriptDebugServer.h:
* bindings/js/WorkerScriptDebugServer.cpp:
(WebCore::WorkerScriptDebugServer::addListener):
(WebCore::WorkerScriptDebugServer::recompileAllJSFunctions):
(WebCore::WorkerScriptDebugServer::removeListener):
* inspector/InspectorProfilerAgent.cpp:</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="#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 (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-22 Joseph Pecoraro <pecoraro@apple.com>
+
+ Unreviewed rollout of r162534, this caused inspector test failures.
+
+ * bindings/js/PageScriptDebugServer.cpp:
+ (WebCore::PageScriptDebugServer::addListener):
+ (WebCore::PageScriptDebugServer::removeListener):
+ (WebCore::PageScriptDebugServer::recompileAllJSFunctions):
+ (WebCore::PageScriptDebugServer::didRemoveLastListener):
+ * bindings/js/PageScriptDebugServer.h:
+ * bindings/js/ScriptDebugServer.cpp:
+ (WebCore::ScriptDebugServer::ScriptDebugServer):
+ (WebCore::ScriptDebugServer::recompileAllJSFunctionsSoon):
+ (WebCore::ScriptDebugServer::recompileAllJSFunctionsTimerFired):
+ * bindings/js/ScriptDebugServer.h:
+ * bindings/js/WorkerScriptDebugServer.cpp:
+ (WebCore::WorkerScriptDebugServer::addListener):
+ (WebCore::WorkerScriptDebugServer::recompileAllJSFunctions):
+ (WebCore::WorkerScriptDebugServer::removeListener):
+ * inspector/InspectorProfilerAgent.cpp:
+
</ins><span class="cx"> 2014-01-22 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> Crashes in setTextForIterator
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -94,12 +94,10 @@
</span><span class="cx"> OwnPtr<ListenerSet>& listeners = m_pageListenersMap.add(page, nullptr).iterator->value;
</span><span class="cx"> if (!listeners)
</span><span class="cx"> listeners = adoptPtr(new ListenerSet);
</span><del>-
- bool wasEmpty = listeners->isEmpty();
</del><span class="cx"> listeners->add(listener);
</span><span class="cx">
</span><del>- if (wasEmpty)
- didAddFirstListener(page);
</del><ins>+ recompileAllJSFunctionsSoon();
+ page->setDebugger(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageScriptDebugServer::removeListener(ScriptDebugListener* listener, Page* page)
</span><span class="lines">@@ -113,7 +111,6 @@
</span><span class="cx">
</span><span class="cx"> ListenerSet* listeners = it->value.get();
</span><span class="cx"> listeners->remove(listener);
</span><del>-
</del><span class="cx"> if (listeners->isEmpty()) {
</span><span class="cx"> m_pageListenersMap.remove(it);
</span><span class="cx"> didRemoveLastListener(page);
</span><span class="lines">@@ -123,7 +120,11 @@
</span><span class="cx"> void PageScriptDebugServer::recompileAllJSFunctions()
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- Debugger::recompileAllJSFunctions(JSDOMWindow::commonVM());
</del><ins>+ // If JavaScript stack is not empty postpone recompilation.
+ if (JSDOMWindow::commonVM()->entryScope)
+ recompileAllJSFunctionsSoon();
+ else
+ Debugger::recompileAllJSFunctions(JSDOMWindow::commonVM());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptDebugServer::ListenerSet* PageScriptDebugServer::getListenersForGlobalObject(JSGlobalObject* globalObject)
</span><span class="lines">@@ -160,13 +161,6 @@
</span><span class="cx"> setJavaScriptPaused(page->group(), false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageScriptDebugServer::didAddFirstListener(Page* page)
-{
- // Set debugger before recompiling to get sourceParsed callbacks.
- page->setDebugger(this);
- recompileAllJSFunctions();
-}
-
</del><span class="cx"> void PageScriptDebugServer::didRemoveLastListener(Page* page)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(page);
</span><span class="lines">@@ -174,9 +168,8 @@
</span><span class="cx"> if (m_pausedPage == page)
</span><span class="cx"> m_doneProcessingDebuggerEvents = true;
</span><span class="cx">
</span><del>- // Clear debugger before recompiling because we do not need sourceParsed callbacks.
- page->setDebugger(nullptr);
- recompileAllJSFunctions();
</del><ins>+ recompileAllJSFunctionsSoon();
+ page->setDebugger(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageScriptDebugServer::runEventLoopWhilePaused()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void runEventLoopWhilePaused();
</span><span class="cx">
</span><del>- void didAddFirstListener(Page*);
</del><span class="cx"> void didRemoveLastListener(Page*);
</span><span class="cx">
</span><span class="cx"> void setJavaScriptPaused(const PageGroup&, bool paused);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "JavaScriptCallFrame.h"
</span><span class="cx"> #include "PageConsole.h"
</span><span class="cx"> #include "Sound.h"
</span><del>-#include "Timer.h"
</del><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <debugger/DebuggerCallFrame.h>
</span><span class="cx"> #include <parser/SourceProvider.h>
</span><span class="lines">@@ -58,6 +57,7 @@
</span><span class="cx"> : Debugger(isInWorkerThread)
</span><span class="cx"> , m_doneProcessingDebuggerEvents(true)
</span><span class="cx"> , m_callingListeners(false)
</span><ins>+ , m_recompileTimer(this, &ScriptDebugServer::recompileAllJSFunctionsTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,6 +313,16 @@
</span><span class="cx"> dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidContinue, vmEntryGlobalObject);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScriptDebugServer::recompileAllJSFunctionsSoon()
+{
+ m_recompileTimer.startOneShot(0);
+}
+
+void ScriptDebugServer::recompileAllJSFunctionsTimerFired(Timer<ScriptDebugServer>&)
+{
+ recompileAllJSFunctions();
+}
+
</ins><span class="cx"> const Vector<ScriptBreakpointAction>& ScriptDebugServer::getActionsForBreakpoint(JSC::BreakpointID breakpointID)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(breakpointID != JSC::noBreakpointID);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.h (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ScriptBreakpoint.h"
</span><span class="cx"> #include "ScriptDebugListener.h"
</span><ins>+#include "Timer.h"
</ins><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #include <debugger/Debugger.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -58,6 +59,7 @@
</span><span class="cx"> void removeBreakpoint(JSC::BreakpointID);
</span><span class="cx"> void clearBreakpoints();
</span><span class="cx">
</span><ins>+ void recompileAllJSFunctionsSoon();
</ins><span class="cx"> virtual void recompileAllJSFunctions() = 0;
</span><span class="cx">
</span><span class="cx"> const Vector<ScriptBreakpointAction>& getActionsForBreakpoint(JSC::BreakpointID);
</span><span class="lines">@@ -107,9 +109,12 @@
</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"> unsigned m_hitCount;
</span><span class="cx"> bool m_callingListeners;
</span><span class="cx"> BreakpointIDToActionsMap m_breakpointIDToActions;
</span><ins>+ Timer<ScriptDebugServer> m_recompileTimer;
</ins><span class="cx">
</span><span class="cx"> friend class DebuggerCallFrameScope;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -55,13 +55,22 @@
</span><span class="cx"> if (!listener)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool wasEmpty = m_listeners.isEmpty();
</del><ins>+ if (m_listeners.isEmpty())
+ m_workerGlobalScope->script()->attachDebugger(this);
</ins><span class="cx"> m_listeners.add(listener);
</span><ins>+ recompileAllJSFunctions();
+}
</ins><span class="cx">
</span><del>- if (wasEmpty) {
- m_workerGlobalScope->script()->attachDebugger(this);
- recompileAllJSFunctions();
- }
</del><ins>+void WorkerScriptDebugServer::recompileAllJSFunctions()
+{
+ JSC::VM* vm = m_workerGlobalScope->script()->vm();
+
+ JSC::JSLockHolder lock(vm);
+ // If JavaScript stack is not empty postpone recompilation.
+ if (vm->entryScope)
+ recompileAllJSFunctionsSoon();
+ else
+ JSC::Debugger::recompileAllJSFunctions(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerScriptDebugServer::removeListener(ScriptDebugListener* listener)
</span><span class="lines">@@ -70,21 +79,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_listeners.remove(listener);
</span><del>-
- if (m_listeners.isEmpty()) {
</del><ins>+ if (m_listeners.isEmpty())
</ins><span class="cx"> m_workerGlobalScope->script()->detachDebugger(this);
</span><del>- recompileAllJSFunctions();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerScriptDebugServer::recompileAllJSFunctions()
-{
- JSC::VM* vm = m_workerGlobalScope->script()->vm();
-
- JSC::JSLockHolder lock(vm);
- JSC::Debugger::recompileAllJSFunctions(vm);
-}
-
</del><span class="cx"> void WorkerScriptDebugServer::runEventLoopWhilePaused()
</span><span class="cx"> {
</span><span class="cx"> MessageQueueWaitResult result;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (162549 => 162550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-01-22 20:29:41 UTC (rev 162549)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-01-22 21:02:16 UTC (rev 162550)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void recompileScript() override
</span><span class="cx"> {
</span><del>- PageScriptDebugServer::shared().recompileAllJSFunctions();
</del><ins>+ PageScriptDebugServer::shared().recompileAllJSFunctionsSoon();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void startProfiling(const String& title) override
</span></span></pre>
</div>
</div>
</body>
</html>