<!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>[173551] 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/173551">173551</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-11 18:50:24 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Occasional ASSERT closing web inspector
https://bugs.webkit.org/show_bug.cgi?id=136762
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-09-11
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
It is harmless, and indeed possible to have an empty set of listeners
now that each Page gets its own PageDebugServer instead of a shared
global. So we should replace the null checks with isEmpty checks.
Since nobody was ever returning null, convert to references as well.
* inspector/JSGlobalObjectScriptDebugServer.h:
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::dispatchBreakpointActionLog):
(Inspector::ScriptDebugServer::dispatchBreakpointActionSound):
(Inspector::ScriptDebugServer::dispatchBreakpointActionProbe):
(Inspector::ScriptDebugServer::sourceParsed):
(Inspector::ScriptDebugServer::dispatchFunctionToListeners):
(Inspector::ScriptDebugServer::notifyDoneProcessingDebuggerEvents):
(Inspector::ScriptDebugServer::handlePause):
(Inspector::ScriptDebugServer::needPauseHandling): Deleted.
* inspector/ScriptDebugServer.h:
Source/WebCore:
* bindings/js/WorkerScriptDebugServer.h:
* inspector/PageScriptDebugServer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServerh">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageScriptDebugServerh">trunk/Source/WebCore/inspector/PageScriptDebugServer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-09-11 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Occasional ASSERT closing web inspector
+ https://bugs.webkit.org/show_bug.cgi?id=136762
+
+ Reviewed by Timothy Hatcher.
+
+ It is harmless, and indeed possible to have an empty set of listeners
+ now that each Page gets its own PageDebugServer instead of a shared
+ global. So we should replace the null checks with isEmpty checks.
+ Since nobody was ever returning null, convert to references as well.
+
+ * inspector/JSGlobalObjectScriptDebugServer.h:
+ * inspector/ScriptDebugServer.cpp:
+ (Inspector::ScriptDebugServer::dispatchBreakpointActionLog):
+ (Inspector::ScriptDebugServer::dispatchBreakpointActionSound):
+ (Inspector::ScriptDebugServer::dispatchBreakpointActionProbe):
+ (Inspector::ScriptDebugServer::sourceParsed):
+ (Inspector::ScriptDebugServer::dispatchFunctionToListeners):
+ (Inspector::ScriptDebugServer::notifyDoneProcessingDebuggerEvents):
+ (Inspector::ScriptDebugServer::handlePause):
+ (Inspector::ScriptDebugServer::needPauseHandling): Deleted.
+ * inspector/ScriptDebugServer.h:
+
</ins><span class="cx"> 2014-09-10 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Move JSScope out of JSFunction into separate JSCallee class
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> virtual void recompileAllJSFunctions() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) override { return &m_listeners; }
</del><ins>+ virtual ListenerSet& getListeners() override { return m_listeners; }
</ins><span class="cx"> virtual void didPause(JSC::JSGlobalObject*) override { }
</span><span class="cx"> virtual void didContinue(JSC::JSGlobalObject*) override { }
</span><span class="cx"> virtual void runEventLoopWhilePaused() override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -147,33 +147,31 @@
</span><span class="cx"> if (m_callingListeners)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ListenerSet* listeners = getListenersForGlobalObject(exec->lexicalGlobalObject());
- if (!listeners)
</del><ins>+ ListenerSet& listeners = getListeners();
+ if (listeners.isEmpty())
</ins><span class="cx"> return;
</span><del>- ASSERT(!listeners->isEmpty());
</del><span class="cx">
</span><span class="cx"> TemporaryChange<bool> change(m_callingListeners, true);
</span><span class="cx">
</span><span class="cx"> Vector<ScriptDebugListener*> listenersCopy;
</span><del>- copyToVector(*listeners, listenersCopy);
</del><ins>+ copyToVector(listeners, listenersCopy);
</ins><span class="cx"> for (auto* listener : listenersCopy)
</span><span class="cx"> listener->breakpointActionLog(exec, message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::dispatchBreakpointActionSound(ExecState* exec, int breakpointActionIdentifier)
</del><ins>+void ScriptDebugServer::dispatchBreakpointActionSound(ExecState*, int breakpointActionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (m_callingListeners)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ListenerSet* listeners = getListenersForGlobalObject(exec->lexicalGlobalObject());
- if (!listeners)
</del><ins>+ ListenerSet& listeners = getListeners();
+ if (listeners.isEmpty())
</ins><span class="cx"> return;
</span><del>- ASSERT(!listeners->isEmpty());
</del><span class="cx">
</span><span class="cx"> TemporaryChange<bool> change(m_callingListeners, true);
</span><span class="cx">
</span><span class="cx"> Vector<ScriptDebugListener*> listenersCopy;
</span><del>- copyToVector(*listeners, listenersCopy);
</del><ins>+ copyToVector(listeners, listenersCopy);
</ins><span class="cx"> for (auto* listener : listenersCopy)
</span><span class="cx"> listener->breakpointActionSound(breakpointActionIdentifier);
</span><span class="cx"> }
</span><span class="lines">@@ -183,15 +181,14 @@
</span><span class="cx"> if (m_callingListeners)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ListenerSet* listeners = getListenersForGlobalObject(exec->lexicalGlobalObject());
- if (!listeners)
</del><ins>+ ListenerSet& listeners = getListeners();
+ if (listeners.isEmpty())
</ins><span class="cx"> return;
</span><del>- ASSERT(!listeners->isEmpty());
</del><span class="cx">
</span><span class="cx"> TemporaryChange<bool> change(m_callingListeners, true);
</span><span class="cx">
</span><span class="cx"> Vector<ScriptDebugListener*> listenersCopy;
</span><del>- copyToVector(*listeners, listenersCopy);
</del><ins>+ copyToVector(listeners, listenersCopy);
</ins><span class="cx"> for (auto* listener : listenersCopy)
</span><span class="cx"> listener->breakpointActionProbe(exec, action, m_hitCount, sample);
</span><span class="cx"> }
</span><span class="lines">@@ -251,49 +248,42 @@
</span><span class="cx"> if (m_callingListeners)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ListenerSet* listeners = getListenersForGlobalObject(exec->lexicalGlobalObject());
- if (!listeners)
</del><ins>+ ListenerSet& listeners = getListeners();
+ if (listeners.isEmpty())
</ins><span class="cx"> return;
</span><del>- ASSERT(!listeners->isEmpty());
</del><span class="cx">
</span><span class="cx"> TemporaryChange<bool> change(m_callingListeners, true);
</span><span class="cx">
</span><span class="cx"> bool isError = errorLine != -1;
</span><span class="cx"> if (isError)
</span><del>- dispatchFailedToParseSource(*listeners, sourceProvider, errorLine, errorMessage);
</del><ins>+ dispatchFailedToParseSource(listeners, sourceProvider, errorLine, errorMessage);
</ins><span class="cx"> else
</span><del>- dispatchDidParseSource(*listeners, sourceProvider, isContentScript(exec));
</del><ins>+ dispatchDidParseSource(listeners, sourceProvider, isContentScript(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::dispatchFunctionToListeners(const ListenerSet& listeners, JavaScriptExecutionCallback callback)
</del><ins>+void ScriptDebugServer::dispatchFunctionToListeners(JavaScriptExecutionCallback callback)
</ins><span class="cx"> {
</span><del>- Vector<ScriptDebugListener*> copy;
- copyToVector(listeners, copy);
- for (size_t i = 0; i < copy.size(); ++i)
- (this->*callback)(copy[i]);
-}
-
-void ScriptDebugServer::dispatchFunctionToListeners(JavaScriptExecutionCallback callback, JSGlobalObject* globalObject)
-{
</del><span class="cx"> if (m_callingListeners)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> TemporaryChange<bool> change(m_callingListeners, true);
</span><span class="cx">
</span><del>- if (ListenerSet* listeners = getListenersForGlobalObject(globalObject)) {
- if (!listeners->isEmpty())
- dispatchFunctionToListeners(*listeners, callback);
- }
</del><ins>+ ListenerSet& listeners = getListeners();
+ if (!listeners.isEmpty())
+ dispatchFunctionToListeners(listeners, callback);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::notifyDoneProcessingDebuggerEvents()
</del><ins>+void ScriptDebugServer::dispatchFunctionToListeners(const ListenerSet& listeners, JavaScriptExecutionCallback callback)
</ins><span class="cx"> {
</span><del>- m_doneProcessingDebuggerEvents = true;
</del><ins>+ Vector<ScriptDebugListener*> copy;
+ copyToVector(listeners, copy);
+ for (size_t i = 0; i < copy.size(); ++i)
+ (this->*callback)(copy[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScriptDebugServer::needPauseHandling(JSGlobalObject* globalObject)
</del><ins>+void ScriptDebugServer::notifyDoneProcessingDebuggerEvents()
</ins><span class="cx"> {
</span><del>- return !!getListenersForGlobalObject(globalObject);
</del><ins>+ m_doneProcessingDebuggerEvents = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptDebugServer::handleBreakpointHit(const JSC::Breakpoint& breakpoint)
</span><span class="lines">@@ -316,7 +306,7 @@
</span><span class="cx">
</span><span class="cx"> void ScriptDebugServer::handlePause(Debugger::ReasonForPause, JSGlobalObject* vmEntryGlobalObject)
</span><span class="cx"> {
</span><del>- dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidPause, vmEntryGlobalObject);
</del><ins>+ dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidPause);
</ins><span class="cx"> LegacyProfiler::profiler()->didPause(currentDebuggerCallFrame());
</span><span class="cx"> didPause(vmEntryGlobalObject);
</span><span class="cx">
</span><span class="lines">@@ -325,7 +315,7 @@
</span><span class="cx">
</span><span class="cx"> didContinue(vmEntryGlobalObject);
</span><span class="cx"> LegacyProfiler::profiler()->didContinue(currentDebuggerCallFrame());
</span><del>- dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidContinue, vmEntryGlobalObject);
</del><ins>+ dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidContinue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const BreakpointActions& ScriptDebugServer::getActionsForBreakpoint(JSC::BreakpointID breakpointID)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> ScriptDebugServer(bool isInWorkerThread = false);
</span><span class="cx"> ~ScriptDebugServer();
</span><span class="cx">
</span><del>- virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) = 0;
</del><ins>+ virtual ListenerSet& getListeners() = 0;
</ins><span class="cx"> virtual void didPause(JSC::JSGlobalObject*) = 0;
</span><span class="cx"> virtual void didContinue(JSC::JSGlobalObject*) = 0;
</span><span class="cx"> virtual void runEventLoopWhilePaused() = 0;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> bool evaluateBreakpointAction(const ScriptBreakpointAction&);
</span><span class="cx">
</span><del>- void dispatchFunctionToListeners(JavaScriptExecutionCallback, JSC::JSGlobalObject*);
</del><ins>+ void dispatchFunctionToListeners(JavaScriptExecutionCallback);
</ins><span class="cx"> void dispatchFunctionToListeners(const ListenerSet& listeners, JavaScriptExecutionCallback);
</span><span class="cx"> void dispatchDidPause(ScriptDebugListener*);
</span><span class="cx"> void dispatchDidContinue(ScriptDebugListener*);
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
</span><span class="cx">
</span><span class="cx"> virtual void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) override final;
</span><del>- virtual bool needPauseHandling(JSC::JSGlobalObject*) override final;
</del><ins>+ virtual bool needPauseHandling(JSC::JSGlobalObject*) override final { return true; }
</ins><span class="cx"> virtual void handleBreakpointHit(const JSC::Breakpoint&) override final;
</span><span class="cx"> virtual void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::JSValue exception) const override final;
</span><span class="cx"> virtual void handlePause(JSC::Debugger::ReasonForPause, JSC::JSGlobalObject*) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/WebCore/ChangeLog 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-11 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Occasional ASSERT closing web inspector
+ https://bugs.webkit.org/show_bug.cgi?id=136762
+
+ Reviewed by Timothy Hatcher.
+
+ * bindings/js/WorkerScriptDebugServer.h:
+ * inspector/PageScriptDebugServer.h:
+
</ins><span class="cx"> 2014-09-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify DOM tree traversal in FrameSelection::setSelectionFromNone()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> void interruptAndRunTask(PassOwnPtr<ScriptDebugServer::Task>);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) override { return &m_listeners; }
</del><ins>+ virtual ListenerSet& getListeners() override { return m_listeners; }
</ins><span class="cx"> virtual void didPause(JSC::JSGlobalObject*) override { }
</span><span class="cx"> virtual void didContinue(JSC::JSGlobalObject*) override { }
</span><span class="cx"> virtual void runEventLoopWhilePaused() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageScriptDebugServer.h (173550 => 173551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageScriptDebugServer.h 2014-09-12 01:04:05 UTC (rev 173550)
+++ trunk/Source/WebCore/inspector/PageScriptDebugServer.h 2014-09-12 01:50:24 UTC (rev 173551)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual void recompileAllJSFunctions() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) override { return &m_listeners; }
</del><ins>+ virtual ListenerSet& getListeners() override { return m_listeners; }
</ins><span class="cx"> virtual void didPause(JSC::JSGlobalObject*) override;
</span><span class="cx"> virtual void didContinue(JSC::JSGlobalObject*) override;
</span><span class="cx"> virtual void runEventLoopWhilePaused() override;
</span></span></pre>
</div>
</div>
</body>
</html>