Changeset 163024 in webkit


Ignore:
Timestamp:
Jan 29, 2014 10:31:56 AM (10 years ago)
Author:
Csaba Osztrogonác
Message:

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:
Location:
trunk
Files:
56 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r162782 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * Source/cmake/WebKitFeatures.cmake:
     9        * Source/cmakeconfig.h.cmake:
     10
    1112014-01-25  Darin Adler  <darin@apple.com>
    212

  • trunk/Source/JavaScriptCore/ChangeLog

    r162998 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * inspector/scripts/CodeGeneratorInspector.py:
     9
    1102014-01-28  Commit Queue  <commit-queue@webkit.org>
    211

  • trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py

    r162158 r163024  
    4545DOMAIN_DEFINE_NAME_MAP = {
    4646    "Database": "SQL_DATABASE",
    47     "Debugger": "JAVASCRIPT_DEBUGGER",
    48     "DOMDebugger": "JAVASCRIPT_DEBUGGER",
    4947    "IndexedDB": "INDEXED_DATABASE",
    50     "Profiler": "JAVASCRIPT_DEBUGGER",
    5148}
    5249

  • trunk/Source/WTF/ChangeLog

    r162939 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * wtf/FeatureDefines.h:
     9
    1102014-01-28  Anders Carlsson  <andersca@apple.com>
    211

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r162795 r163024  
    575575#endif
    576576
    577 #if !defined(ENABLE_JAVASCRIPT_DEBUGGER)
    578 #define ENABLE_JAVASCRIPT_DEBUGGER 1
    579 #endif
    580 
    581577#if !defined(ENABLE_JAVASCRIPT_I18N_API)
    582578#define ENABLE_JAVASCRIPT_I18N_API 0

  • trunk/Source/WebCore/ChangeLog

    r163023 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * bindings/js/JSDOMWindowBase.cpp:
     9        (WebCore::JSDOMWindowBase::supportsProfiling):
     10        (WebCore::JSDOMWindowBase::supportsRichSourceInfo):
     11        * bindings/js/PageScriptDebugServer.cpp:
     12        * bindings/js/PageScriptDebugServer.h:
     13        * bindings/js/ScriptProfile.cpp:
     14        * bindings/js/ScriptProfile.h:
     15        * bindings/js/ScriptProfileNode.h:
     16        * bindings/js/ScriptProfiler.cpp:
     17        * bindings/js/ScriptProfiler.h:
     18        * bindings/js/WorkerScriptDebugServer.cpp:
     19        * bindings/js/WorkerScriptDebugServer.h:
     20        * inspector/InspectorConsoleAgent.h:
     21        * inspector/InspectorConsoleInstrumentation.h:
     22        (WebCore::InspectorInstrumentation::getCurrentUserInitiatedProfileName):
     23        * inspector/InspectorController.cpp:
     24        (WebCore::InspectorController::InspectorController):
     25        (WebCore::InspectorController::resume):
     26        * inspector/InspectorController.h:
     27        * inspector/InspectorDOMDebuggerAgent.cpp:
     28        * inspector/InspectorDOMDebuggerAgent.h:
     29        * inspector/InspectorHeapProfilerAgent.cpp:
     30        * inspector/InspectorHeapProfilerAgent.h:
     31        * inspector/InspectorInstrumentation.cpp:
     32        (WebCore::InspectorInstrumentation::didClearWindowObjectInWorldImpl):
     33        (WebCore::InspectorInstrumentation::isDebuggerPausedImpl):
     34        (WebCore::InspectorInstrumentation::willInsertDOMNodeImpl):
     35        (WebCore::InspectorInstrumentation::didInsertDOMNodeImpl):
     36        (WebCore::InspectorInstrumentation::willRemoveDOMNodeImpl):
     37        (WebCore::InspectorInstrumentation::didRemoveDOMNodeImpl):
     38        (WebCore::InspectorInstrumentation::willModifyDOMAttrImpl):
     39        (WebCore::InspectorInstrumentation::didInvalidateStyleAttrImpl):
     40        (WebCore::InspectorInstrumentation::willSendXMLHttpRequestImpl):
     41        (WebCore::InspectorInstrumentation::scriptExecutionBlockedByCSPImpl):
     42        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
     43        (WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
     44        (WebCore::InspectorInstrumentation::profilerEnabledImpl):
     45        (WebCore::InspectorInstrumentation::willEvaluateWorkerScript):
     46        (WebCore::InspectorInstrumentation::pauseOnNativeEventIfNeeded):
     47        (WebCore::InspectorInstrumentation::cancelPauseOnNativeEvent):
     48        * inspector/InspectorInstrumentation.h:
     49        * inspector/InspectorProfilerAgent.cpp:
     50        * inspector/InspectorProfilerAgent.h:
     51        * inspector/InstrumentingAgents.cpp:
     52        (WebCore::InstrumentingAgents::InstrumentingAgents):
     53        (WebCore::InstrumentingAgents::reset):
     54        * inspector/InstrumentingAgents.h:
     55        * inspector/PageDebuggerAgent.cpp:
     56        * inspector/PageDebuggerAgent.h:
     57        * inspector/ScriptProfile.idl:
     58        * inspector/ScriptProfileNode.idl:
     59        * inspector/WebDebuggerAgent.cpp:
     60        * inspector/WebDebuggerAgent.h:
     61        * inspector/WorkerDebuggerAgent.cpp:
     62        * inspector/WorkerDebuggerAgent.h:
     63        * inspector/WorkerInspectorController.cpp:
     64        (WebCore::WorkerInspectorController::WorkerInspectorController):
     65        (WebCore::WorkerInspectorController::resume):
     66        * inspector/WorkerInspectorController.h:
     67        * inspector/WorkerRuntimeAgent.cpp:
     68        (WebCore::WorkerRuntimeAgent::pauseWorkerGlobalScope):
     69        * inspector/WorkerRuntimeAgent.h:
     70        * loader/FrameLoader.cpp:
     71        (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
     72        * page/Console.cpp:
     73        * page/Console.h:
     74        * page/Console.idl:
     75        * testing/Internals.cpp:
     76        (WebCore::Internals::resetToConsistentState):
     77        * workers/WorkerMessagingProxy.cpp:
     78        (WebCore::connectToWorkerGlobalScopeInspectorTask):
     79        (WebCore::WorkerMessagingProxy::connectToInspector):
     80        (WebCore::disconnectFromWorkerGlobalScopeInspectorTask):
     81        (WebCore::WorkerMessagingProxy::disconnectFromInspector):
     82        (WebCore::dispatchOnInspectorBackendTask):
     83        (WebCore::WorkerMessagingProxy::sendMessageToInspector):
     84
    1852014-01-29  Eric Carlson  <eric.carlson@apple.com>
    286

  • trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

    r162264 r163024  
    104104bool JSDOMWindowBase::supportsProfiling(const JSGlobalObject* object)
    105105{
    106 #if !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR)
     106#if !ENABLE(INSPECTOR)
    107107    UNUSED_PARAM(object);
    108108    return false;
    … …  
    127127bool JSDOMWindowBase::supportsRichSourceInfo(const JSGlobalObject* object)
    128128{
    129 #if !ENABLE(JAVASCRIPT_DEBUGGER) || !ENABLE(INSPECTOR)
     129#if !ENABLE(INSPECTOR)
    130130    UNUSED_PARAM(object);
    131131    return false;

  • trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp

    r162757 r163024  
    3333#include "PageScriptDebugServer.h"
    3434
    35 #if ENABLE(JAVASCRIPT_DEBUGGER)
    36 
    3735#include "Document.h"
    3836#include "EventLoop.h"
    … …  
    274272
    275273} // namespace WebCore
    276 
    277 #endif // ENABLE(JAVASCRIPT_DEBUGGER)

  • trunk/Source/WebCore/bindings/js/PageScriptDebugServer.h

    r162757 r163024  
    3131#ifndef PageScriptDebugServer_h
    3232#define PageScriptDebugServer_h
    33 
    34 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3533
    3634#include <inspector/ScriptDebugServer.h>
    … …  
    8280} // namespace WebCore
    8381
    84 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    85 
    8682#endif // PageScriptDebugServer_h

  • trunk/Source/WebCore/bindings/js/ScriptProfile.cpp

    r162796 r163024  
    2626
    2727#include "config.h"
    28 
    29 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3028
    3129#include "ScriptProfile.h"
    … …  
    108106
    109107} // namespace WebCore
    110 
    111 #endif // ENABLE(JAVASCRIPT_DEBUGGER)

  • trunk/Source/WebCore/bindings/js/ScriptProfile.h

    r160457 r163024  
    2828#define ScriptProfile_h
    2929
    30 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3130#include "ScriptProfileNode.h"
    3231#include <wtf/Forward.h>
    … …  
    6968} // namespace WebCore
    7069
    71 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    72 
    7370#endif // ScriptProfile_h

  • trunk/Source/WebCore/bindings/js/ScriptProfileNode.h

    r95901 r163024  
    2828#define ScriptProfileNode_h
    2929
    30 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3130#include <profiler/ProfileNode.h>
    3231
    … …  
    3736} // namespace WebCore
    3837
    39 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    40 
    4138#endif // ScriptProfileNode_h

  • trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp

    r160457 r163024  
    2626
    2727#include "config.h"
    28 
    29 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3028
    3129#include "ScriptProfiler.h"
    … …  
    9391
    9492} // namespace WebCore
    95 
    96 #endif // ENABLE(JAVASCRIPT_DEBUGGER)

  • trunk/Source/WebCore/bindings/js/ScriptProfiler.h

    r161691 r163024  
    2727#ifndef ScriptProfiler_h
    2828#define ScriptProfiler_h
    29 
    30 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3129
    3230#include "ScriptHeapSnapshot.h"
    … …  
    7573} // namespace WebCore
    7674
    77 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    78 
    7975#endif // ScriptProfiler_h

  • trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp

    r162757 r163024  
    3232#include "config.h"
    3333#include "WorkerScriptDebugServer.h"
    34 
    35 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3634
    3735#include "JSDOMBinding.h"
    … …  
    112110
    113111} // namespace WebCore
    114 
    115 #endif // ENABLE(JAVASCRIPT_DEBUGGER)

  • trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h

    r162757 r163024  
    3131#ifndef WorkerScriptDebugServer_h
    3232#define WorkerScriptDebugServer_h
    33 
    34 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3533
    3634#include <inspector/ScriptDebugServer.h>
    … …  
    6866} // namespace WebCore
    6967
    70 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    71 
    7268#endif // WorkerScriptDebugServer_h

  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.h

    r162676 r163024  
    8686    void didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse&);
    8787    void didFailLoading(unsigned long requestIdentifier, const ResourceError&);
    88 #if ENABLE(JAVASCRIPT_DEBUGGER)
    8988    void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
    9089    void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
    91 #endif
    9290    virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override;
    9391    virtual void addInspectedNode(ErrorString*, int nodeId) = 0;

  • trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h

    r159679 r163024  
    174174}
    175175
    176 #if ENABLE(JAVASCRIPT_DEBUGGER)
    177176inline void InspectorInstrumentation::addStartProfilingMessageToConsole(Page* page, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
    178177{
    … …  
    223222    return "";
    224223}
    225 #endif
    226224
    227225} // namespace WebCore

  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r162799 r163024  
    146146    m_agents.append(std::move(consoleAgentPtr));
    147147
    148 #if ENABLE(JAVASCRIPT_DEBUGGER)
    149148    auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), pageAgent, m_overlay.get());
    150149    m_debuggerAgent = debuggerAgentPtr.get();
    … …  
    160159
    161160    m_agents.append(std::make_unique<InspectorHeapProfilerAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get()));
    162 #endif
    163161
    164162    m_agents.append(std::make_unique<InspectorWorkerAgent>(m_instrumentingAgents.get()));
    … …  
    184182    }
    185183
    186 #if ENABLE(JAVASCRIPT_DEBUGGER)
    187184    runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
    188 #endif
    189185}
    190186
    … …  
    391387}
    392388
    393 #if ENABLE(JAVASCRIPT_DEBUGGER)
    394389bool InspectorController::profilerEnabled() const
    395390{
    … …  
    413408    }
    414409}
    415 #endif
    416410
    417411void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)

  • trunk/Source/WebCore/inspector/InspectorController.h

    r162799 r163024  
    120120    void evaluateForTestInFrontend(long callId, const String& script);
    121121
    122 #if ENABLE(JAVASCRIPT_DEBUGGER)
    123122    bool profilerEnabled() const;
    124123    void setProfilerEnabled(bool);
    125124
    126125    void resume();
    127 #endif
    128126
    129127    void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
    … …  
    156154    InspectorPageAgent* m_pageAgent;
    157155    InspectorMemoryAgent* m_memoryAgent;
    158 #if ENABLE(JAVASCRIPT_DEBUGGER)
    159156    Inspector::InspectorDebuggerAgent* m_debuggerAgent;
    160157    InspectorDOMDebuggerAgent* m_domDebuggerAgent;
    161158    InspectorProfilerAgent* m_profilerAgent;
    162 #endif
    163159
    164160    RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;

  • trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp

    r162799 r163024  
    3232#include "InspectorDOMDebuggerAgent.h"
    3333
    34 #if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "HTMLElement.h"
    … …  
    427427} // namespace WebCore
    428428
    429 #endif // ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
     429#endif // ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h

    r162799 r163024  
    3232#define InspectorDOMDebuggerAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "InspectorWebAgentBase.h"
    … …  
    114114} // namespace WebCore
    115115
    116 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     116#endif // ENABLE(INSPECTOR)
    117117
    118118#endif // !defined(InspectorDOMDebuggerAgent_h)

  • trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp

    r162676 r163024  
    3232#include "InspectorHeapProfilerAgent.h"
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "CommandLineAPIHost.h"
    … …  
    231231} // namespace WebCore
    232232
    233 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     233#endif // ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h

    r162676 r163024  
    3232#define InspectorHeapProfilerAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "InspectorWebAgentBase.h"
    … …  
    9292} // namespace WebCore
    9393
    94 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     94#endif // ENABLE(INSPECTOR)
    9595
    9696#endif // !defined(InspectorHeapProfilerAgent_h)

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r162799 r163024  
    109109    if (pageAgent)
    110110        pageAgent->didClearWindowObjectInWorld(frame, world);
    111 #if ENABLE(JAVASCRIPT_DEBUGGER)
    112111    if (PageDebuggerAgent* debuggerAgent = instrumentingAgents->pageDebuggerAgent()) {
    113112        if (pageAgent && &world == &mainThreadNormalWorld() && frame == pageAgent->mainFrame())
    114113            debuggerAgent->didClearMainFrameWindowObject();
    115114    }
    116 #endif
    117115    if (PageRuntimeAgent* pageRuntimeAgent = instrumentingAgents->pageRuntimeAgent()) {
    118116        if (&world == &mainThreadNormalWorld())
    … …  
    123121bool InspectorInstrumentation::isDebuggerPausedImpl(InstrumentingAgents* instrumentingAgents)
    124122{
    125 #if ENABLE(JAVASCRIPT_DEBUGGER)
    126123    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
    127124        return debuggerAgent->isPaused();
    128 #endif
    129125    return false;
    130126}
    … …  
    132128void InspectorInstrumentation::willInsertDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* parent)
    133129{
    134 #if ENABLE(JAVASCRIPT_DEBUGGER)
    135130    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    136131        domDebuggerAgent->willInsertDOMNode(parent);
    137 #endif
    138132}
    139133
    … …  
    142136    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
    143137        domAgent->didInsertDOMNode(node);
    144 #if ENABLE(JAVASCRIPT_DEBUGGER)
    145138    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    146139        domDebuggerAgent->didInsertDOMNode(node);
    147 #endif
    148140}
    149141
    150142void InspectorInstrumentation::willRemoveDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* node)
    151143{
    152 #if ENABLE(JAVASCRIPT_DEBUGGER)
    153144    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    154145        domDebuggerAgent->willRemoveDOMNode(node);
    155 #endif
    156146}
    157147
    158148void InspectorInstrumentation::didRemoveDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* node)
    159149{
    160 #if ENABLE(JAVASCRIPT_DEBUGGER)
    161150    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    162151        domDebuggerAgent->didRemoveDOMNode(node);
    163 #endif
    164152    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
    165153        domAgent->didRemoveDOMNode(node);
    … …  
    168156void InspectorInstrumentation::willModifyDOMAttrImpl(InstrumentingAgents* instrumentingAgents, Element* element, const AtomicString& oldValue, const AtomicString& newValue)
    169157{
    170 #if ENABLE(JAVASCRIPT_DEBUGGER)
    171158    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    172159        domDebuggerAgent->willModifyDOMAttr(element);
    173160    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
    174161        domAgent->willModifyDOMAttr(element, oldValue, newValue);
    175 #endif
    176162}
    177163
    … …  
    192178    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
    193179        domAgent->didInvalidateStyleAttr(node);
    194 #if ENABLE(JAVASCRIPT_DEBUGGER)
    195180    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    196181        domDebuggerAgent->didInvalidateStyleAttr(node);
    197 #endif
    198182}
    199183
    … …  
    299283void InspectorInstrumentation::willSendXMLHttpRequestImpl(InstrumentingAgents* instrumentingAgents, const String& url)
    300284{
    301 #if ENABLE(JAVASCRIPT_DEBUGGER)
    302285    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    303286        domDebuggerAgent->willSendXMLHttpRequest(url);
    304 #endif
    305287}
    306288
    … …  
    720702void InspectorInstrumentation::scriptExecutionBlockedByCSPImpl(InstrumentingAgents* instrumentingAgents, const String& directiveText)
    721703{
    722 #if ENABLE(JAVASCRIPT_DEBUGGER)
    723704    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
    724705        debuggerAgent->scriptExecutionBlockedByCSP(directiveText);
    725 #endif
    726706}
    727707
    … …  
    778758        if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
    779759            resourceAgent->mainFrameNavigated(loader);
    780 #if ENABLE(JAVASCRIPT_DEBUGGER)
    781760        if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
    782761            profilerAgent->resetState();
    783762        if (InspectorHeapProfilerAgent* heapProfilerAgent = instrumentingAgents->inspectorHeapProfilerAgent())
    784763            heapProfilerAgent->resetState();
    785 #endif
    786764        if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
    787765            cssAgent->reset();
    … …  
    895873    if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
    896874        consoleAgent->addMessageToConsole(source, type, level, message, callStack, requestIdentifier);
    897 #if ENABLE(JAVASCRIPT_DEBUGGER)
    898875    // FIXME: This should just pass the message on to the debugger agent. JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
    899876    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
    … …  
    901878            debuggerAgent->handleConsoleAssert();
    902879    }
    903 #endif
    904880}
    905881
    … …  
    908884    if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
    909885        consoleAgent->addMessageToConsole(source, type, level, message, state, arguments, requestIdentifier);
    910 #if ENABLE(JAVASCRIPT_DEBUGGER)
    911886    // FIXME: This should just pass the message on to the debugger agent. JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
    912887    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
    … …  
    914889            debuggerAgent->handleConsoleAssert();
    915890    }
    916 #endif
    917891}
    918892
    … …  
    954928}
    955929
    956 #if ENABLE(JAVASCRIPT_DEBUGGER)
    957930void InspectorInstrumentation::addStartProfilingMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
    958931{
    … …  
    982955    return false;
    983956}
    984 #endif
    985957
    986958#if ENABLE(SQL_DATABASE)
    … …  
    1020992    if (!instrumentingAgents)
    1021993        return;
    1022 #if ENABLE(JAVASCRIPT_DEBUGGER)
    1023994    if (WorkerRuntimeAgent* runtimeAgent = instrumentingAgents->workerRuntimeAgent())
    1024995        runtimeAgent->pauseWorkerGlobalScope(workerGlobalScope);
    1025 #endif
    1026996}
    1027997
    … …  
    11171087void InspectorInstrumentation::pauseOnNativeEventIfNeeded(InstrumentingAgents* instrumentingAgents, bool isDOMEvent, const String& eventName, bool synchronous)
    11181088{
    1119 #if ENABLE(JAVASCRIPT_DEBUGGER)
    11201089    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
    11211090        domDebuggerAgent->pauseOnNativeEventIfNeeded(isDOMEvent, eventName, synchronous);
    1122 #endif
    11231091}
    11241092
    11251093void InspectorInstrumentation::cancelPauseOnNativeEvent(InstrumentingAgents* instrumentingAgents)
    11261094{
    1127 #if ENABLE(JAVASCRIPT_DEBUGGER)
    11281095    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
    11291096        debuggerAgent->cancelPauseOnNextStatement();
    1130 #endif
    11311097}
    11321098

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r162374 r163024  
    222222    static void didFireAnimationFrame(const InspectorInstrumentationCookie&);
    223223
    224 #if ENABLE(JAVASCRIPT_DEBUGGER)
    225224    static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
    226225    static void addProfile(Page*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
    227226    static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber);
    228227    static bool profilerEnabled(Page*);
    229 #endif
    230228
    231229#if ENABLE(SQL_DATABASE)
    … …  
    406404    static void didFireAnimationFrameImpl(const InspectorInstrumentationCookie&);
    407405
    408 #if ENABLE(JAVASCRIPT_DEBUGGER)
    409406    static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
    410407    static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);
    411408    static String getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents*, bool incrementProfileNumber);
    412409    static bool profilerEnabledImpl(InstrumentingAgents*);
    413 #endif
    414410
    415411#if ENABLE(SQL_DATABASE)

  • trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp

    r162676 r163024  
    3030#include "config.h"
    3131
    32 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     32#if ENABLE(INSPECTOR)
    3333
    3434#include "InspectorProfilerAgent.h"
    … …  
    456456} // namespace WebCore
    457457
    458 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     458#endif // ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/InspectorProfilerAgent.h

    r162676 r163024  
    3131#define InspectorProfilerAgent_h
    3232
    33 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     33#if ENABLE(INSPECTOR)
    3434
    3535#include "InspectorWebAgentBase.h"
    … …  
    135135} // namespace WebCore
    136136
    137 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     137#endif // ENABLE(INSPECTOR)
    138138
    139139#endif // !defined(InspectorProfilerAgent_h)

  • trunk/Source/WebCore/inspector/InstrumentingAgents.cpp

    r162374 r163024  
    6363#endif
    6464    , m_inspectorApplicationCacheAgent(nullptr)
    65 #if ENABLE(JAVASCRIPT_DEBUGGER)
    6665    , m_inspectorDebuggerAgent(nullptr)
    6766    , m_pageDebuggerAgent(nullptr)
    6867    , m_inspectorDOMDebuggerAgent(nullptr)
    6968    , m_inspectorProfilerAgent(nullptr)
    70 #endif
    7169    , m_inspectorWorkerAgent(nullptr)
    7270    , m_inspectorCanvasAgent(nullptr)
    … …  
    9391#endif
    9492    m_inspectorApplicationCacheAgent = nullptr;
    95 #if ENABLE(JAVASCRIPT_DEBUGGER)
    9693    m_inspectorDebuggerAgent = nullptr;
    9794    m_pageDebuggerAgent = nullptr;
    9895    m_inspectorDOMDebuggerAgent = nullptr;
    9996    m_inspectorProfilerAgent = nullptr;
    100 #endif
    10197    m_inspectorWorkerAgent = nullptr;
    10298    m_inspectorCanvasAgent = nullptr;

  • trunk/Source/WebCore/inspector/InstrumentingAgents.h

    r162799 r163024  
    117117    void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
    118118
    119 #if ENABLE(JAVASCRIPT_DEBUGGER)
    120119    Inspector::InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
    121120    void setInspectorDebuggerAgent(Inspector::InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
    … …  
    132131    InspectorHeapProfilerAgent* inspectorHeapProfilerAgent() const { return m_inspectorHeapProfilerAgent; }
    133132    void setInspectorHeapProfilerAgent(InspectorHeapProfilerAgent* agent) { m_inspectorHeapProfilerAgent = agent; }
    134 #endif
    135133
    136134    InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
    … …  
    167165#endif
    168166    InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
    169 #if ENABLE(JAVASCRIPT_DEBUGGER)
    170167    Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent;
    171168    PageDebuggerAgent* m_pageDebuggerAgent;
    … …  
    173170    InspectorProfilerAgent* m_inspectorProfilerAgent;
    174171    InspectorHeapProfilerAgent* m_inspectorHeapProfilerAgent;
    175 #endif
    176172    InspectorWorkerAgent* m_inspectorWorkerAgent;
    177173    InspectorCanvasAgent* m_inspectorCanvasAgent;

  • trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp

    r162799 r163024  
    3232#include "PageDebuggerAgent.h"
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "CachedResource.h"
    … …  
    145145} // namespace WebCore
    146146
    147 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     147#endif // ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/PageDebuggerAgent.h

    r162799 r163024  
    3232#define PageDebuggerAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "PageScriptDebugServer.h"
    … …  
    7878} // namespace WebCore
    7979
    80 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     80#endif // ENABLE(INSPECTOR)
    8181
    8282#endif // !defined(PageDebuggerAgent_h)

  • trunk/Source/WebCore/inspector/ScriptProfile.idl

    r151207 r163024  
    2727[
    2828    NoInterfaceObject,
    29     Conditional=JAVASCRIPT_DEBUGGER,
    3029] interface ScriptProfile {
    3130    readonly attribute DOMString title;

  • trunk/Source/WebCore/inspector/ScriptProfileNode.idl

    r162796 r163024  
    2727[
    2828    NoInterfaceObject,
    29     Conditional=JAVASCRIPT_DEBUGGER,
    3029    ImplementationLacksVTable
    3130] interface ScriptProfileNode {

  • trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp

    r162799 r163024  
    2828
    2929#if ENABLE(INSPECTOR)
    30 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3130
    3231#include "InstrumentingAgents.h"
    … …  
    5655} // namespace WebCore
    5756
    58 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    5957#endif // ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/WebDebuggerAgent.h

    r162799 r163024  
    2828
    2929#if ENABLE(INSPECTOR)
    30 #if ENABLE(JAVASCRIPT_DEBUGGER)
    3130
    3231#include <inspector/agents/InspectorDebuggerAgent.h>
    … …  
    5352} // namespace WebCore
    5453
    55 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    5654#endif // ENABLE(INSPECTOR)
    5755

  • trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp

    r162799 r163024  
    3232#include "WorkerDebuggerAgent.h"
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "WorkerGlobalScope.h"
    … …  
    161161} // namespace WebCore
    162162
    163 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     163#endif // ENABLE(INSPECTOR)

  • trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h

    r162799 r163024  
    3232#define WorkerDebuggerAgent_h
    3333
    34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     34#if ENABLE(INSPECTOR)
    3535
    3636#include "WebDebuggerAgent.h"
    … …  
    6868} // namespace WebCore
    6969
    70 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     70#endif // ENABLE(INSPECTOR)
    7171
    7272#endif // !defined(WorkerDebuggerAgent_h)

  • trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

    r162799 r163024  
    9292
    9393    auto consoleAgent = std::make_unique<WorkerConsoleAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get());
    94 #if ENABLE(JAVASCRIPT_DEBUGGER)
    9594    auto debuggerAgent = std::make_unique<WorkerDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), &workerGlobalScope);
    9695    m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
    … …  
    9998    m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), &workerGlobalScope, m_injectedScriptManager.get()));
    10099    m_agents.append(std::make_unique<InspectorHeapProfilerAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get()));
    101 #endif
    102100    m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));
    103101    m_agents.append(std::move(consoleAgent));
    … …  
    146144}
    147145
    148 #if ENABLE(JAVASCRIPT_DEBUGGER)
    149146void WorkerInspectorController::resume()
    150147{
    … …  
    152149    m_runtimeAgent->run(&unused);
    153150}
    154 #endif
    155151
    156152InspectorFunctionCallHandler WorkerInspectorController::functionCallHandler() const

  • trunk/Source/WebCore/inspector/WorkerInspectorController.h

    r162767 r163024  
    6666    void disconnectFrontend(Inspector::InspectorDisconnectReason);
    6767    void dispatchMessageFromFrontend(const String&);
    68 #if ENABLE(JAVASCRIPT_DEBUGGER)
    6968    void resume();
    70 #endif
    7169
    7270    virtual bool developerExtrasEnabled() const override { return true; }

  • trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp

    r162767 r163024  
    9696}
    9797
    98 #if ENABLE(JAVASCRIPT_DEBUGGER)
    9998void WorkerRuntimeAgent::pauseWorkerGlobalScope(WorkerGlobalScope* context)
    10099{
    … …  
    106105    } while (result == MessageQueueMessageReceived && m_paused);
    107106}
    108 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
    109107
    110108} // namespace WebCore

  • trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h

    r162767 r163024  
    5252    virtual void run(ErrorString*) override;
    5353
    54 #if ENABLE(JAVASCRIPT_DEBUGGER)
    5554    void pauseWorkerGlobalScope(WorkerGlobalScope*);
    56 #endif
    5755
    5856private:

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r162837 r163024  
    29492949        return;
    29502950
    2951 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     2951#if ENABLE(INSPECTOR)
    29522952    if (Page* page = m_frame.page()) {
    29532953        if (m_frame.isMainFrame())

  • trunk/Source/WebCore/page/Console.cpp

    r161700 r163024  
    187187}
    188188
    189 #if ENABLE(JAVASCRIPT_DEBUGGER)
    190 
    191189void Console::profile(JSC::ExecState* state, const String& title)
    192190{
    … …  
    228226}
    229227
    230 #endif
    231 
    232228void Console::time(const String& title)
    233229{

  • trunk/Source/WebCore/page/Console.h

    r157653 r163024  
    4444class ScriptArguments;
    4545
    46 #if ENABLE(JAVASCRIPT_DEBUGGER)
    4746typedef Vector<RefPtr<ScriptProfile>> ProfilesArray;
    48 #endif
    4947
    5048class Console : public ScriptWrappable, public RefCounted<Console>, public DOMWindowProperty {
    … …  
    6563    void assertCondition(JSC::ExecState*, PassRefPtr<ScriptArguments>, bool condition);
    6664    void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
    67 #if ENABLE(JAVASCRIPT_DEBUGGER)
    6865    const ProfilesArray& profiles() const { return m_profiles; }
    6966    void profile(JSC::ExecState*, const String& = String());
    7067    void profileEnd(JSC::ExecState*, const String& = String());
    71 #endif
    7268    void time(const String&);
    7369    void timeEnd(JSC::ExecState*, const String&);
    … …  
    8278    explicit Console(Frame*);
    8379
    84 #if ENABLE(JAVASCRIPT_DEBUGGER)
    8580    ProfilesArray m_profiles;
    86 #endif
    8781};
    8882

  • trunk/Source/WebCore/page/Console.idl

    r159061 r163024  
    4747    // "Sequences must not be used as the type of an attribute, constant or exception field."
    4848    // FIXME: this will lead to BUG console.profiles !== console.profiles as profile will always returns new array.
    49     [Conditional=JAVASCRIPT_DEBUGGER] readonly attribute ScriptProfile[] profiles;
    50     [Conditional=JAVASCRIPT_DEBUGGER, CallWith=ScriptState] void profile([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
    51     [Conditional=JAVASCRIPT_DEBUGGER, CallWith=ScriptState] void profileEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
     49    readonly attribute ScriptProfile[] profiles;
     50    [CallWith=ScriptState] void profile([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
     51    [CallWith=ScriptState] void profileEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString title);
    5252
    5353    void time([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);

  • trunk/Source/WebCore/testing/Internals.cpp

    r162816 r163024  
    278278    WebCore::overrideUserPreferredLanguages(Vector<String>());
    279279    WebCore::Settings::setUsesOverlayScrollbars(false);
    280 #if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
     280#if ENABLE(INSPECTOR)
    281281    page->inspectorController().setProfilerEnabled(false);
    282282#endif

  • trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp

    r162676 r163024  
    407407
    408408#if ENABLE(INSPECTOR)
    409 #if ENABLE(JAVASCRIPT_DEBUGGER)
    410409static void connectToWorkerGlobalScopeInspectorTask(ScriptExecutionContext* context, bool)
    411410{
    … …  
    413412    static_cast<WorkerGlobalScope*>(context)->workerInspectorController().connectFrontend();
    414413}
    415 #endif
    416414
    417415void WorkerMessagingProxy::connectToInspector(WorkerGlobalScopeProxy::PageInspector* pageInspector)
    … …  
    421419    ASSERT(!m_pageInspector);
    422420    m_pageInspector = pageInspector;
    423 #if ENABLE(JAVASCRIPT_DEBUGGER)
    424421    m_workerThread->runLoop().postTaskForMode(createCallbackTask(connectToWorkerGlobalScopeInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
    425 #endif
    426 }
    427 
    428 #if ENABLE(JAVASCRIPT_DEBUGGER)
     422}
     423
    429424static void disconnectFromWorkerGlobalScopeInspectorTask(ScriptExecutionContext* context, bool)
    430425{
    … …  
    432427    static_cast<WorkerGlobalScope*>(context)->workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
    433428}
    434 #endif
    435429
    436430void WorkerMessagingProxy::disconnectFromInspector()
    … …  
    439433    if (m_askedToTerminate)
    440434        return;
    441 #if ENABLE(JAVASCRIPT_DEBUGGER)
    442435    m_workerThread->runLoop().postTaskForMode(createCallbackTask(disconnectFromWorkerGlobalScopeInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
    443 #endif
    444 }
    445 
    446 #if ENABLE(JAVASCRIPT_DEBUGGER)
     436}
     437
    447438static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
    448439{
    … …  
    450441    static_cast<WorkerGlobalScope*>(context)->workerInspectorController().dispatchMessageFromFrontend(message);
    451442}
    452 #endif
    453443
    454444void WorkerMessagingProxy::sendMessageToInspector(const String& message)
    … …  
    456446    if (m_askedToTerminate)
    457447        return;
    458 #if ENABLE(JAVASCRIPT_DEBUGGER)
    459448    m_workerThread->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), WorkerDebuggerAgent::debuggerTaskMode);
    460449    WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.get());
    461 #endif
    462450}
    463451#endif

  • trunk/Source/WebKit/gtk/ChangeLog

    r162920 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * webkit/webkitwebinspector.cpp:
     9        (webkit_web_inspector_set_property):
     10        (webkit_web_inspector_get_property):
     11
    1122014-01-27  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebKit/gtk/webkit/webkitwebinspector.cpp

    r162264 r163024  
    352352    switch(prop_id) {
    353353    case PROP_JAVASCRIPT_PROFILING_ENABLED: {
    354 #if ENABLE(JAVASCRIPT_DEBUGGER)
    355354        bool enabled = g_value_get_boolean(value);
    356355        priv->page->inspectorController().setProfilerEnabled(enabled);
    357 #else
    358         g_message("PROP_JAVASCRIPT_PROFILING_ENABLED is not work because of the javascript debugger is disabled\n");
    359 #endif
    360356        break;
    361357    }
    … …  
    383379        break;
    384380    case PROP_JAVASCRIPT_PROFILING_ENABLED:
    385 #if ENABLE(JAVASCRIPT_DEBUGGER)
    386381        g_value_set_boolean(value, priv->page->inspectorController().profilerEnabled());
    387 #else
    388         g_message("PROP_JAVASCRIPT_PROFILING_ENABLED is not work because of the javascript debugger is disabled\n");
    389 #endif
    390382        break;
    391383    case PROP_TIMELINE_PROFILING_ENABLED:

  • trunk/Source/WebKit2/ChangeLog

    r163020 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * WebProcess/WebPage/WebInspector.cpp:
     9        (WebKit::WebInspector::startJavaScriptDebugging):
     10        (WebKit::WebInspector::stopJavaScriptDebugging):
     11        (WebKit::WebInspector::setJavaScriptProfilingEnabled):
     12        (WebKit::WebInspector::startJavaScriptProfiling):
     13        (WebKit::WebInspector::stopJavaScriptProfiling):
     14
    1152014-01-29  Brady Eidson  <beidson@apple.com>
    216

  • trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp

    r162676 r163024  
    234234void WebInspector::startJavaScriptDebugging()
    235235{
    236 #if ENABLE(JAVASCRIPT_DEBUGGER)
    237236    m_page->corePage()->inspectorController().show();
    238237    if (m_frontendClient)
    239238        m_frontendClient->setDebuggingEnabled(true);
    240 #endif
    241239}
    242240
    243241void WebInspector::stopJavaScriptDebugging()
    244242{
    245 #if ENABLE(JAVASCRIPT_DEBUGGER)
    246243    m_page->corePage()->inspectorController().show();
    247244    if (m_frontendClient)
    248245        m_frontendClient->setDebuggingEnabled(false);
    249 #endif
    250246}
    251247
    252248void WebInspector::setJavaScriptProfilingEnabled(bool enabled)
    253249{
    254 #if ENABLE(JAVASCRIPT_DEBUGGER)
    255250    m_page->corePage()->inspectorController().show();
    256251    if (!m_frontendClient)
    … …  
    258253
    259254    m_page->corePage()->inspectorController().setProfilerEnabled(enabled);
    260 #endif
    261255}
    262256
    263257void WebInspector::startJavaScriptProfiling()
    264258{
    265 #if ENABLE(JAVASCRIPT_DEBUGGER)
    266259    m_page->corePage()->inspectorController().show();
    267260    if (m_frontendClient)
    268261        m_frontendClient->startProfilingJavaScript();
    269 #endif
    270262}
    271263
    272264void WebInspector::stopJavaScriptProfiling()
    273265{
    274 #if ENABLE(JAVASCRIPT_DEBUGGER)
    275266    m_page->corePage()->inspectorController().show();
    276267    if (m_frontendClient)
    277268        m_frontendClient->stopProfilingJavaScript();
    278 #endif
    279269}
    280270

  • trunk/Source/cmake/WebKitFeatures.cmake

    r162644 r163024  
    7070    WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_WEEK "Toggle week type <input> support" OFF)
    7171    WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR "Toggle Web Inspector support" ON)
    72     WEBKIT_OPTION_DEFINE(ENABLE_JAVASCRIPT_DEBUGGER "Toggle JavaScript Debugger/Profiler support" ON)
    7372    WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" ON)
    7473    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" OFF)

  • trunk/Source/cmakeconfig.h.cmake

    r162644 r163024  
    6161#cmakedefine01 ENABLE_INPUT_TYPE_WEEK
    6262#cmakedefine01 ENABLE_INSPECTOR
    63 #cmakedefine01 ENABLE_JAVASCRIPT_DEBUGGER
    6463#cmakedefine01 ENABLE_JIT
    6564#cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS

  • trunk/Tools/ChangeLog

    r163014 r163024  
     12014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Remove ENABLE(JAVASCRIPT_DEBUGGER) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=127840
     5
     6        Reviewed by Mark Lam.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9
    1102014-01-29  Krzysztof Czech  <k.czech@samsung.com>
    211

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r162579 r163024  
    313313      define => "ENABLE_INSPECTOR", default => !isWinCE(), value => \$inspectorSupport },
    314314
    315     { option => "javascript-debugger", desc => "Toggle JavaScript Debugger support",
    316       define => "ENABLE_JAVASCRIPT_DEBUGGER", default => 1, value => \$javascriptDebuggerSupport },
    317 
    318315    { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
    319316      define => "ENABLE_LEGACY_NOTIFICATIONS", default => 0, value => \$legacyNotificationsSupport },
Note: See TracChangeset for help on using the changeset viewer.