Changeset 205575 in webkit

Timestamp:

Sep 7, 2016 5:16:39 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Modernize Debugger to use nullptr
​https://bugs.webkit.org/show_bug.cgi?id=161718

Patch by Joseph Pecoraro <Joseph Pecoraro> 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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• debugger/Debugger.cpp (modified) (6 diffs)
• debugger/Debugger.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        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>
 

trunk/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -129 +129 @@
     , m_steppingMode(SteppingModeDisabled)
     , m_reasonForPause(NotPaused)
-    , m_pauseOnCallFrame(0)
-    , m_currentCallFrame(0)
     , m_lastExecutedLine(UINT_MAX)
     , m_lastExecutedSourceID(noSourceID)
@@ -142 +140 @@
     HashSet<JSGlobalObject*>::iterator end = m_globalObjects.end();
     for (HashSet<JSGlobalObject*>::iterator it = m_globalObjects.begin(); it != end; ++it)
-        (*it)->setDebugger(0);
+        (*it)->setDebugger(nullptr);
 }
 
@@ -169 +167 @@
     // since there's no point in staying paused once a window closes.
     if (m_isPaused && m_currentCallFrame && m_currentCallFrame->vmEntryGlobalObject() == globalObject) {
-        m_currentCallFrame = 0;
-        m_pauseOnCallFrame = 0;
+        m_currentCallFrame = nullptr;
+        m_pauseOnCallFrame = nullptr;
         continueProgram();
     }
@@ -183 +181 @@
         clearDebuggerRequests(globalObject);
 
-    globalObject->setDebugger(0);
+    globalObject->setDebugger(nullptr);
 }
 
@@ -600 +598 @@
 
     VMEntryFrame* topVMEntryFrame = m_vm.topVMEntryFrame;
-    m_pauseOnCallFrame = m_currentCallFrame ? m_currentCallFrame->callerFrame(topVMEntryFrame) : 0;
+    m_pauseOnCallFrame = m_currentCallFrame ? m_currentCallFrame->callerFrame(topVMEntryFrame) : nullptr;
     notifyDoneProcessingDebuggerEvents();
 }
@@ -619 +617 @@
     pauseIfNeeded(callFrame);
     if (!isStepping())
-        m_currentCallFrame = 0;
+        m_currentCallFrame = nullptr;
 }
 

trunk/Source/JavaScriptCore/debugger/Debugger.h

@@ -220 +220 @@
     ReasonForPause m_reasonForPause;
     JSValue m_currentException;
-    CallFrame* m_pauseOnCallFrame;
-    CallFrame* m_currentCallFrame;
+    CallFrame* m_pauseOnCallFrame { nullptr };
+    CallFrame* m_currentCallFrame { nullptr };
     unsigned m_lastExecutedLine;
     SourceID m_lastExecutedSourceID;