<!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>[205575] trunk/Source/JavaScriptCore</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/205575">205575</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-07 17:16:39 -0700 (Wed, 07 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize Debugger to use nullptr
https://bugs.webkit.org/show_bug.cgi?id=161718
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-09-07
Reviewed by Mark Lam.
* debugger/Debugger.cpp:
(JSC::Debugger::Debugger):
(JSC::Debugger::~Debugger):
(JSC::Debugger::detach):
(JSC::Debugger::stepOutOfFunction):
(JSC::Debugger::updateCallFrameAndPauseIfNeeded):
* debugger/Debugger.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205574 => 205575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-08 00:01:29 UTC (rev 205574)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-08 00:16:39 UTC (rev 205575)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-09-07 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Modernize Debugger to use nullptr
+ https://bugs.webkit.org/show_bug.cgi?id=161718
+
+ Reviewed by Mark Lam.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::Debugger):
+ (JSC::Debugger::~Debugger):
+ (JSC::Debugger::detach):
+ (JSC::Debugger::stepOutOfFunction):
+ (JSC::Debugger::updateCallFrameAndPauseIfNeeded):
+ * debugger/Debugger.h:
+
+2016-09-07 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Remove always false case in Debugger
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161717
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (205574 => 205575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-09-08 00:01:29 UTC (rev 205574)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-09-08 00:16:39 UTC (rev 205575)
</span><span class="lines">@@ -128,8 +128,6 @@
</span><span class="cx"> , m_suppressAllPauses(false)
</span><span class="cx"> , m_steppingMode(SteppingModeDisabled)
</span><span class="cx"> , m_reasonForPause(NotPaused)
</span><del>- , m_pauseOnCallFrame(0)
- , m_currentCallFrame(0)
</del><span class="cx"> , m_lastExecutedLine(UINT_MAX)
</span><span class="cx"> , m_lastExecutedSourceID(noSourceID)
</span><span class="cx"> , m_topBreakpointID(noBreakpointID)
</span><span class="lines">@@ -141,7 +139,7 @@
</span><span class="cx"> {
</span><span class="cx"> HashSet<JSGlobalObject*>::iterator end = m_globalObjects.end();
</span><span class="cx"> for (HashSet<JSGlobalObject*>::iterator it = m_globalObjects.begin(); it != end; ++it)
</span><del>- (*it)->setDebugger(0);
</del><ins>+ (*it)->setDebugger(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Debugger::attach(JSGlobalObject* globalObject)
</span><span class="lines">@@ -168,8 +166,8 @@
</span><span class="cx"> // stack, since we won't get further debugger callbacks to do so. Also, resume execution,
</span><span class="cx"> // since there's no point in staying paused once a window closes.
</span><span class="cx"> if (m_isPaused && m_currentCallFrame && m_currentCallFrame->vmEntryGlobalObject() == globalObject) {
</span><del>- m_currentCallFrame = 0;
- m_pauseOnCallFrame = 0;
</del><ins>+ m_currentCallFrame = nullptr;
+ m_pauseOnCallFrame = nullptr;
</ins><span class="cx"> continueProgram();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -182,7 +180,7 @@
</span><span class="cx"> if (reason != GlobalObjectIsDestructing)
</span><span class="cx"> clearDebuggerRequests(globalObject);
</span><span class="cx">
</span><del>- globalObject->setDebugger(0);
</del><ins>+ globalObject->setDebugger(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Debugger::isAttached(JSGlobalObject* globalObject)
</span><span class="lines">@@ -599,7 +597,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> VMEntryFrame* topVMEntryFrame = m_vm.topVMEntryFrame;
</span><del>- m_pauseOnCallFrame = m_currentCallFrame ? m_currentCallFrame->callerFrame(topVMEntryFrame) : 0;
</del><ins>+ m_pauseOnCallFrame = m_currentCallFrame ? m_currentCallFrame->callerFrame(topVMEntryFrame) : nullptr;
</ins><span class="cx"> notifyDoneProcessingDebuggerEvents();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -618,7 +616,7 @@
</span><span class="cx"> updateCallFrame(callFrame);
</span><span class="cx"> pauseIfNeeded(callFrame);
</span><span class="cx"> if (!isStepping())
</span><del>- m_currentCallFrame = 0;
</del><ins>+ m_currentCallFrame = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Debugger::pauseIfNeeded(CallFrame* callFrame)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (205574 => 205575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2016-09-08 00:01:29 UTC (rev 205574)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2016-09-08 00:16:39 UTC (rev 205575)
</span><span class="lines">@@ -219,8 +219,8 @@
</span><span class="cx">
</span><span class="cx"> ReasonForPause m_reasonForPause;
</span><span class="cx"> JSValue m_currentException;
</span><del>- CallFrame* m_pauseOnCallFrame;
- CallFrame* m_currentCallFrame;
</del><ins>+ CallFrame* m_pauseOnCallFrame { nullptr };
+ CallFrame* m_currentCallFrame { nullptr };
</ins><span class="cx"> unsigned m_lastExecutedLine;
</span><span class="cx"> SourceID m_lastExecutedSourceID;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>