Changeset 76227 in webkit


Ignore:
Timestamp:
Jan 20, 2011 4:38:16 AM (13 years ago)
Author:
loislo@chromium.org
Message:

2011-01-20 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: prepare for extracting InspectorAgent from InspectorController.
​https://bugs.webkit.org/show_bug.cgi?id=52797

  • inspector/CodeGeneratorInspector.pm:
  • inspector/InspectorController.h: (WebCore::InspectorController::inspectorAgent): (WebCore::InspectorController::cssAgent): (WebCore::InspectorController::injectedScriptAgent): (WebCore::InspectorController::resourceAgent): (WebCore::InspectorController::runtimeAgent): (WebCore::InspectorController::timelineAgent): (WebCore::InspectorController::databaseAgent): (WebCore::InspectorController::domStorageAgent): (WebCore::InspectorController::fileSystemAgent): (WebCore::InspectorController::browserDebuggerAgent): (WebCore::InspectorController::debuggerAgent): (WebCore::InspectorController::profilerAgent): (WebCore::InspectorController::applicationCacheAgent):
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r76226 r76227  
     12011-01-20  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: prepare for extracting InspectorAgent from InspectorController.
     6        https://bugs.webkit.org/show_bug.cgi?id=52797
     7
     8        * inspector/CodeGeneratorInspector.pm:
     9        * inspector/InspectorController.h:
     10        (WebCore::InspectorController::inspectorAgent):
     11        (WebCore::InspectorController::cssAgent):
     12        (WebCore::InspectorController::injectedScriptAgent):
     13        (WebCore::InspectorController::resourceAgent):
     14        (WebCore::InspectorController::runtimeAgent):
     15        (WebCore::InspectorController::timelineAgent):
     16        (WebCore::InspectorController::databaseAgent):
     17        (WebCore::InspectorController::domStorageAgent):
     18        (WebCore::InspectorController::fileSystemAgent):
     19        (WebCore::InspectorController::browserDebuggerAgent):
     20        (WebCore::InspectorController::debuggerAgent):
     21        (WebCore::InspectorController::profilerAgent):
     22        (WebCore::InspectorController::applicationCacheAgent):
     23
    1242011-01-20  Sheriff Bot  <webkit.review.bot@gmail.com>
    225

  • trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm

    r76136 r76227  
    1414    "forward" => "InspectorApplicationCacheAgent",
    1515    "header" => "InspectorApplicationCacheAgent.h",
    16     "domainAccessor" => "m_inspectorController->m_applicationCacheAgent",
     16    "domainAccessor" => "m_inspectorAgent->applicationCacheAgent()",
    1717};
    1818$typeTransform{"CSS"} = {
    1919    "forward" => "InspectorCSSAgent",
    2020    "header" => "InspectorCSSAgent.h",
    21     "domainAccessor" => "m_inspectorController->m_cssAgent",
     21    "domainAccessor" => "m_inspectorAgent->cssAgent()",
    2222};
    2323$typeTransform{"Console"} = {
    2424    "forward" => "InspectorConsoleAgent",
    2525    "header" => "InspectorConsoleAgent.h",
    26     "domainAccessor" => "m_inspectorController->m_consoleAgent",
     26    "domainAccessor" => "m_inspectorAgent->consoleAgent()",
    2727};
    2828$typeTransform{"Debugger"} = {
    2929    "forward" => "InspectorDebuggerAgent",
    3030    "header" => "InspectorDebuggerAgent.h",
    31     "domainAccessor" => "m_inspectorController->m_debuggerAgent",
     31    "domainAccessor" => "m_inspectorAgent->debuggerAgent()",
    3232};
    3333$typeTransform{"BrowserDebugger"} = {
    3434    "forward" => "InspectorBrowserDebuggerAgent",
    3535    "header" => "InspectorBrowserDebuggerAgent.h",
    36     "domainAccessor" => "m_inspectorController->m_browserDebuggerAgent",
     36    "domainAccessor" => "m_inspectorAgent->browserDebuggerAgent()",
    3737};
    3838$typeTransform{"Database"} = {
    3939    "forward" => "InspectorDatabaseAgent",
    4040    "header" => "InspectorDatabaseAgent.h",
    41     "domainAccessor" => "m_inspectorController->m_databaseAgent",
     41    "domainAccessor" => "m_inspectorAgent->databaseAgent()",
    4242};
    4343$typeTransform{"DOM"} = {
    4444    "forward" => "InspectorDOMAgent",
    4545    "header" => "InspectorDOMAgent.h",
    46     "domainAccessor" => "m_inspectorController->m_domAgent",
     46    "domainAccessor" => "m_inspectorAgent->domAgent()",
    4747};
    4848$typeTransform{"DOMStorage"} = {
    4949    "forward" => "InspectorDOMStorageAgent",
    5050    "header" => "InspectorDOMStorageAgent.h",
    51     "domainAccessor" => "m_inspectorController->m_domStorageAgent",
     51    "domainAccessor" => "m_inspectorAgent->domStorageAgent()",
    5252};
    5353$typeTransform{"FileSystem"} = {
    5454    "forward" => "InspectorFileSystemAgent",
    5555    "header" => "InspectorFileSystemAgent.h",
    56     "domainAccessor" => "m_inspectorController->m_fileSystemAgent",
     56    "domainAccessor" => "m_inspectorAgent->fileSystemAgent()",
    5757};
    5858$typeTransform{"InjectedScript"} = {
    5959    "forwardHeader" => "InjectedScriptHost.h",
    60     "domainAccessor" => "m_inspectorController->m_injectedScriptHost",
     60    "domainAccessor" => "m_inspectorAgent->injectedScriptAgent()",
    6161};
    6262$typeTransform{"Inspector"} = {
    63     "forwardHeader" => "InspectorController.h",
    64     "domainAccessor" => "m_inspectorController",
     63    "forwardHeader" => "InspectorController.h", # FIXME: Temporary solution until extracting the real InspectorAgent from InspectorController.
     64    "domainAccessor" => "m_inspectorAgent",
    6565};
    6666$typeTransform{"Network"} = {
    6767    "forward" => "InspectorResourceAgent",
    6868    "header" => "InspectorResourceAgent.h",
    69     "domainAccessor" => "m_inspectorController->m_resourceAgent",
     69    "domainAccessor" => "m_inspectorAgent->resourceAgent()",
    7070};
    7171$typeTransform{"Profiler"} = {
    7272    "forward" => "InspectorProfilerAgent",
    7373    "header" => "InspectorProfilerAgent.h",
    74     "domainAccessor" => "m_inspectorController->m_profilerAgent",
     74    "domainAccessor" => "m_inspectorAgent->profilerAgent()",
    7575};
    7676$typeTransform{"Runtime"} = {
    7777    "forward" => "InspectorRuntimeAgent",
    7878    "header" => "InspectorRuntimeAgent.h",
    79     "domainAccessor" => "m_inspectorController->m_runtimeAgent",
     79    "domainAccessor" => "m_inspectorAgent->runtimeAgent()",
    8080};
    8181
    … …  
    270270    $backendJSStubName = $className . "BackendStub";
    271271    my @backendHead;
    272     push(@backendHead, "    ${backendClassName}(InspectorController* inspectorController) : m_inspectorController(inspectorController) { }");
     272    push(@backendHead, "    typedef InspectorController InspectorAgent;"); # FIXME: Temporary substitution until extracting InspectorAgent from InspectorController.
     273    push(@backendHead, "    ${backendClassName}(InspectorAgent* inspectorAgent) : m_inspectorAgent(inspectorAgent) { }");
    273274    push(@backendHead, "    void reportProtocolError(const long callId, const String& errorText) const;");
    274275    push(@backendHead, "    void dispatch(const String& message);");
    275276    push(@backendHead, "    static bool getCommandName(const String& message, String* result);");
    276277    $backendConstructor = join("\n", @backendHead);
    277     $backendFooter = "    InspectorController* m_inspectorController;";
     278    $backendFooter = "    InspectorAgent* m_inspectorAgent;";
    278279    $backendTypes{"Inspector"} = 1;
    279280    $backendTypes{"InspectorClient"} = 1;
    … …  
    412413
    413414    push(@function, "    // use InspectorFrontend as a marker of WebInspector availability");
    414     push(@function, "    if ((callId || protocolErrors->length()) && m_inspectorController->hasFrontend()) {");
     415    push(@function, "    if ((callId || protocolErrors->length()) && m_inspectorAgent->hasFrontend()) {");
    415416    push(@function, "        RefPtr<InspectorObject> responseMessage = InspectorObject::create();");
    416417    push(@function, "        responseMessage->setNumber(\"seq\", callId);");
    … …  
    427428        push(@function, "        }");
    428429    }
    429     push(@function, "        m_inspectorController->inspectorClient()->sendMessageToFrontend(responseMessage->toJSONString());");
     430    push(@function, "        m_inspectorAgent->inspectorClient()->sendMessageToFrontend(responseMessage->toJSONString());");
    430431    push(@function, "    }");
    431432
    … …  
    448449    errors->pushString(errorText);
    449450    message->setArray("errors", errors);
    450     m_inspectorController->inspectorClient()->sendMessageToFrontend(message->toJSONString());
     451    m_inspectorAgent->inspectorClient()->sendMessageToFrontend(message->toJSONString());
    451452}
    452453EOF

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

    r76136 r76227  
    146146    void disconnectFrontend();
    147147
     148    InspectorController* inspectorAgent() { return this; }
    148149    InspectorConsoleAgent* consoleAgent() const { return m_consoleAgent.get(); }
     150    InspectorCSSAgent* cssAgent() const { return m_cssAgent.get(); }
    149151    InspectorDOMAgent* domAgent() const { return m_domAgent.get(); }
     152    InjectedScriptHost* injectedScriptAgent() const { return m_injectedScriptHost.get(); }
     153    InspectorResourceAgent* resourceAgent() const { return m_resourceAgent.get(); }
     154    InspectorRuntimeAgent* runtimeAgent() const { return m_runtimeAgent.get(); }
     155    InspectorTimelineAgent* timelineAgent() { return m_timelineAgent.get(); }
     156#if ENABLE(DATABASE)
     157    InspectorDatabaseAgent* databaseAgent() const { return m_databaseAgent.get(); }
     158#endif
     159#if ENABLE(DOM_STORAGE)
     160    InspectorDOMStorageAgent* domStorageAgent() const { return m_domStorageAgent.get(); }
     161#endif
     162#if ENABLE(FILE_SYSTEM)
     163    InspectorFileSystemAgent* fileSystemAgent() const { return m_fileSystemAgent.get(); }
     164#endif
     165#if ENABLE(JAVASCRIPT_DEBUGGER)
     166    InspectorBrowserDebuggerAgent* browserDebuggerAgent() const { return m_browserDebuggerAgent.get(); }
     167    InspectorDebuggerAgent* debuggerAgent() const { return m_debuggerAgent.get(); }
     168    InspectorProfilerAgent* profilerAgent() const { return m_profilerAgent.get(); }
     169#endif
     170#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     171    InspectorApplicationCacheAgent* applicationCacheAgent() { return m_applicationCacheAgent.get(); }
     172#endif
     173
    150174
    151175    bool searchingForNodeInPage() const;
    … …  
    164188    void startTimelineProfiler();
    165189    void stopTimelineProfiler();
    166     InspectorTimelineAgent* timelineAgent() { return m_timelineAgent.get(); }
    167190
    168191    void getCookies(RefPtr<InspectorArray>* cookies, WTF::String* cookiesString);
    169192    void deleteCookie(const String& cookieName, const String& domain);
    170 
    171 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    172     InspectorApplicationCacheAgent* applicationCacheAgent() { return m_applicationCacheAgent.get(); }
    173 #endif
    174193
    175194    void mainResourceFiredLoadEvent(DocumentLoader*, const KURL&);
    … …  
    337356    OwnPtr<InspectorDebuggerAgent> m_debuggerAgent;
    338357    OwnPtr<InspectorBrowserDebuggerAgent> m_browserDebuggerAgent;
    339 
    340358    OwnPtr<InspectorProfilerAgent> m_profilerAgent;
    341359#endif
Note: See TracChangeset for help on using the changeset viewer.