Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (204439 => 204440)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-13 02:14:42 UTC (rev 204439)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-13 03:05:34 UTC (rev 204440)
@@ -1,3 +1,16 @@
+2016-08-12 Joseph Pecoraro <[email protected]>
+
+ Remove always true JSC::Debugger::needPauseHandling virtual method
+ https://bugs.webkit.org/show_bug.cgi?id=160822
+
+ Reviewed by Mark Lam.
+
+ All subclasses return true for this method. Just remove the method.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::pauseIfNeeded):
+ * inspector/ScriptDebugServer.h:
+
2016-08-12 Saam Barati <[email protected]>
Inline store loop for CopyRest in DFG and FTL for certain array modes
Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (204439 => 204440)
--- trunk/Source/_javascript_Core/debugger/Debugger.cpp 2016-08-13 02:14:42 UTC (rev 204439)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp 2016-08-13 03:05:34 UTC (rev 204440)
@@ -629,10 +629,6 @@
if (m_suppressAllPauses)
return;
- JSGlobalObject* vmEntryGlobalObject = callFrame->vmEntryGlobalObject();
- if (!needPauseHandling(vmEntryGlobalObject))
- return;
-
Breakpoint breakpoint;
bool didHitBreakpoint = false;
bool pauseNow = m_pauseOnNextStatement;
@@ -650,8 +646,9 @@
// Make sure we are not going to pause again on breakpoint actions by
// reseting the pause state before executing any breakpoint actions.
TemporaryPausedState pausedState(*this);
- m_pauseOnCallFrame = 0;
+ m_pauseOnCallFrame = nullptr;
m_pauseOnNextStatement = false;
+ JSGlobalObject* vmEntryGlobalObject = callFrame->vmEntryGlobalObject();
if (didHitBreakpoint) {
handleBreakpointHit(vmEntryGlobalObject, breakpoint);
Modified: trunk/Source/_javascript_Core/debugger/Debugger.h (204439 => 204440)
--- trunk/Source/_javascript_Core/debugger/Debugger.h 2016-08-13 02:14:42 UTC (rev 204439)
+++ trunk/Source/_javascript_Core/debugger/Debugger.h 2016-08-13 03:05:34 UTC (rev 204440)
@@ -144,7 +144,6 @@
void didEvaluateScript(double startTime, ProfilingReason);
protected:
- virtual bool needPauseHandling(JSGlobalObject*) { return false; }
virtual void handleBreakpointHit(JSGlobalObject*, const Breakpoint&) { }
virtual void handleExceptionInBreakpointCondition(ExecState*, Exception*) const { }
virtual void handlePause(JSGlobalObject*, ReasonForPause) { }
Modified: trunk/Source/_javascript_Core/inspector/ScriptDebugServer.h (204439 => 204440)
--- trunk/Source/_javascript_Core/inspector/ScriptDebugServer.h 2016-08-13 02:14:42 UTC (rev 204439)
+++ trunk/Source/_javascript_Core/inspector/ScriptDebugServer.h 2016-08-13 03:05:34 UTC (rev 204440)
@@ -93,7 +93,6 @@
typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) final;
- bool needPauseHandling(JSC::JSGlobalObject*) final { return true; }
void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) final;
void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::Exception*) const final;
void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) final;
Modified: trunk/Source/WebKit/mac/ChangeLog (204439 => 204440)
--- trunk/Source/WebKit/mac/ChangeLog 2016-08-13 02:14:42 UTC (rev 204439)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-13 03:05:34 UTC (rev 204440)
@@ -1,3 +1,12 @@
+2016-08-12 Joseph Pecoraro <[email protected]>
+
+ Remove always true JSC::Debugger::needPauseHandling virtual method
+ https://bugs.webkit.org/show_bug.cgi?id=160822
+
+ Reviewed by Mark Lam.
+
+ * WebView/WebScriptDebugger.h:
+
2016-08-11 Chris Dumez <[email protected]>
Regression(r204268): Mail crashes when trying to compose an email
Modified: trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h (204439 => 204440)
--- trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h 2016-08-13 02:14:42 UTC (rev 204439)
+++ trunk/Source/WebKit/mac/WebView/WebScriptDebugger.h 2016-08-13 03:05:34 UTC (rev 204440)
@@ -57,7 +57,6 @@
private:
void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const WTF::String& errorMsg) override;
void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) override;
- bool needPauseHandling(JSC::JSGlobalObject*) override { return true; }
bool m_callingDelegate;
