Changeset 80350 in webkit


Ignore:
Timestamp:
Mar 4, 2011 7:15:45 AM (13 years ago)
Author:
yurys@chromium.org
Message:

2011-03-04 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: move dispatching of didCommitLoad to agents into InspectorInstrumentation
​https://bugs.webkit.org/show_bug.cgi?id=55770

  • inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::InspectorAgent): (WebCore::InspectorAgent::didCommitLoad):
  • inspector/InspectorCSSAgent.cpp: (WebCore::InspectorCSSAgent::InspectorCSSAgent): (WebCore::InspectorCSSAgent::~InspectorCSSAgent):
  • inspector/InspectorCSSAgent.h:
  • inspector/InspectorDatabaseAgent.cpp: (WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
  • inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::didCommitLoadImpl):
  • inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::didCommitLoad):
  • inspector/InspectorProfilerAgent.cpp: (WebCore::InspectorProfilerAgent::create): (WebCore::InspectorProfilerAgent::InspectorProfilerAgent): (WebCore::InspectorProfilerAgent::~InspectorProfilerAgent): (WebCore::InspectorProfilerAgent::addProfileFinishedMessageToConsole): (WebCore::InspectorProfilerAgent::addStartProfilingMessageToConsole): (WebCore::InspectorProfilerAgent::startUserInitiatedProfiling): (WebCore::InspectorProfilerAgent::stopUserInitiatedProfiling):
  • inspector/InspectorProfilerAgent.h:
  • inspector/InstrumentingAgents.h: (WebCore::InstrumentingAgents::InstrumentingAgents): (WebCore::InstrumentingAgents::inspectorCSSAgent): (WebCore::InstrumentingAgents::setInspectorCSSAgent): (WebCore::InstrumentingAgents::inspectorDOMStorageAgent): (WebCore::InstrumentingAgents::setInspectorDOMStorageAgent): (WebCore::InstrumentingAgents::inspectorDatabaseAgent): (WebCore::InstrumentingAgents::setInspectorDatabaseAgent): (WebCore::InstrumentingAgents::inspectorApplicationCacheAgent): (WebCore::InstrumentingAgents::setInspectorApplicationCacheAgent): (WebCore::InstrumentingAgents::inspectorDebuggerAgent): (WebCore::InstrumentingAgents::setInspectorDebuggerAgent): (WebCore::InstrumentingAgents::inspectorBrowserDebuggerAgent): (WebCore::InstrumentingAgents::setInspectorBrowserDebuggerAgent): (WebCore::InstrumentingAgents::inspectorProfilerAgent): (WebCore::InstrumentingAgents::setInspectorProfilerAgent):
Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r80349 r80350  
     12011-03-04  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: move dispatching of didCommitLoad to agents into InspectorInstrumentation
     6        https://bugs.webkit.org/show_bug.cgi?id=55770
     7
     8        * inspector/InspectorAgent.cpp:
     9        (WebCore::InspectorAgent::InspectorAgent):
     10        (WebCore::InspectorAgent::didCommitLoad):
     11        * inspector/InspectorCSSAgent.cpp:
     12        (WebCore::InspectorCSSAgent::InspectorCSSAgent):
     13        (WebCore::InspectorCSSAgent::~InspectorCSSAgent):
     14        * inspector/InspectorCSSAgent.h:
     15        * inspector/InspectorDatabaseAgent.cpp:
     16        (WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
     17        * inspector/InspectorInstrumentation.cpp:
     18        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
     19        * inspector/InspectorInstrumentation.h:
     20        (WebCore::InspectorInstrumentation::didCommitLoad):
     21        * inspector/InspectorProfilerAgent.cpp:
     22        (WebCore::InspectorProfilerAgent::create):
     23        (WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
     24        (WebCore::InspectorProfilerAgent::~InspectorProfilerAgent):
     25        (WebCore::InspectorProfilerAgent::addProfileFinishedMessageToConsole):
     26        (WebCore::InspectorProfilerAgent::addStartProfilingMessageToConsole):
     27        (WebCore::InspectorProfilerAgent::startUserInitiatedProfiling):
     28        (WebCore::InspectorProfilerAgent::stopUserInitiatedProfiling):
     29        * inspector/InspectorProfilerAgent.h:
     30        * inspector/InstrumentingAgents.h:
     31        (WebCore::InstrumentingAgents::InstrumentingAgents):
     32        (WebCore::InstrumentingAgents::inspectorCSSAgent):
     33        (WebCore::InstrumentingAgents::setInspectorCSSAgent):
     34        (WebCore::InstrumentingAgents::inspectorDOMStorageAgent):
     35        (WebCore::InstrumentingAgents::setInspectorDOMStorageAgent):
     36        (WebCore::InstrumentingAgents::inspectorDatabaseAgent):
     37        (WebCore::InstrumentingAgents::setInspectorDatabaseAgent):
     38        (WebCore::InstrumentingAgents::inspectorApplicationCacheAgent):
     39        (WebCore::InstrumentingAgents::setInspectorApplicationCacheAgent):
     40        (WebCore::InstrumentingAgents::inspectorDebuggerAgent):
     41        (WebCore::InstrumentingAgents::setInspectorDebuggerAgent):
     42        (WebCore::InstrumentingAgents::inspectorBrowserDebuggerAgent):
     43        (WebCore::InstrumentingAgents::setInspectorBrowserDebuggerAgent):
     44        (WebCore::InstrumentingAgents::inspectorProfilerAgent):
     45        (WebCore::InstrumentingAgents::setInspectorProfilerAgent):
     46
    1472011-03-04  Ilya Tikhonovsky  <loislo@chromium.org>
    248

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

    r80338 r80350  
    141141    , m_state(new InspectorState(client))
    142142    , m_domAgent(InspectorDOMAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptHost.get()))
    143     , m_cssAgent(new InspectorCSSAgent(m_domAgent.get()))
     143    , m_cssAgent(new InspectorCSSAgent(m_instrumentingAgents.get(), m_domAgent.get()))
    144144#if ENABLE(DATABASE)
    145145    , m_databaseAgent(InspectorDatabaseAgent::create(m_instrumentingAgents.get()))
    … …  
    157157    , m_debuggerAgent(InspectorDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), page, m_injectedScriptHost.get()))
    158158    , m_browserDebuggerAgent(InspectorBrowserDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_domAgent.get(), m_debuggerAgent.get(), this))
    159     , m_profilerAgent(InspectorProfilerAgent::create(this))
     159    , m_profilerAgent(InspectorProfilerAgent::create(m_instrumentingAgents.get(), m_consoleAgent.get(), page))
    160160#endif
    161161{
    … …  
    504504void InspectorAgent::didCommitLoad(DocumentLoader* loader)
    505505{
    506     if (!enabled())
    507         return;
    508 
    509     if (InspectorResourceAgent* resourceAgent = m_instrumentingAgents->inspectorResourceAgent())
    510         resourceAgent->didCommitLoad(loader);
    511 
    512     ASSERT(m_inspectedPage);
    513 
    514     if (loader->frame() == m_inspectedPage->mainFrame()) {
    515         if (m_frontend)
    516             m_frontend->inspector()->inspectedURLChanged(loader->url().string());
    517 
    518         m_injectedScriptHost->discardInjectedScripts();
    519         m_consoleAgent->reset();
    520 
    521         if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
    522             timelineAgent->didCommitLoad();
    523 
    524 #if ENABLE(JAVASCRIPT_DEBUGGER)
    525         if (InspectorDebuggerAgent* debuggerAgent = m_instrumentingAgents->inspectorDebuggerAgent()) {
    526             KURL url = inspectedURLWithoutFragment();
    527             debuggerAgent->inspectedURLChanged(url);
    528             if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = m_instrumentingAgents->inspectorBrowserDebuggerAgent())
    529                 browserDebuggerAgent->inspectedURLChanged(url);
    530         }
    531 #endif
    532 
    533 #if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
    534         m_profilerAgent->stopUserInitiatedProfiling(true);
    535         m_profilerAgent->resetState();
    536 #endif
    537 
    538         if (m_frontend) {
    539             m_frontend->inspector()->reset();
    540             m_domAgent->reset();
    541             m_cssAgent->reset();
    542         }
     506    if (m_frontend) {
     507        m_frontend->inspector()->inspectedURLChanged(loader->url().string());
     508        m_frontend->inspector()->reset();
     509    }
     510    m_injectedScriptHost->discardInjectedScripts();
    543511#if ENABLE(WORKERS)
    544         m_workers.clear();
    545 #endif
    546 #if ENABLE(DATABASE)
    547         m_databaseAgent->clearResources();
    548 #endif
    549 #if ENABLE(DOM_STORAGE)
    550         m_domStorageAgent->clearResources();
    551 #endif
    552         if (InspectorDOMAgent* domAgent = m_instrumentingAgents->inspectorDOMAgent())
    553             domAgent->setDocument(m_inspectedPage->mainFrame()->document());
    554     }
     512    m_workers.clear();
     513#endif
    555514}
    556515

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

    r79583 r80350  
    4141#include "InspectorDOMAgent.h"
    4242#include "InspectorValues.h"
     43#include "InstrumentingAgents.h"
    4344#include "Node.h"
    4445#include "NodeList.h"
    … …  
    143144}
    144145
    145 InspectorCSSAgent::InspectorCSSAgent(InspectorDOMAgent* domAgent)
    146     : m_domAgent(domAgent)
     146InspectorCSSAgent::InspectorCSSAgent(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent)
     147    : m_instrumentingAgents(instrumentingAgents)
     148    , m_domAgent(domAgent)
    147149    , m_lastStyleSheetId(1)
    148150    , m_lastRuleId(1)
    … …  
    150152{
    151153    m_domAgent->setDOMListener(this);
     154    m_instrumentingAgents->setInspectorCSSAgent(this);
    152155}
    153156
    154157InspectorCSSAgent::~InspectorCSSAgent()
    155158{
     159    m_instrumentingAgents->setInspectorCSSAgent(0);
    156160    // DOM agent should be destroyed after CSS agent.
    157161    m_domAgent->setDOMListener(0);

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

    r79583 r80350  
    4545class Element;
    4646class InspectorFrontend;
     47class InstrumentingAgents;
    4748class NameNodeMap;
    4849class Node;
    … …  
    5253
    5354class InspectorCSSAgent : public InspectorDOMAgent::DOMListener {
     55    WTF_MAKE_NONCOPYABLE(InspectorCSSAgent);
    5456public:
    5557    static CSSStyleSheet* parentStyleSheet(StyleBase*);
    5658    static CSSStyleRule* asCSSStyleRule(StyleBase*);
    5759
    58     explicit InspectorCSSAgent(InspectorDOMAgent*);
     60    InspectorCSSAgent(InstrumentingAgents*, InspectorDOMAgent*);
    5961    ~InspectorCSSAgent();
    6062
    … …  
    9799    virtual void didModifyDOMAttr(Element*);
    98100
     101    InstrumentingAgents* m_instrumentingAgents;
    99102    InspectorDOMAgent* m_domAgent;
    100103

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

    r80204 r80350  
    241241InspectorDatabaseAgent::~InspectorDatabaseAgent()
    242242{
    243     if (m_frontendProvider)
    244         clearFrontend();
    245243    m_instrumentingAgents->setInspectorDatabaseAgent(0);
    246244}

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

    r80332 r80350  
    4242#include "InspectorApplicationCacheAgent.h"
    4343#include "InspectorBrowserDebuggerAgent.h"
     44#include "InspectorCSSAgent.h"
    4445#include "InspectorConsoleAgent.h"
    4546#include "InspectorDatabaseAgent.h"
    … …  
    508509}
    509510
    510 void InspectorInstrumentation::didCommitLoadImpl(InspectorAgent* inspectorAgent, DocumentLoader* loader)
    511 {
     511void InspectorInstrumentation::didCommitLoadImpl(Page* page, InspectorAgent* inspectorAgent, DocumentLoader* loader)
     512{
     513    if (!inspectorAgent->enabled())
     514        return;
     515
     516    InstrumentingAgents* instrumentingAgents = inspectorAgent->instrumentingAgents();
     517    if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
     518        resourceAgent->didCommitLoad(loader);
     519
     520    Frame* mainFrame = page->mainFrame();
     521    if (loader->frame() != mainFrame)
     522        return;
     523
     524    if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
     525        consoleAgent->reset();
     526#if ENABLE(JAVASCRIPT_DEBUGGER)
     527    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
     528        KURL url = inspectorAgent->inspectedURLWithoutFragment();
     529        debuggerAgent->inspectedURLChanged(url);
     530        if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = instrumentingAgents->inspectorBrowserDebuggerAgent())
     531            browserDebuggerAgent->inspectedURLChanged(url);
     532    }
     533#endif
     534#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
     535    if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) {
     536        profilerAgent->stopUserInitiatedProfiling(true);
     537        profilerAgent->resetState();
     538    }
     539#endif
     540    if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
     541        cssAgent->reset();
     542#if ENABLE(DATABASE)
     543    if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
     544        databaseAgent->clearResources();
     545#endif
     546#if ENABLE(DOM_STORAGE)
     547    if (InspectorDOMStorageAgent* domStorageAgent = instrumentingAgents->inspectorDOMStorageAgent())
     548        domStorageAgent->clearResources();
     549#endif
     550    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
     551        domAgent->setDocument(mainFrame->document());
    512552    inspectorAgent->didCommitLoad(loader);
    513553}

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

    r79009 r80350  
    244244    static void loadEventFiredImpl(InspectorAgent*, Frame*, const KURL&);
    245245    static void frameDetachedFromParentImpl(InspectorAgent*, Frame*);
    246     static void didCommitLoadImpl(InspectorAgent*, DocumentLoader*);
     246    static void didCommitLoadImpl(Page*, InspectorAgent*, DocumentLoader*);
    247247
    248248    static InspectorInstrumentationCookie willWriteHTMLImpl(InspectorAgent*, unsigned int length, unsigned int startLine);
    … …  
    744744{
    745745#if ENABLE(INSPECTOR)
    746     if (InspectorAgent* inspectorAgent = inspectorAgentForFrame(frame))
    747         didCommitLoadImpl(inspectorAgent, loader);
     746    if (!frame)
     747        return;
     748    Page* page = frame->page();
     749    if (!page)
     750        return;
     751    if (InspectorAgent* inspectorAgent = inspectorAgentForPage(page))
     752        didCommitLoadImpl(page, inspectorAgent, loader);
    748753#endif
    749754}

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

    r80204 r80350  
    3838#include "InspectorFrontend.h"
    3939#include "InspectorValues.h"
     40#include "InstrumentingAgents.h"
    4041#include "KURL.h"
    4142#include "Page.h"
    … …  
    5758static const char* const HeapProfileType = "HEAP";
    5859
    59 PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InspectorAgent* inspectorAgent)
    60 {
    61     OwnPtr<InspectorProfilerAgent> agent = adoptPtr(new InspectorProfilerAgent(inspectorAgent));
    62     return agent.release();
    63 }
    64 
    65 InspectorProfilerAgent::InspectorProfilerAgent(InspectorAgent* inspectorAgent)
    66     : m_inspectorAgent(inspectorAgent)
     60PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, Page* inspectedPage)
     61{
     62    return adoptPtr(new InspectorProfilerAgent(instrumentingAgents, consoleAgent, inspectedPage));
     63}
     64
     65InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, Page* inspectedPage)
     66    : m_instrumentingAgents(instrumentingAgents)
     67    , m_consoleAgent(consoleAgent)
     68    , m_inspectedPage(inspectedPage)
    6769    , m_frontend(0)
    6870    , m_enabled(false)
    … …  
    7274    , m_nextUserInitiatedHeapSnapshotNumber(1)
    7375{
     76    m_instrumentingAgents->setInspectorProfilerAgent(this);
    7477}
    7578
    7679InspectorProfilerAgent::~InspectorProfilerAgent()
    7780{
     81    m_instrumentingAgents->setInspectorProfilerAgent(0);
    7882}
    7983
    … …  
    9498    String title = profile->title();
    9599    String message = makeString("Profile \"webkit-profile://", CPUProfileType, '/', encodeWithURLEscapeSequences(title), '#', String::number(profile->uid()), "\" finished.");
    96     m_inspectorAgent->consoleAgent()->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
     100    m_consoleAgent->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
    97101}
    98102
    … …  
    102106        return;
    103107    String message = makeString("Profile \"webkit-profile://", CPUProfileType, '/', encodeWithURLEscapeSequences(title), "#0\" started.");
    104     m_inspectorAgent->consoleAgent()->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
     108    m_consoleAgent->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL);
    105109}
    106110
    … …  
    248252    String title = getCurrentUserInitiatedProfileName(true);
    249253#if USE(JSC)
    250     JSC::ExecState* scriptState = toJSDOMWindow(m_inspectorAgent->inspectedPage()->mainFrame(), debuggerWorld())->globalExec();
     254    JSC::ExecState* scriptState = toJSDOMWindow(m_inspectedPage->mainFrame(), debuggerWorld())->globalExec();
    251255#else
    252256    ScriptState* scriptState = 0;
    … …  
    264268    String title = getCurrentUserInitiatedProfileName();
    265269#if USE(JSC)
    266     JSC::ExecState* scriptState = toJSDOMWindow(m_inspectorAgent->inspectedPage()->mainFrame(), debuggerWorld())->globalExec();
     270    JSC::ExecState* scriptState = toJSDOMWindow(m_inspectedPage->mainFrame(), debuggerWorld())->globalExec();
    267271#else
    268272    // Use null script state to avoid filtering by context security token.

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

    r80204 r80350  
    4343
    4444class InspectorArray;
    45 class InspectorAgent;
     45class InspectorConsoleAgent;
    4646class InspectorFrontend;
    4747class InspectorObject;
     48class InstrumentingAgents;
     49class Page;
    4850class ScriptHeapSnapshot;
    4951class ScriptProfile;
    … …  
    5456    WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
    5557public:
    56     static PassOwnPtr<InspectorProfilerAgent> create(InspectorAgent*);
     58    static PassOwnPtr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, Page*);
    5759    virtual ~InspectorProfilerAgent();
    5860
    … …  
    8385    typedef HashMap<unsigned int, RefPtr<ScriptHeapSnapshot> > HeapSnapshotsMap;
    8486
    85     InspectorProfilerAgent(InspectorAgent*);
     87    InspectorProfilerAgent(InstrumentingAgents*, InspectorConsoleAgent*, Page*);
    8688    PassRefPtr<InspectorObject> createProfileHeader(const ScriptProfile& profile);
    8789    PassRefPtr<InspectorObject> createSnapshotHeader(const ScriptHeapSnapshot& snapshot);
    8890
    89     InspectorAgent* m_inspectorAgent;
     91    InstrumentingAgents* m_instrumentingAgents;
     92    InspectorConsoleAgent* m_consoleAgent;
     93    Page* m_inspectedPage;
    9094    InspectorFrontend::Profiler* m_frontend;
    9195    bool m_enabled;

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

    r80332 r80350  
    3939class InspectorApplicationCacheAgent;
    4040class InspectorBrowserDebuggerAgent;
     41class InspectorCSSAgent;
    4142class InspectorConsoleAgent;
    4243class InspectorDOMAgent;
    … …  
    4748class InspectorResourceAgent;
    4849class InspectorRuntimeAgent;
    49 class InspectorStorageAgent;
    5050class InspectorTimelineAgent;
    5151
    … …  
    5555public:
    5656    InstrumentingAgents()
    57         : m_inspectorBrowserDebuggerAgent(0)
     57        : m_inspectorCSSAgent(0)
     58        , m_inspectorConsoleAgent(0)
     59        , m_inspectorDOMAgent(0)
     60        , m_inspectorResourceAgent(0)
     61        , m_inspectorRuntimeAgent(0)
     62        , m_inspectorTimelineAgent(0)
     63#if ENABLE(DOM_STORAGE)
     64        , m_inspectorDOMStorageAgent(0)
     65#endif
     66#if ENABLE(DATABASE)
     67        , m_inspectorDatabaseAgent(0)
     68#endif
    5869#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    5970        , m_inspectorApplicationCacheAgent(0)
    6071#endif
    61         , m_inspectorConsoleAgent(0)
    62         , m_inspectorDOMAgent(0)
    63         , m_inspectorDOMStorageAgent(0)
    64         , m_inspectorDatabaseAgent(0)
     72#if ENABLE(JAVASCRIPT_DEBUGGER)
    6573        , m_inspectorDebuggerAgent(0)
     74        , m_inspectorBrowserDebuggerAgent(0)
    6675        , m_inspectorProfilerAgent(0)
    67         , m_inspectorResourceAgent(0)
    68         , m_inspectorRuntimeAgent(0)
    69         , m_inspectorStorageAgent(0)
    70         , m_inspectorTimelineAgent(0)
     76#endif
    7177    { }
    7278    ~InstrumentingAgents() { }
    7379
    74     InspectorBrowserDebuggerAgent* inspectorBrowserDebuggerAgent() const { return m_inspectorBrowserDebuggerAgent; }
    75     void setInspectorBrowserDebuggerAgent(InspectorBrowserDebuggerAgent* agent) { m_inspectorBrowserDebuggerAgent = agent; }
    76 
    77 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    78     InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
    79     void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
    80 #endif
     80    InspectorCSSAgent* inspectorCSSAgent() const { return m_inspectorCSSAgent; }
     81    void setInspectorCSSAgent(InspectorCSSAgent* agent) { m_inspectorCSSAgent = agent; }
    8182
    8283    InspectorConsoleAgent* inspectorConsoleAgent() const { return m_inspectorConsoleAgent; }
    … …  
    8687    void setInspectorDOMAgent(InspectorDOMAgent* agent) { m_inspectorDOMAgent = agent; }
    8788
    88     InspectorDOMStorageAgent* inspectorDOMStorageAgent() const { return m_inspectorDOMStorageAgent; }
    89     void setInspectorDOMStorageAgent(InspectorDOMStorageAgent* agent) { m_inspectorDOMStorageAgent = agent; }
    90 
    91     InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
    92     void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
    93 
    94     InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
    95     void setInspectorDebuggerAgent(InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
    96 
    97     InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
    98     void setInspectorProfilerAgent(InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
    99 
    10089    InspectorResourceAgent* inspectorResourceAgent() const { return m_inspectorResourceAgent; }
    10190    void setInspectorResourceAgent(InspectorResourceAgent* agent) { m_inspectorResourceAgent = agent; }
    … …  
    10493    void setInspectorRuntimeAgent(InspectorRuntimeAgent* agent) { m_inspectorRuntimeAgent = agent; }
    10594
    106     InspectorStorageAgent* inspectorStorageAgent() const { return m_inspectorStorageAgent; }
    107     void setInspectorStorageAgent(InspectorStorageAgent* agent) { m_inspectorStorageAgent = agent; }
    108 
    10995    InspectorTimelineAgent* inspectorTimelineAgent() const { return m_inspectorTimelineAgent; }
    11096    void setInspectorTimelineAgent(InspectorTimelineAgent* agent) { m_inspectorTimelineAgent = agent; }
    11197
     98#if ENABLE(DOM_STORAGE)
     99    InspectorDOMStorageAgent* inspectorDOMStorageAgent() const { return m_inspectorDOMStorageAgent; }
     100    void setInspectorDOMStorageAgent(InspectorDOMStorageAgent* agent) { m_inspectorDOMStorageAgent = agent; }
     101#endif
     102#if ENABLE(DATABASE)
     103    InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
     104    void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
     105#endif
     106#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     107    InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
     108    void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
     109#endif
     110#if ENABLE(JAVASCRIPT_DEBUGGER)
     111    InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
     112    void setInspectorDebuggerAgent(InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
     113
     114    InspectorBrowserDebuggerAgent* inspectorBrowserDebuggerAgent() const { return m_inspectorBrowserDebuggerAgent; }
     115    void setInspectorBrowserDebuggerAgent(InspectorBrowserDebuggerAgent* agent) { m_inspectorBrowserDebuggerAgent = agent; }
     116
     117    InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
     118    void setInspectorProfilerAgent(InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
     119#endif
     120
    112121private:
    113     InspectorBrowserDebuggerAgent* m_inspectorBrowserDebuggerAgent;
     122    InspectorCSSAgent* m_inspectorCSSAgent;
     123    InspectorConsoleAgent* m_inspectorConsoleAgent;
     124    InspectorDOMAgent* m_inspectorDOMAgent;
     125    InspectorResourceAgent* m_inspectorResourceAgent;
     126    InspectorRuntimeAgent* m_inspectorRuntimeAgent;
     127    InspectorTimelineAgent* m_inspectorTimelineAgent;
     128#if ENABLE(DOM_STORAGE)
     129    InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
     130#endif
     131#if ENABLE(DATABASE)
     132    InspectorDatabaseAgent* m_inspectorDatabaseAgent;
     133#endif
    114134#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    115135    InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
    116136#endif
    117     InspectorConsoleAgent* m_inspectorConsoleAgent;
    118     InspectorDOMAgent* m_inspectorDOMAgent;
    119     InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
    120     InspectorDatabaseAgent* m_inspectorDatabaseAgent;
     137#if ENABLE(JAVASCRIPT_DEBUGGER)
    121138    InspectorDebuggerAgent* m_inspectorDebuggerAgent;
     139    InspectorBrowserDebuggerAgent* m_inspectorBrowserDebuggerAgent;
    122140    InspectorProfilerAgent* m_inspectorProfilerAgent;
    123     InspectorResourceAgent* m_inspectorResourceAgent;
    124     InspectorRuntimeAgent* m_inspectorRuntimeAgent;
    125     InspectorStorageAgent* m_inspectorStorageAgent;
    126     InspectorTimelineAgent* m_inspectorTimelineAgent;
     141#endif
    127142};
    128143
Note: See TracChangeset for help on using the changeset viewer.