<!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>[162970] 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/162970">162970</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 15:29:30 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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/JavaScriptCallFrame.cpp:
* inspector/JavaScriptCallFrame.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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerBreakpointh">trunk/Source/JavaScriptCore/debugger/Breakpoint.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFrameh">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptcpp">trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScripth">trunk/Source/JavaScriptCore/inspector/InjectedScript.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramePrototypecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramePrototypeh">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJavaScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugListenerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.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="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-01-28 Mark Lam <mark.lam@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/JavaScriptCallFrame.cpp:
+ * inspector/JavaScriptCallFrame.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:
+
</ins><span class="cx"> 2014-01-28 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: JavascriptCore crash during OS Installation (due to
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerBreakpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Breakpoint.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Breakpoint.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/debugger/Breakpoint.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef Breakpoint_h
</span><span class="cx"> #define Breakpoint_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "DebuggerPrimitives.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -65,6 +63,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // Breakpoint_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "Debugger.h"
</span><span class="cx">
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="lines">@@ -761,5 +759,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><del>-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE explicit DebuggerCallFrame(CallFrame*);
</span><span class="cx">
</span><del>- CallFrame* callFrame() const { return m_callFrame; }
</del><span class="cx"> JS_EXPORT_PRIVATE PassRefPtr<DebuggerCallFrame> callerFrame();
</span><span class="cx"> ExecState* exec() const { return m_callFrame; }
</span><span class="cx"> JS_EXPORT_PRIVATE SourceID sourceID() const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -141,7 +141,6 @@
</span><span class="cx"> *properties = array;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="lines">@@ -157,7 +156,6 @@
</span><span class="cx">
</span><span class="cx"> return Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -63,9 +63,7 @@
</span><span class="cx"> void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescriptor>>* result);
</span><span class="cx"> void getInternalProperties(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor>>* result);
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
</span><del>-#endif
</del><span class="cx"> PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
</span><span class="cx"> PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JSGlobalObjectScriptDebugServer.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "EventLoop.h"
</span><span class="cx">
</span><span class="lines">@@ -85,5 +84,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define JSGlobalObjectScriptDebugServer_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "ScriptDebugServer.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -63,7 +62,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #endif // JSGlobalObjectScriptDebugServer_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JSJavaScriptCallFrame.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="lines">@@ -211,5 +210,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define JSJavaScriptCallFrame_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "JSDestructibleObject.h"
</span><span class="cx"> #include "JavaScriptCallFrame.h"
</span><span class="lines">@@ -96,7 +95,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #endif // !defined(JSJavaScriptCallFrame_h)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JSJavaScriptCallFramePrototype.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="lines">@@ -234,5 +233,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramePrototypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define JSJavaScriptCallFramePrototype_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx">
</span><span class="lines">@@ -64,7 +63,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #endif // !defined(JSJavaScriptCallFramePrototype_h)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "JavaScriptCallFrame.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -53,5 +52,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJavaScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define JavaScriptCallFrame_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "debugger/DebuggerCallFrame.h"
</span><span class="lines">@@ -69,7 +68,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #endif // JavaScriptCallFrame_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #ifndef ScriptDebugListener_h
</span><span class="cx"> #define ScriptDebugListener_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "debugger/Debugger.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -80,6 +78,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // ScriptDebugListener_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScriptDebugServer.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "DebuggerCallFrame.h"
</span><span class="cx"> #include "JSJavaScriptCallFrame.h"
</span><span class="cx"> #include "JSLock.h"
</span><span class="lines">@@ -338,5 +336,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><del>-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #ifndef ScriptDebugServer_h
</span><span class="cx"> #define ScriptDebugServer_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "ScriptBreakpoint.h"
</span><span class="cx"> #include "ScriptDebugListener.h"
</span><span class="cx"> #include "bindings/ScriptObject.h"
</span><span class="lines">@@ -115,6 +113,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // ScriptDebugServer_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "InspectorDebuggerAgent.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "ContentSearchUtilities.h"
</span><span class="cx"> #include "InjectedScript.h"
</span><span class="lines">@@ -733,5 +732,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #define InspectorDebuggerAgent_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> #include "InspectorJSBackendDispatchers.h"
</span><span class="cx"> #include "InspectorJSFrontendDispatchers.h"
</span><span class="lines">@@ -169,7 +168,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorDebuggerAgent_h)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -40,13 +40,10 @@
</span><span class="cx"> #include "InspectorValues.h"
</span><span class="cx"> #include "JSLock.h"
</span><span class="cx"> #include "ParserError.h"
</span><ins>+#include "ScriptDebugServer.h"
</ins><span class="cx"> #include "SourceCode.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-#include "ScriptDebugServer.h"
-#endif
-
</del><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -59,9 +56,7 @@
</span><span class="cx"> InspectorRuntimeAgent::InspectorRuntimeAgent(InjectedScriptManager* injectedScriptManager)
</span><span class="cx"> : InspectorAgentBase(ASCIILiteral("Runtime"))
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> , m_scriptDebugServer(nullptr)
</span><del>-#endif
</del><span class="cx"> , m_enabled(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -70,7 +65,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> static ScriptDebugServer::PauseOnExceptionsState setPauseOnExceptionsState(ScriptDebugServer* scriptDebugServer, ScriptDebugServer::PauseOnExceptionsState newState)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scriptDebugServer);
</span><span class="lines">@@ -79,7 +73,6 @@
</span><span class="cx"> scriptDebugServer->setPauseOnExceptionsState(newState);
</span><span class="cx"> return presentState;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static PassRefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
</span><span class="cx"> {
</span><span class="lines">@@ -124,11 +117,9 @@
</span><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = ScriptDebugServer::DontPauseOnExceptions;
</span><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole))
</span><span class="cx"> previousPauseOnExceptionsState = setPauseOnExceptionsState(m_scriptDebugServer, ScriptDebugServer::DontPauseOnExceptions);
</span><del>-#endif
</del><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole))
</span><span class="cx"> muteConsole();
</span><span class="cx">
</span><span class="lines">@@ -136,9 +127,7 @@
</span><span class="cx">
</span><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole)) {
</span><span class="cx"> unmuteConsole();
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -154,11 +143,9 @@
</span><span class="cx"> if (optionalArguments)
</span><span class="cx"> arguments = (*optionalArguments)->toJSONString();
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = ScriptDebugServer::DontPauseOnExceptions;
</span><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole))
</span><span class="cx"> previousPauseOnExceptionsState = setPauseOnExceptionsState(m_scriptDebugServer, ScriptDebugServer::DontPauseOnExceptions);
</span><del>-#endif
</del><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole))
</span><span class="cx"> muteConsole();
</span><span class="cx">
</span><span class="lines">@@ -166,9 +153,7 @@
</span><span class="cx">
</span><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole)) {
</span><span class="cx"> unmuteConsole();
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,18 +165,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = setPauseOnExceptionsState(m_scriptDebugServer, ScriptDebugServer::DontPauseOnExceptions);
</span><del>-#endif
</del><span class="cx"> muteConsole();
</span><span class="cx">
</span><span class="cx"> injectedScript.getProperties(errorString, objectId, ownProperties ? *ownProperties : false, &result);
</span><span class="cx"> injectedScript.getInternalProperties(errorString, objectId, &internalProperties);
</span><span class="cx">
</span><span class="cx"> unmuteConsole();
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::releaseObject(ErrorString*, const String& objectId)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (162969 => 162970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-01-28 23:22:56 UTC (rev 162969)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-01-28 23:29:30 UTC (rev 162970)
</span><span class="lines">@@ -67,9 +67,7 @@
</span><span class="cx"> virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override final;
</span><span class="cx"> virtual void run(ErrorString*) override;
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void setScriptDebugServer(ScriptDebugServer* scriptDebugServer) { m_scriptDebugServer = scriptDebugServer; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool enabled() const { return m_enabled; }
</span><span class="cx">
</span><span class="lines">@@ -86,9 +84,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> InjectedScriptManager* m_injectedScriptManager;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> ScriptDebugServer* m_scriptDebugServer;
</span><del>-#endif
</del><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>