<!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>[163024] trunk</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/163024">163024</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-29 10:31:56 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
https://bugs.webkit.org/show_bug.cgi?id=127840
Reviewed by Mark Lam.
.:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* inspector/scripts/CodeGeneratorInspector.py:
Source/WebCore:
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::supportsProfiling):
(WebCore::JSDOMWindowBase::supportsRichSourceInfo):
* bindings/js/PageScriptDebugServer.cpp:
* bindings/js/PageScriptDebugServer.h:
* bindings/js/ScriptProfile.cpp:
* bindings/js/ScriptProfile.h:
* bindings/js/ScriptProfileNode.h:
* bindings/js/ScriptProfiler.cpp:
* bindings/js/ScriptProfiler.h:
* bindings/js/WorkerScriptDebugServer.cpp:
* bindings/js/WorkerScriptDebugServer.h:
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::getCurrentUserInitiatedProfileName):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::resume):
* inspector/InspectorController.h:
* inspector/InspectorDOMDebuggerAgent.cpp:
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorHeapProfilerAgent.cpp:
* inspector/InspectorHeapProfilerAgent.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didClearWindowObjectInWorldImpl):
(WebCore::InspectorInstrumentation::isDebuggerPausedImpl):
(WebCore::InspectorInstrumentation::willInsertDOMNodeImpl):
(WebCore::InspectorInstrumentation::didInsertDOMNodeImpl):
(WebCore::InspectorInstrumentation::willRemoveDOMNodeImpl):
(WebCore::InspectorInstrumentation::didRemoveDOMNodeImpl):
(WebCore::InspectorInstrumentation::willModifyDOMAttrImpl):
(WebCore::InspectorInstrumentation::didInvalidateStyleAttrImpl):
(WebCore::InspectorInstrumentation::willSendXMLHttpRequestImpl):
(WebCore::InspectorInstrumentation::scriptExecutionBlockedByCSPImpl):
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
(WebCore::InspectorInstrumentation::profilerEnabledImpl):
(WebCore::InspectorInstrumentation::willEvaluateWorkerScript):
(WebCore::InspectorInstrumentation::pauseOnNativeEventIfNeeded):
(WebCore::InspectorInstrumentation::cancelPauseOnNativeEvent):
* inspector/InspectorInstrumentation.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/InstrumentingAgents.h:
* inspector/PageDebuggerAgent.cpp:
* inspector/PageDebuggerAgent.h:
* inspector/ScriptProfile.idl:
* inspector/ScriptProfileNode.idl:
* inspector/WebDebuggerAgent.cpp:
* inspector/WebDebuggerAgent.h:
* inspector/WorkerDebuggerAgent.cpp:
* inspector/WorkerDebuggerAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
(WebCore::WorkerInspectorController::resume):
* inspector/WorkerInspectorController.h:
* inspector/WorkerRuntimeAgent.cpp:
(WebCore::WorkerRuntimeAgent::pauseWorkerGlobalScope):
* inspector/WorkerRuntimeAgent.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
* page/Console.cpp:
* page/Console.h:
* page/Console.idl:
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
* workers/WorkerMessagingProxy.cpp:
(WebCore::connectToWorkerGlobalScopeInspectorTask):
(WebCore::WorkerMessagingProxy::connectToInspector):
(WebCore::disconnectFromWorkerGlobalScopeInspectorTask):
(WebCore::WorkerMessagingProxy::disconnectFromInspector):
(WebCore::dispatchOnInspectorBackendTask):
(WebCore::WorkerMessagingProxy::sendMessageToInspector):
Source/WebKit/gtk:
* webkit/webkitwebinspector.cpp:
(webkit_web_inspector_set_property):
(webkit_web_inspector_get_property):
Source/WebKit2:
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::startJavaScriptDebugging):
(WebKit::WebInspector::stopJavaScriptDebugging):
(WebKit::WebInspector::setJavaScriptProfilingEnabled):
(WebKit::WebInspector::startJavaScriptProfiling):
(WebKit::WebInspector::stopJavaScriptProfiling):
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* Scripts/webkitperl/FeatureList.pm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsCodeGeneratorInspectorpy">trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsPageScriptDebugServercpp">trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsPageScriptDebugServerh">trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfilecpp">trunk/Source/WebCore/bindings/js/ScriptProfile.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfileh">trunk/Source/WebCore/bindings/js/ScriptProfile.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfileNodeh">trunk/Source/WebCore/bindings/js/ScriptProfileNode.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfilercpp">trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfilerh">trunk/Source/WebCore/bindings/js/ScriptProfiler.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServerh">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleAgenth">trunk/Source/WebCore/inspector/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHeapProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHeapProfilerAgenth">trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgenth">trunk/Source/WebCore/inspector/InspectorProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgentcpp">trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgenth">trunk/Source/WebCore/inspector/PageDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptProfileidl">trunk/Source/WebCore/inspector/ScriptProfile.idl</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptProfileNodeidl">trunk/Source/WebCore/inspector/ScriptProfileNode.idl</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebDebuggerAgentcpp">trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebDebuggerAgenth">trunk/Source/WebCore/inspector/WebDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgenth">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllerh">trunk/Source/WebCore/inspector/WorkerInspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageConsolecpp">trunk/Source/WebCore/page/Console.cpp</a></li>
<li><a href="#trunkSourceWebCorepageConsoleh">trunk/Source/WebCore/page/Console.h</a></li>
<li><a href="#trunkSourceWebCorepageConsoleidl">trunk/Source/WebCore/page/Console.idl</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebinspectorcpp">trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
</ins><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * inspector/scripts/CodeGeneratorInspector.py:
+
</ins><span class="cx"> 2014-01-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r162987.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsCodeGeneratorInspectorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -44,10 +44,7 @@
</span><span class="cx">
</span><span class="cx"> DOMAIN_DEFINE_NAME_MAP = {
</span><span class="cx"> "Database": "SQL_DATABASE",
</span><del>- "Debugger": "JAVASCRIPT_DEBUGGER",
- "DOMDebugger": "JAVASCRIPT_DEBUGGER",
</del><span class="cx"> "IndexedDB": "INDEXED_DATABASE",
</span><del>- "Profiler": "JAVASCRIPT_DEBUGGER",
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WTF/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2014-01-28 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Actually turn stack stats back off.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -574,10 +574,6 @@
</span><span class="cx"> #define ENABLE_INSPECTOR 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_JAVASCRIPT_DEBUGGER)
-#define ENABLE_JAVASCRIPT_DEBUGGER 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_JAVASCRIPT_I18N_API)
</span><span class="cx"> #define ENABLE_JAVASCRIPT_I18N_API 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,87 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::supportsProfiling):
+ (WebCore::JSDOMWindowBase::supportsRichSourceInfo):
+ * bindings/js/PageScriptDebugServer.cpp:
+ * bindings/js/PageScriptDebugServer.h:
+ * bindings/js/ScriptProfile.cpp:
+ * bindings/js/ScriptProfile.h:
+ * bindings/js/ScriptProfileNode.h:
+ * bindings/js/ScriptProfiler.cpp:
+ * bindings/js/ScriptProfiler.h:
+ * bindings/js/WorkerScriptDebugServer.cpp:
+ * bindings/js/WorkerScriptDebugServer.h:
+ * inspector/InspectorConsoleAgent.h:
+ * inspector/InspectorConsoleInstrumentation.h:
+ (WebCore::InspectorInstrumentation::getCurrentUserInitiatedProfileName):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::resume):
+ * inspector/InspectorController.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorHeapProfilerAgent.cpp:
+ * inspector/InspectorHeapProfilerAgent.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didClearWindowObjectInWorldImpl):
+ (WebCore::InspectorInstrumentation::isDebuggerPausedImpl):
+ (WebCore::InspectorInstrumentation::willInsertDOMNodeImpl):
+ (WebCore::InspectorInstrumentation::didInsertDOMNodeImpl):
+ (WebCore::InspectorInstrumentation::willRemoveDOMNodeImpl):
+ (WebCore::InspectorInstrumentation::didRemoveDOMNodeImpl):
+ (WebCore::InspectorInstrumentation::willModifyDOMAttrImpl):
+ (WebCore::InspectorInstrumentation::didInvalidateStyleAttrImpl):
+ (WebCore::InspectorInstrumentation::willSendXMLHttpRequestImpl):
+ (WebCore::InspectorInstrumentation::scriptExecutionBlockedByCSPImpl):
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ (WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
+ (WebCore::InspectorInstrumentation::profilerEnabledImpl):
+ (WebCore::InspectorInstrumentation::willEvaluateWorkerScript):
+ (WebCore::InspectorInstrumentation::pauseOnNativeEventIfNeeded):
+ (WebCore::InspectorInstrumentation::cancelPauseOnNativeEvent):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InspectorProfilerAgent.cpp:
+ * inspector/InspectorProfilerAgent.h:
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/InstrumentingAgents.h:
+ * inspector/PageDebuggerAgent.cpp:
+ * inspector/PageDebuggerAgent.h:
+ * inspector/ScriptProfile.idl:
+ * inspector/ScriptProfileNode.idl:
+ * inspector/WebDebuggerAgent.cpp:
+ * inspector/WebDebuggerAgent.h:
+ * inspector/WorkerDebuggerAgent.cpp:
+ * inspector/WorkerDebuggerAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ (WebCore::WorkerInspectorController::resume):
+ * inspector/WorkerInspectorController.h:
+ * inspector/WorkerRuntimeAgent.cpp:
+ (WebCore::WorkerRuntimeAgent::pauseWorkerGlobalScope):
+ * inspector/WorkerRuntimeAgent.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
+ * page/Console.cpp:
+ * page/Console.h:
+ * page/Console.idl:
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::connectToWorkerGlobalScopeInspectorTask):
+ (WebCore::WorkerMessagingProxy::connectToInspector):
+ (WebCore::disconnectFromWorkerGlobalScopeInspectorTask):
+ (WebCore::WorkerMessagingProxy::disconnectFromInspector):
+ (WebCore::dispatchOnInspectorBackendTask):
+ (WebCore::WorkerMessagingProxy::sendMessageToInspector):
+
</ins><span class="cx"> 2014-01-29 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] cleanup MediaPlayer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> bool JSDOMWindowBase::supportsProfiling(const JSGlobalObject* object)
</span><span class="cx"> {
</span><del>-#if !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR)
</del><ins>+#if !ENABLE(INSPECTOR)
</ins><span class="cx"> UNUSED_PARAM(object);
</span><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> bool JSDOMWindowBase::supportsRichSourceInfo(const JSGlobalObject* object)
</span><span class="cx"> {
</span><del>-#if !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR)
</del><ins>+#if !ENABLE(INSPECTOR)
</ins><span class="cx"> UNUSED_PARAM(object);
</span><span class="cx"> return false;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PageScriptDebugServer.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "EventLoop.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -273,5 +271,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #ifndef PageScriptDebugServer_h
</span><span class="cx"> #define PageScriptDebugServer_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include <inspector/ScriptDebugServer.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="lines">@@ -81,6 +79,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // PageScriptDebugServer_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptProfile.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfile.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/ScriptProfile.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="lines">@@ -107,5 +105,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptProfile.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfile.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/ScriptProfile.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #ifndef ScriptProfile_h
</span><span class="cx"> #define ScriptProfile_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #include "ScriptProfileNode.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -68,6 +67,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // ScriptProfile_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfileNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptProfileNode.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfileNode.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/ScriptProfileNode.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #ifndef ScriptProfileNode_h
</span><span class="cx"> #define ScriptProfileNode_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #include <profiler/ProfileNode.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -36,6 +35,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // ScriptProfileNode_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "ScriptProfiler.h"
</span><span class="cx">
</span><span class="cx"> #include "GCController.h"
</span><span class="lines">@@ -92,5 +90,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptProfiler.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfiler.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/ScriptProfiler.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #ifndef ScriptProfiler_h
</span><span class="cx"> #define ScriptProfiler_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "ScriptHeapSnapshot.h"
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "ScriptState.h"
</span><span class="lines">@@ -74,6 +72,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // ScriptProfiler_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WorkerScriptDebugServer.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "WorkerDebuggerAgent.h"
</span><span class="lines">@@ -111,5 +109,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #ifndef WorkerScriptDebugServer_h
</span><span class="cx"> #define WorkerScriptDebugServer_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #include <inspector/ScriptDebugServer.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,6 +65,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // WorkerScriptDebugServer_h
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -85,10 +85,8 @@
</span><span class="cx"> void didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</span><span class="cx"> void didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse&);
</span><span class="cx"> void didFailLoading(unsigned long requestIdentifier, const ResourceError&);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
</span><span class="cx"> void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
</span><del>-#endif
</del><span class="cx"> virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override;
</span><span class="cx"> virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
</span><span class="cx"> virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -173,7 +173,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> inline void InspectorInstrumentation::addStartProfilingMessageToConsole(Page* page, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="lines">@@ -222,7 +221,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -145,7 +145,6 @@
</span><span class="cx"> InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get();
</span><span class="cx"> m_agents.append(std::move(consoleAgentPtr));
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), pageAgent, m_overlay.get());
</span><span class="cx"> m_debuggerAgent = debuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(std::move(debuggerAgentPtr));
</span><span class="lines">@@ -159,7 +158,6 @@
</span><span class="cx"> m_agents.append(std::move(profilerAgentPtr));
</span><span class="cx">
</span><span class="cx"> m_agents.append(std::make_unique<InspectorHeapProfilerAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get()));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_agents.append(std::make_unique<InspectorWorkerAgent>(m_instrumentingAgents.get()));
</span><span class="cx">
</span><span class="lines">@@ -183,9 +181,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorController::~InspectorController()
</span><span class="lines">@@ -390,7 +386,6 @@
</span><span class="cx"> m_inspectorClient->hideIndication();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> bool InspectorController::profilerEnabled() const
</span><span class="cx"> {
</span><span class="cx"> return m_profilerAgent->enabled();
</span><span class="lines">@@ -412,7 +407,6 @@
</span><span class="cx"> m_debuggerAgent->resume(&error);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -119,12 +119,10 @@
</span><span class="cx"> bool isUnderTest();
</span><span class="cx"> void evaluateForTestInFrontend(long callId, const String& script);
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> bool profilerEnabled() const;
</span><span class="cx"> void setProfilerEnabled(bool);
</span><span class="cx">
</span><span class="cx"> void resume();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
</span><span class="cx">
</span><span class="lines">@@ -155,11 +153,9 @@
</span><span class="cx"> InspectorResourceAgent* m_resourceAgent;
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> InspectorMemoryAgent* m_memoryAgent;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> Inspector::InspectorDebuggerAgent* m_debuggerAgent;
</span><span class="cx"> InspectorDOMDebuggerAgent* m_domDebuggerAgent;
</span><span class="cx"> InspectorProfilerAgent* m_profilerAgent;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;
</span><span class="cx"> std::unique_ptr<InspectorFrontendClient> m_inspectorFrontendClient;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorDOMDebuggerAgent.h"
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="lines">@@ -426,4 +426,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef InspectorDOMDebuggerAgent_h
</span><span class="cx"> #define InspectorDOMDebuggerAgent_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="lines">@@ -113,6 +113,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorDOMDebuggerAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHeapProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorHeapProfilerAgent.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="lines">@@ -230,4 +230,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHeapProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef InspectorHeapProfilerAgent_h
</span><span class="cx"> #define InspectorHeapProfilerAgent_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="lines">@@ -91,6 +91,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorHeapProfilerAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -108,12 +108,10 @@
</span><span class="cx"> InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent();
</span><span class="cx"> if (pageAgent)
</span><span class="cx"> pageAgent->didClearWindowObjectInWorld(frame, world);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (PageDebuggerAgent* debuggerAgent = instrumentingAgents->pageDebuggerAgent()) {
</span><span class="cx"> if (pageAgent && &world == &mainThreadNormalWorld() && frame == pageAgent->mainFrame())
</span><span class="cx"> debuggerAgent->didClearMainFrameWindowObject();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> if (PageRuntimeAgent* pageRuntimeAgent = instrumentingAgents->pageRuntimeAgent()) {
</span><span class="cx"> if (&world == &mainThreadNormalWorld())
</span><span class="cx"> pageRuntimeAgent->didCreateMainWorldContext(frame);
</span><span class="lines">@@ -122,57 +120,45 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorInstrumentation::isDebuggerPausedImpl(InstrumentingAgents* instrumentingAgents)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
</span><span class="cx"> return debuggerAgent->isPaused();
</span><del>-#endif
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::willInsertDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* parent)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->willInsertDOMNode(parent);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didInsertDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->didInsertDOMNode(node);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->didInsertDOMNode(node);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::willRemoveDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* node)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->willRemoveDOMNode(node);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didRemoveDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* node)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->didRemoveDOMNode(node);
</span><del>-#endif
</del><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->didRemoveDOMNode(node);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::willModifyDOMAttrImpl(InstrumentingAgents* instrumentingAgents, Element* element, const AtomicString& oldValue, const AtomicString& newValue)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->willModifyDOMAttr(element);
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->willModifyDOMAttr(element, oldValue, newValue);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didModifyDOMAttrImpl(InstrumentingAgents* instrumentingAgents, Element* element, const AtomicString& name, const AtomicString& value)
</span><span class="lines">@@ -191,10 +177,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->didInvalidateStyleAttr(node);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->didInvalidateStyleAttr(node);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::frameWindowDiscardedImpl(InstrumentingAgents* instrumentingAgents, DOMWindow* window)
</span><span class="lines">@@ -298,10 +282,8 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::willSendXMLHttpRequestImpl(InstrumentingAgents* instrumentingAgents, const String& url)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->willSendXMLHttpRequest(url);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didScheduleResourceRequestImpl(InstrumentingAgents* instrumentingAgents, const String& url, Frame* frame)
</span><span class="lines">@@ -719,10 +701,8 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::scriptExecutionBlockedByCSPImpl(InstrumentingAgents* instrumentingAgents, const String& directiveText)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
</span><span class="cx"> debuggerAgent->scriptExecutionBlockedByCSP(directiveText);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier)
</span><span class="lines">@@ -777,12 +757,10 @@
</span><span class="cx">
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->mainFrameNavigated(loader);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
</span><span class="cx"> profilerAgent->resetState();
</span><span class="cx"> if (InspectorHeapProfilerAgent* heapProfilerAgent = instrumentingAgents->inspectorHeapProfilerAgent())
</span><span class="cx"> heapProfilerAgent->resetState();
</span><del>-#endif
</del><span class="cx"> if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
</span><span class="cx"> cssAgent->reset();
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -894,26 +872,22 @@
</span><span class="cx"> {
</span><span class="cx"> if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</span><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, callStack, requestIdentifier);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> // FIXME: This should just pass the message on to the debugger agent. JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
</span><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
</span><span class="cx"> if (isConsoleAssertMessage(source, type))
</span><span class="cx"> debuggerAgent->handleConsoleAssert();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
</span><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, state, arguments, requestIdentifier);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> // FIXME: This should just pass the message on to the debugger agent. JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
</span><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
</span><span class="cx"> if (isConsoleAssertMessage(source, type))
</span><span class="cx"> debuggerAgent->handleConsoleAssert();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="lines">@@ -953,7 +927,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void InspectorInstrumentation::addStartProfilingMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
</span><span class="lines">@@ -981,7 +954,6 @@
</span><span class="cx"> return profilerAgent->enabled();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
</span><span class="lines">@@ -1019,10 +991,8 @@
</span><span class="cx"> InstrumentingAgents* instrumentingAgents = instrumentationForWorkerGlobalScope(workerGlobalScope);
</span><span class="cx"> if (!instrumentingAgents)
</span><span class="cx"> return;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (WorkerRuntimeAgent* runtimeAgent = instrumentingAgents->workerRuntimeAgent())
</span><span class="cx"> runtimeAgent->pauseWorkerGlobalScope(workerGlobalScope);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::workerGlobalScopeTerminatedImpl(InstrumentingAgents* instrumentingAgents, WorkerGlobalScopeProxy* proxy)
</span><span class="lines">@@ -1116,18 +1086,14 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::pauseOnNativeEventIfNeeded(InstrumentingAgents* instrumentingAgents, bool isDOMEvent, const String& eventName, bool synchronous)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
</span><span class="cx"> domDebuggerAgent->pauseOnNativeEventIfNeeded(isDOMEvent, eventName, synchronous);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::cancelPauseOnNativeEvent(InstrumentingAgents* instrumentingAgents)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
</span><span class="cx"> debuggerAgent->cancelPauseOnNextStatement();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didRequestAnimationFrameImpl(InstrumentingAgents* instrumentingAgents, int callbackId, Frame* frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -221,12 +221,10 @@
</span><span class="cx"> static InspectorInstrumentationCookie willFireAnimationFrame(Document*, int callbackId);
</span><span class="cx"> static void didFireAnimationFrame(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
</span><span class="cx"> static void addProfile(Page*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
</span><span class="cx"> static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber);
</span><span class="cx"> static bool profilerEnabled(Page*);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> static void didOpenDatabase(ScriptExecutionContext*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
</span><span class="lines">@@ -405,12 +403,10 @@
</span><span class="cx"> static InspectorInstrumentationCookie willFireAnimationFrameImpl(InstrumentingAgents*, int callbackId, Frame*);
</span><span class="cx"> static void didFireAnimationFrameImpl(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
</span><span class="cx"> static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
</span><span class="cx"> static String getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents*, bool incrementProfileNumber);
</span><span class="cx"> static bool profilerEnabledImpl(InstrumentingAgents*);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> static void didOpenDatabaseImpl(InstrumentingAgents*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorProfilerAgent.h"
</span><span class="cx">
</span><span class="lines">@@ -455,4 +455,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #ifndef InspectorProfilerAgent_h
</span><span class="cx"> #define InspectorProfilerAgent_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="lines">@@ -134,6 +134,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorProfilerAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -62,12 +62,10 @@
</span><span class="cx"> , m_inspectorDatabaseAgent(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> , m_inspectorApplicationCacheAgent(nullptr)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> , m_inspectorDebuggerAgent(nullptr)
</span><span class="cx"> , m_pageDebuggerAgent(nullptr)
</span><span class="cx"> , m_inspectorDOMDebuggerAgent(nullptr)
</span><span class="cx"> , m_inspectorProfilerAgent(nullptr)
</span><del>-#endif
</del><span class="cx"> , m_inspectorWorkerAgent(nullptr)
</span><span class="cx"> , m_inspectorCanvasAgent(nullptr)
</span><span class="cx"> {
</span><span class="lines">@@ -92,12 +90,10 @@
</span><span class="cx"> m_inspectorDatabaseAgent = nullptr;
</span><span class="cx"> #endif
</span><span class="cx"> m_inspectorApplicationCacheAgent = nullptr;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_inspectorDebuggerAgent = nullptr;
</span><span class="cx"> m_pageDebuggerAgent = nullptr;
</span><span class="cx"> m_inspectorDOMDebuggerAgent = nullptr;
</span><span class="cx"> m_inspectorProfilerAgent = nullptr;
</span><del>-#endif
</del><span class="cx"> m_inspectorWorkerAgent = nullptr;
</span><span class="cx"> m_inspectorCanvasAgent = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx"> InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
</span><span class="cx"> void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> Inspector::InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
</span><span class="cx"> void setInspectorDebuggerAgent(Inspector::InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -131,7 +130,6 @@
</span><span class="cx">
</span><span class="cx"> InspectorHeapProfilerAgent* inspectorHeapProfilerAgent() const { return m_inspectorHeapProfilerAgent; }
</span><span class="cx"> void setInspectorHeapProfilerAgent(InspectorHeapProfilerAgent* agent) { m_inspectorHeapProfilerAgent = agent; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
</span><span class="cx"> void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
</span><span class="lines">@@ -166,13 +164,11 @@
</span><span class="cx"> InspectorDatabaseAgent* m_inspectorDatabaseAgent;
</span><span class="cx"> #endif
</span><span class="cx"> InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent;
</span><span class="cx"> PageDebuggerAgent* m_pageDebuggerAgent;
</span><span class="cx"> InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
</span><span class="cx"> InspectorProfilerAgent* m_inspectorProfilerAgent;
</span><span class="cx"> InspectorHeapProfilerAgent* m_inspectorHeapProfilerAgent;
</span><del>-#endif
</del><span class="cx"> InspectorWorkerAgent* m_inspectorWorkerAgent;
</span><span class="cx"> InspectorCanvasAgent* m_inspectorCanvasAgent;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PageDebuggerAgent.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "CachedResource.h"
</span><span class="cx"> #include "InspectorOverlay.h"
</span><span class="lines">@@ -144,4 +144,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef PageDebuggerAgent_h
</span><span class="cx"> #define PageDebuggerAgent_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "PageScriptDebugServer.h"
</span><span class="cx"> #include "WebDebuggerAgent.h"
</span><span class="lines">@@ -77,6 +77,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(PageDebuggerAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptProfileidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/ScriptProfile.idl (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptProfile.idl 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/ScriptProfile.idl 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=JAVASCRIPT_DEBUGGER,
</del><span class="cx"> ] interface ScriptProfile {
</span><span class="cx"> readonly attribute DOMString title;
</span><span class="cx"> readonly attribute unsigned long uid;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptProfileNodeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/ScriptProfileNode.idl (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptProfileNode.idl 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/ScriptProfileNode.idl 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=JAVASCRIPT_DEBUGGER,
</del><span class="cx"> ImplementationLacksVTable
</span><span class="cx"> ] interface ScriptProfileNode {
</span><span class="cx"> readonly attribute DOMString functionName;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebDebuggerAgent.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 "InstrumentingAgents.h"
</span><span class="cx">
</span><span class="lines">@@ -55,5 +54,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebDebuggerAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebDebuggerAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WebDebuggerAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebDebuggerAgent_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 <inspector/agents/InspectorDebuggerAgent.h>
</span><span class="cx">
</span><span class="lines">@@ -52,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</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(WebDebuggerAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WorkerDebuggerAgent.h"
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="lines">@@ -160,4 +160,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef WorkerDebuggerAgent_h
</span><span class="cx"> #define WorkerDebuggerAgent_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #include "WebDebuggerAgent.h"
</span><span class="cx"> #include "WorkerScriptDebugServer.h"
</span><span class="lines">@@ -67,6 +67,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#endif // ENABLE(INSPECTOR)
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(WorkerDebuggerAgent_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -91,14 +91,12 @@
</span><span class="cx"> m_agents.append(std::move(runtimeAgent));
</span><span class="cx">
</span><span class="cx"> auto consoleAgent = std::make_unique<WorkerConsoleAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get());
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> auto debuggerAgent = std::make_unique<WorkerDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), &workerGlobalScope);
</span><span class="cx"> m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
</span><span class="cx"> m_agents.append(std::move(debuggerAgent));
</span><span class="cx">
</span><span class="cx"> m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), &workerGlobalScope, m_injectedScriptManager.get()));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorHeapProfilerAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get()));
</span><del>-#endif
</del><span class="cx"> m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));
</span><span class="cx"> m_agents.append(std::move(consoleAgent));
</span><span class="cx">
</span><span class="lines">@@ -145,13 +143,11 @@
</span><span class="cx"> m_backendDispatcher->dispatch(message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void WorkerInspectorController::resume()
</span><span class="cx"> {
</span><span class="cx"> ErrorString unused;
</span><span class="cx"> m_runtimeAgent->run(&unused);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> InspectorFunctionCallHandler WorkerInspectorController::functionCallHandler() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -65,9 +65,7 @@
</span><span class="cx"> void connectFrontend();
</span><span class="cx"> void disconnectFrontend(Inspector::InspectorDisconnectReason);
</span><span class="cx"> void dispatchMessageFromFrontend(const String&);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void resume();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual bool developerExtrasEnabled() const override { return true; }
</span><span class="cx"> virtual bool canAccessInspectedScriptState(JSC::ExecState*) const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> return JSDOMWindowBase::commonVM();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void WorkerRuntimeAgent::pauseWorkerGlobalScope(WorkerGlobalScope* context)
</span><span class="cx"> {
</span><span class="cx"> m_paused = true;
</span><span class="lines">@@ -105,7 +104,6 @@
</span><span class="cx"> // Keep waiting until execution is resumed.
</span><span class="cx"> } while (result == MessageQueueMessageReceived && m_paused);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -51,9 +51,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void run(ErrorString*) override;
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> void pauseWorkerGlobalScope(WorkerGlobalScope*);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual JSC::VM* globalVM() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -2948,7 +2948,7 @@
</span><span class="cx"> if (!m_frame.page())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> if (Page* page = m_frame.page()) {
</span><span class="cx"> if (m_frame.isMainFrame())
</span><span class="cx"> page->inspectorController().resume();
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/page/Console.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -186,8 +186,6 @@
</span><span class="cx"> InspectorInstrumentation::consoleCount(page(), state, arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> void Console::profile(JSC::ExecState* state, const String& title)
</span><span class="cx"> {
</span><span class="cx"> Page* page = this->page();
</span><span class="lines">@@ -227,8 +225,6 @@
</span><span class="cx"> InspectorInstrumentation::addProfile(page, profile, callStack);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> void Console::time(const String& title)
</span><span class="cx"> {
</span><span class="cx"> InspectorInstrumentation::startConsoleTiming(m_frame, title);
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsoleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.h (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.h 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/page/Console.h 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -43,9 +43,7 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class ScriptArguments;
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> typedef Vector<RefPtr<ScriptProfile>> ProfilesArray;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> class Console : public ScriptWrappable, public RefCounted<Console>, public DOMWindowProperty {
</span><span class="cx"> public:
</span><span class="lines">@@ -64,11 +62,9 @@
</span><span class="cx"> void trace(JSC::ExecState*, PassRefPtr<ScriptArguments>);
</span><span class="cx"> void assertCondition(JSC::ExecState*, PassRefPtr<ScriptArguments>, bool condition);
</span><span class="cx"> void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> const ProfilesArray& profiles() const { return m_profiles; }
</span><span class="cx"> void profile(JSC::ExecState*, const String& = String());
</span><span class="cx"> void profileEnd(JSC::ExecState*, const String& = String());
</span><del>-#endif
</del><span class="cx"> void time(const String&);
</span><span class="cx"> void timeEnd(JSC::ExecState*, const String&);
</span><span class="cx"> void timeStamp(PassRefPtr<ScriptArguments>);
</span><span class="lines">@@ -81,9 +77,7 @@
</span><span class="cx">
</span><span class="cx"> explicit Console(Frame*);
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> ProfilesArray m_profiles;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsoleidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.idl (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.idl 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/page/Console.idl 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> // As per spec: http://www.w3.org/TR/WebIDL/#idl-sequence
</span><span class="cx"> // "Sequences must not be used as the type of an attribute, constant or exception field."
</span><span class="cx"> // FIXME: this will lead to BUG console.profiles !== console.profiles as profile will always returns new array.
</span><del>- [Conditional=JAVASCRIPT_DEBUGGER] readonly attribute ScriptProfile[] profiles;
- [Conditional=JAVASCRIPT_DEBUGGER, CallWith=ScriptState] void profile([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
- [Conditional=JAVASCRIPT_DEBUGGER, CallWith=ScriptState] void profileEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
</del><ins>+ readonly attribute ScriptProfile[] profiles;
+ [CallWith=ScriptState] void profile([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
+ [CallWith=ScriptState] void profileEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
</ins><span class="cx">
</span><span class="cx"> void time([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
</span><span class="cx"> [CallWith=ScriptState] void timeEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> TextRun::setAllowsRoundingHacks(false);
</span><span class="cx"> WebCore::overrideUserPreferredLanguages(Vector<String>());
</span><span class="cx"> WebCore::Settings::setUsesOverlayScrollbars(false);
</span><del>-#if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
</del><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> page->inspectorController().setProfilerEnabled(false);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && !PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -406,13 +406,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> static void connectToWorkerGlobalScopeInspectorTask(ScriptExecutionContext* context, bool)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
</span><span class="cx"> static_cast<WorkerGlobalScope*>(context)->workerInspectorController().connectFrontend();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::connectToInspector(WorkerGlobalScopeProxy::PageInspector* pageInspector)
</span><span class="cx"> {
</span><span class="lines">@@ -420,45 +418,35 @@
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(!m_pageInspector);
</span><span class="cx"> m_pageInspector = pageInspector;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_workerThread->runLoop().postTaskForMode(createCallbackTask(connectToWorkerGlobalScopeInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> static void disconnectFromWorkerGlobalScopeInspectorTask(ScriptExecutionContext* context, bool)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
</span><span class="cx"> static_cast<WorkerGlobalScope*>(context)->workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::disconnectFromInspector()
</span><span class="cx"> {
</span><span class="cx"> m_pageInspector = 0;
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_workerThread->runLoop().postTaskForMode(createCallbackTask(disconnectFromWorkerGlobalScopeInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
</span><span class="cx"> static_cast<WorkerGlobalScope*>(context)->workerInspectorController().dispatchMessageFromFrontend(message);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::sendMessageToInspector(const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_workerThread->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), WorkerDebuggerAgent::debuggerTaskMode);
</span><span class="cx"> WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.get());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * webkit/webkitwebinspector.cpp:
+ (webkit_web_inspector_set_property):
+ (webkit_web_inspector_get_property):
+
</ins><span class="cx"> 2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebinspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -351,12 +351,8 @@
</span><span class="cx">
</span><span class="cx"> switch(prop_id) {
</span><span class="cx"> case PROP_JAVASCRIPT_PROFILING_ENABLED: {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> bool enabled = g_value_get_boolean(value);
</span><span class="cx"> priv->page->inspectorController().setProfilerEnabled(enabled);
</span><del>-#else
- g_message("PROP_JAVASCRIPT_PROFILING_ENABLED is not work because of the javascript debugger is disabled\n");
-#endif
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case PROP_TIMELINE_PROFILING_ENABLED: {
</span><span class="lines">@@ -382,11 +378,7 @@
</span><span class="cx"> g_value_set_string(value, priv->inspected_uri);
</span><span class="cx"> break;
</span><span class="cx"> case PROP_JAVASCRIPT_PROFILING_ENABLED:
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> g_value_set_boolean(value, priv->page->inspectorController().profilerEnabled());
</span><del>-#else
- g_message("PROP_JAVASCRIPT_PROFILING_ENABLED is not work because of the javascript debugger is disabled\n");
-#endif
</del><span class="cx"> break;
</span><span class="cx"> case PROP_TIMELINE_PROFILING_ENABLED:
</span><span class="cx"> g_message("PROP_TIMELINE_PROFILING_ENABLED has been deprecated\n");
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::startJavaScriptDebugging):
+ (WebKit::WebInspector::stopJavaScriptDebugging):
+ (WebKit::WebInspector::setJavaScriptProfilingEnabled):
+ (WebKit::WebInspector::startJavaScriptProfiling):
+ (WebKit::WebInspector::stopJavaScriptProfiling):
+
</ins><span class="cx"> 2014-01-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: Serialize IDBKeyDatas to disk, not IDBKeys
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -233,49 +233,39 @@
</span><span class="cx">
</span><span class="cx"> void WebInspector::startJavaScriptDebugging()
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_page->corePage()->inspectorController().show();
</span><span class="cx"> if (m_frontendClient)
</span><span class="cx"> m_frontendClient->setDebuggingEnabled(true);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::stopJavaScriptDebugging()
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_page->corePage()->inspectorController().show();
</span><span class="cx"> if (m_frontendClient)
</span><span class="cx"> m_frontendClient->setDebuggingEnabled(false);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::setJavaScriptProfilingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_page->corePage()->inspectorController().show();
</span><span class="cx"> if (!m_frontendClient)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_page->corePage()->inspectorController().setProfilerEnabled(enabled);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::startJavaScriptProfiling()
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_page->corePage()->inspectorController().show();
</span><span class="cx"> if (m_frontendClient)
</span><span class="cx"> m_frontendClient->startProfilingJavaScript();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::stopJavaScriptProfiling()
</span><span class="cx"> {
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
</del><span class="cx"> m_page->corePage()->inspectorController().show();
</span><span class="cx"> if (m_frontendClient)
</span><span class="cx"> m_frontendClient->stopProfilingJavaScript();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::startPageProfiling()
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_TIME "Toggle time type <input> support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_WEEK "Toggle week type <input> support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR "Toggle Web Inspector support" ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_JAVASCRIPT_DEBUGGER "Toggle JavaScript Debugger/Profiler support" ON)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VIEWPORT_ADAPTION "Toggle legacy viewport adaption" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Source/cmakeconfig.h.cmake 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_MONTH
</span><span class="cx"> #cmakedefine01 ENABLE_INPUT_TYPE_WEEK
</span><span class="cx"> #cmakedefine01 ENABLE_INSPECTOR
</span><del>-#cmakedefine01 ENABLE_JAVASCRIPT_DEBUGGER
</del><span class="cx"> #cmakedefine01 ENABLE_JIT
</span><span class="cx"> #cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
</span><span class="cx"> #cmakedefine01 ENABLE_LEGACY_VIEWPORT_ADAPTION
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Tools/ChangeLog 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
+ https://bugs.webkit.org/show_bug.cgi?id=127840
+
+ Reviewed by Mark Lam.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
</ins><span class="cx"> 2014-01-29 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Expose aria-describedby with ATK_RELATION_DESCRIBED_BY
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (163023 => 163024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-01-29 17:36:06 UTC (rev 163023)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-01-29 18:31:56 UTC (rev 163024)
</span><span class="lines">@@ -312,9 +312,6 @@
</span><span class="cx"> { option => "inspector", desc => "Toggle Inspector support",
</span><span class="cx"> define => "ENABLE_INSPECTOR", default => !isWinCE(), value => \$inspectorSupport },
</span><span class="cx">
</span><del>- { option => "javascript-debugger", desc => "Toggle JavaScript Debugger support",
- define => "ENABLE_JAVASCRIPT_DEBUGGER", default => 1, value => \$javascriptDebuggerSupport },
-
</del><span class="cx"> { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
</span><span class="cx"> define => "ENABLE_LEGACY_NOTIFICATIONS", default => 0, value => \$legacyNotificationsSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>