Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (162969 => 162970)
--- trunk/Source/_javascript_Core/ChangeLog 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-01-28 23:29:30 UTC (rev 162970)
@@ -1,3 +1,42 @@
+2014-01-28 Mark Lam <mark....@apple.com>
+
+ Remove some unneeded debugger code.
+ https://bugs.webkit.org/show_bug.cgi?id=127805.
+
+ Reviewed by Oliver Hunt.
+
+ JSC will now always support the debugger. Hence, the #if ENABLE(_javascript__DEBUGGER)
+ checks can be removed.
+
+ DebuggerCallFrame::callFrame() is also unused and will be removed.
+
+ * debugger/Breakpoint.h:
+ * debugger/Debugger.cpp:
+ * debugger/DebuggerCallFrame.h:
+ * inspector/InjectedScript.cpp:
+ (Inspector::InjectedScript::wrapCallFrames):
+ * inspector/InjectedScript.h:
+ * inspector/JSGlobalObjectScriptDebugServer.cpp:
+ * inspector/JSGlobalObjectScriptDebugServer.h:
+ * inspector/JSJavaScriptCallFrame.cpp:
+ * inspector/JSJavaScriptCallFrame.h:
+ * inspector/JSJavaScriptCallFramePrototype.cpp:
+ * inspector/JSJavaScriptCallFramePrototype.h:
+ * inspector/_javascript_CallFrame.cpp:
+ * inspector/_javascript_CallFrame.h:
+ * inspector/ScriptDebugListener.h:
+ * inspector/ScriptDebugServer.cpp:
+ * inspector/ScriptDebugServer.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::InspectorRuntimeAgent):
+ (Inspector::setPauseOnExceptionsState):
+ (Inspector::InspectorRuntimeAgent::evaluate):
+ (Inspector::InspectorRuntimeAgent::callFunctionOn):
+ (Inspector::InspectorRuntimeAgent::getProperties):
+ * inspector/agents/InspectorRuntimeAgent.h:
+
2014-01-28 Geoffrey Garen <gga...@apple.com>
REGRESSION: _javascript_Core crash during OS Installation (due to
Modified: trunk/Source/_javascript_Core/debugger/Breakpoint.h (162969 => 162970)
--- trunk/Source/_javascript_Core/debugger/Breakpoint.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/debugger/Breakpoint.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -26,8 +26,6 @@
#ifndef Breakpoint_h
#define Breakpoint_h
-#if ENABLE(_javascript__DEBUGGER)
-
#include "DebuggerPrimitives.h"
#include <wtf/text/WTFString.h>
@@ -65,6 +63,4 @@
} // namespace JSC
-#endif // ENABLE(_javascript__DEBUGGER)
-
#endif // Breakpoint_h
Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/debugger/Debugger.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -20,8 +20,6 @@
*/
#include "config.h"
-#if ENABLE(_javascript__DEBUGGER)
-
#include "Debugger.h"
#include "CodeBlock.h"
@@ -761,5 +759,3 @@
}
} // namespace JSC
-
-#endif // ENABLE(_javascript__DEBUGGER)
Modified: trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h (162969 => 162970)
--- trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -48,7 +48,6 @@
JS_EXPORT_PRIVATE explicit DebuggerCallFrame(CallFrame*);
- CallFrame* callFrame() const { return m_callFrame; }
JS_EXPORT_PRIVATE PassRefPtr<DebuggerCallFrame> callerFrame();
ExecState* exec() const { return m_callFrame; }
JS_EXPORT_PRIVATE SourceID sourceID() const;
Modified: trunk/Source/_javascript_Core/inspector/InjectedScript.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/InjectedScript.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/InjectedScript.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -141,7 +141,6 @@
*properties = array;
}
-#if ENABLE(_javascript__DEBUGGER)
PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
{
ASSERT(!hasNoValue());
@@ -157,7 +156,6 @@
return Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
}
-#endif
PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
{
Modified: trunk/Source/_javascript_Core/inspector/InjectedScript.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/InjectedScript.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/InjectedScript.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -63,9 +63,7 @@
void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescriptor>>* result);
void getInternalProperties(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor>>* result);
-#if ENABLE(_javascript__DEBUGGER)
PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
-#endif
PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
Modified: trunk/Source/_javascript_Core/inspector/JSGlobalObjectScriptDebugServer.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/JSGlobalObjectScriptDebugServer.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/JSGlobalObjectScriptDebugServer.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#include "JSGlobalObjectScriptDebugServer.h"
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "EventLoop.h"
@@ -85,5 +84,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/_javascript_Core/inspector/JSGlobalObjectScriptDebugServer.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/JSGlobalObjectScriptDebugServer.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/JSGlobalObjectScriptDebugServer.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#define JSGlobalObjectScriptDebugServer_h
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "ScriptDebugServer.h"
#include <wtf/Forward.h>
@@ -63,7 +62,6 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
#endif // JSGlobalObjectScriptDebugServer_h
Modified: trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#include "JSJavaScriptCallFrame.h"
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "Error.h"
#include "JSCJSValue.h"
@@ -211,5 +210,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#define JSJavaScriptCallFrame_h
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "JSDestructibleObject.h"
#include "_javascript_CallFrame.h"
@@ -96,7 +95,6 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
#endif // !defined(JSJavaScriptCallFrame_h)
Modified: trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFramePrototype.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFramePrototype.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFramePrototype.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#include "JSJavaScriptCallFramePrototype.h"
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "Error.h"
#include "GetterSetter.h"
@@ -234,5 +233,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFramePrototype.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFramePrototype.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFramePrototype.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#define JSJavaScriptCallFramePrototype_h
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "JSObject.h"
@@ -64,7 +63,6 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
#endif // !defined(JSJavaScriptCallFramePrototype_h)
Modified: trunk/Source/_javascript_Core/inspector/_javascript_CallFrame.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/_javascript_CallFrame.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/_javascript_CallFrame.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#include "_javascript_CallFrame.h"
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
using namespace JSC;
@@ -53,5 +52,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/_javascript_Core/inspector/_javascript_CallFrame.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/_javascript_CallFrame.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/_javascript_CallFrame.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -27,7 +27,6 @@
#define _javascript_CallFrame_h
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "JSCJSValueInlines.h"
#include "debugger/DebuggerCallFrame.h"
@@ -69,7 +68,6 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
#endif // _javascript_CallFrame_h
Modified: trunk/Source/_javascript_Core/inspector/ScriptDebugListener.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/ScriptDebugListener.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/ScriptDebugListener.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -30,8 +30,6 @@
#ifndef ScriptDebugListener_h
#define ScriptDebugListener_h
-#if ENABLE(_javascript__DEBUGGER)
-
#include "debugger/Debugger.h"
#include <wtf/Forward.h>
#include <wtf/text/WTFString.h>
@@ -80,6 +78,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
-
#endif // ScriptDebugListener_h
Modified: trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -31,8 +31,6 @@
#include "config.h"
#include "ScriptDebugServer.h"
-#if ENABLE(_javascript__DEBUGGER)
-
#include "DebuggerCallFrame.h"
#include "JSJavaScriptCallFrame.h"
#include "JSLock.h"
@@ -338,5 +336,3 @@
}
} // namespace Inspector
-
-#endif // ENABLE(_javascript__DEBUGGER)
Modified: trunk/Source/_javascript_Core/inspector/ScriptDebugServer.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/ScriptDebugServer.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/ScriptDebugServer.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -30,8 +30,6 @@
#ifndef ScriptDebugServer_h
#define ScriptDebugServer_h
-#if ENABLE(_javascript__DEBUGGER)
-
#include "ScriptBreakpoint.h"
#include "ScriptDebugListener.h"
#include "bindings/ScriptObject.h"
@@ -115,6 +113,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
-
#endif // ScriptDebugServer_h
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -31,7 +31,6 @@
#include "InspectorDebuggerAgent.h"
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "ContentSearchUtilities.h"
#include "InjectedScript.h"
@@ -733,5 +732,4 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -31,7 +31,6 @@
#define InspectorDebuggerAgent_h
#if ENABLE(INSPECTOR)
-#if ENABLE(_javascript__DEBUGGER)
#include "InspectorJSBackendDispatchers.h"
#include "InspectorJSFrontendDispatchers.h"
@@ -169,7 +168,6 @@
} // namespace Inspector
-#endif // ENABLE(_javascript__DEBUGGER)
#endif // ENABLE(INSPECTOR)
#endif // !defined(InspectorDebuggerAgent_h)
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp 2014-01-28 23:29:30 UTC (rev 162970)
@@ -40,13 +40,10 @@
#include "InspectorValues.h"
#include "JSLock.h"
#include "ParserError.h"
+#include "ScriptDebugServer.h"
#include "SourceCode.h"
#include <wtf/PassRefPtr.h>
-#if ENABLE(_javascript__DEBUGGER)
-#include "ScriptDebugServer.h"
-#endif
-
using namespace JSC;
namespace Inspector {
@@ -59,9 +56,7 @@
InspectorRuntimeAgent::InspectorRuntimeAgent(InjectedScriptManager* injectedScriptManager)
: InspectorAgentBase(ASCIILiteral("Runtime"))
, m_injectedScriptManager(injectedScriptManager)
-#if ENABLE(_javascript__DEBUGGER)
, m_scriptDebugServer(nullptr)
-#endif
, m_enabled(false)
{
}
@@ -70,7 +65,6 @@
{
}
-#if ENABLE(_javascript__DEBUGGER)
static ScriptDebugServer::PauseOnExceptionsState setPauseOnExceptionsState(ScriptDebugServer* scriptDebugServer, ScriptDebugServer::PauseOnExceptionsState newState)
{
ASSERT(scriptDebugServer);
@@ -79,7 +73,6 @@
scriptDebugServer->setPauseOnExceptionsState(newState);
return presentState;
}
-#endif
static PassRefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
{
@@ -124,11 +117,9 @@
if (injectedScript.hasNoValue())
return;
-#if ENABLE(_javascript__DEBUGGER)
ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = ScriptDebugServer::DontPauseOnExceptions;
if (asBool(doNotPauseOnExceptionsAndMuteConsole))
previousPauseOnExceptionsState = setPauseOnExceptionsState(m_scriptDebugServer, ScriptDebugServer::DontPauseOnExceptions);
-#endif
if (asBool(doNotPauseOnExceptionsAndMuteConsole))
muteConsole();
@@ -136,9 +127,7 @@
if (asBool(doNotPauseOnExceptionsAndMuteConsole)) {
unmuteConsole();
-#if ENABLE(_javascript__DEBUGGER)
setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
-#endif
}
}
@@ -154,11 +143,9 @@
if (optionalArguments)
arguments = (*optionalArguments)->toJSONString();
-#if ENABLE(_javascript__DEBUGGER)
ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = ScriptDebugServer::DontPauseOnExceptions;
if (asBool(doNotPauseOnExceptionsAndMuteConsole))
previousPauseOnExceptionsState = setPauseOnExceptionsState(m_scriptDebugServer, ScriptDebugServer::DontPauseOnExceptions);
-#endif
if (asBool(doNotPauseOnExceptionsAndMuteConsole))
muteConsole();
@@ -166,9 +153,7 @@
if (asBool(doNotPauseOnExceptionsAndMuteConsole)) {
unmuteConsole();
-#if ENABLE(_javascript__DEBUGGER)
setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
-#endif
}
}
@@ -180,18 +165,14 @@
return;
}
-#if ENABLE(_javascript__DEBUGGER)
ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = setPauseOnExceptionsState(m_scriptDebugServer, ScriptDebugServer::DontPauseOnExceptions);
-#endif
muteConsole();
injectedScript.getProperties(errorString, objectId, ownProperties ? *ownProperties : false, &result);
injectedScript.getInternalProperties(errorString, objectId, &internalProperties);
unmuteConsole();
-#if ENABLE(_javascript__DEBUGGER)
setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
-#endif
}
void InspectorRuntimeAgent::releaseObject(ErrorString*, const String& objectId)
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h (162969 => 162970)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h 2014-01-28 23:29:30 UTC (rev 162970)
@@ -67,9 +67,7 @@
virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override final;
virtual void run(ErrorString*) override;
-#if ENABLE(_javascript__DEBUGGER)
void setScriptDebugServer(ScriptDebugServer* scriptDebugServer) { m_scriptDebugServer = scriptDebugServer; }
-#endif
bool enabled() const { return m_enabled; }
@@ -86,9 +84,7 @@
private:
InjectedScriptManager* m_injectedScriptManager;
-#if ENABLE(_javascript__DEBUGGER)
ScriptDebugServer* m_scriptDebugServer;
-#endif
bool m_enabled;
};
