Changeset 64536 in webkit


Ignore:
Timestamp:
Aug 3, 2010 1:57:59 AM (14 years ago)
Author:
loislo@chromium.org
Message:

2010-08-02 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Yury Semikhatsky.

WebInspector: Trivial InspectorBackend functions were removed.
And now it is bit simpler to change Inspector API because we have
less number of abstraction layers.
​https://bugs.webkit.org/show_bug.cgi?id=43402

  • inspector/CodeGeneratorInspector.pm:
  • inspector/Inspector.idl:
  • inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::clearConsoleMessages): (WebCore::InspectorBackend::releaseWrapperObjectGroup): (WebCore::InspectorBackend::inspectorFrontend): (WebCore::InspectorBackend::remoteFrontend):
  • inspector/InspectorBackend.h: (WebCore::InspectorBackend::inspectorDOMAgent): (WebCore::InspectorBackend::inspectorApplicationCacheAgent):
  • inspector/InspectorController.h:
Location:
trunk/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r64535 r64536  
     12010-08-02  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        WebInspector: Trivial InspectorBackend functions were removed.
     6        And now it is   bit simpler to change Inspector API because we have
     7        less number of abstraction layers.
     8        https://bugs.webkit.org/show_bug.cgi?id=43402
     9
     10        * inspector/CodeGeneratorInspector.pm:
     11        * inspector/Inspector.idl:
     12        * inspector/InspectorBackend.cpp:
     13        (WebCore::InspectorBackend::clearConsoleMessages):
     14        (WebCore::InspectorBackend::releaseWrapperObjectGroup):
     15        (WebCore::InspectorBackend::inspectorFrontend):
     16        (WebCore::InspectorBackend::remoteFrontend):
     17        * inspector/InspectorBackend.h:
     18        (WebCore::InspectorBackend::inspectorDOMAgent):
     19        (WebCore::InspectorBackend::inspectorApplicationCacheAgent):
     20        * inspector/InspectorController.h:
     21
    1222010-08-03  Alexey Proskuryakov  <ap@apple.com>
    223

  • trunk/WebCore/inspector/CodeGeneratorInspector.pm

    r64124 r64536  
    1515    "header" => "InspectorClient.h",
    1616};
    17 $typeTransform{"InspectorBackend"} = {
     17$typeTransform{"Backend"} = {
    1818    "forward" => "InspectorBackend",
    1919    "header" => "InspectorBackend.h",
     20    "handlerAccessor" => "m_inspectorBackend",
     21};
     22$typeTransform{"Controller"} = {
     23    "forward" => "InspectorController",
     24    "header" => "InspectorController.h",
     25    "handlerAccessor" => "m_inspectorBackend->inspectorController()",
     26};
     27$typeTransform{"Debug"} = {
     28    "forward" => "ScriptDebugServer",
     29    "header" => "ScriptDebugServer.h",
     30    "handlerAccessor" => "(&ScriptDebugServer::shared())",
     31};
     32$typeTransform{"DOM"} = {
     33    "forward" => "InspectorDOMAgent",
     34    "header" => "InspectorDOMAgent.h",
     35    "handlerAccessor" => "m_inspectorBackend->inspectorDOMAgent()",
     36};
     37$typeTransform{"ApplicationCache"} = {
     38    "forward" => "InspectorApplicationCacheAgent",
     39    "header" => "InspectorApplicationCacheAgent.h",
     40    "handlerAccessor" => "m_inspectorBackend->inspectorApplicationCacheAgent()",
    2041};
    2142$typeTransform{"PassRefPtr"} = {
    … …  
    169190    $backendConstructor = join("\n", @backendHead);
    170191    $backendFooter = "    InspectorBackend* m_inspectorBackend;";
    171     $backendTypes{"InspectorBackend"} = 1;
     192    $backendTypes{"Backend"} = 1;
    172193    $backendTypes{"PassRefPtr"} = 1;
    173194    $backendTypes{"Array"} = 1;
    … …  
    277298        ++$i;
    278299    }
    279     push(@function, "    m_inspectorBackend->$functionName(" . join(", ", map($_->name, @argsFiltered)) . ");");
     300    my $handler = $function->signature->extendedAttributes->{"handler"} || "Backend";
     301    my $handlerAccessor = $typeTransform{$handler}->{"handlerAccessor"};
     302    $backendTypes{$handler} = 1;
     303    push(@function, "    if ($handlerAccessor)");
     304    push(@function, "        $handlerAccessor->$functionName(" . join(", ", map($_->name, @argsFiltered)) . ");");
    280305    push(@function, "}");
    281306    push(@function, "");

  • trunk/WebCore/inspector/Inspector.idl

    r64534 r64536  
    4646        [notify] void updateConsoleMessageRepeatCount(out unsigned long count);
    4747
    48         void storeLastActivePanel(in String panelName);
     48        [handler=Controller] void storeLastActivePanel(in String panelName);
    4949
    50         void saveApplicationSettings(in String settings);
    51         void saveSessionSettings(in String settings);
     50        [handler=Controller] void saveApplicationSettings(in String settings);
     51        [handler=Controller] void saveSessionSettings(in String settings);
    5252
    53         void enableSearchingForNode();
    54         void disableSearchingForNode();
     53        [handler=Controller] void enableSearchingForNode();
     54        [handler=Controller] void disableSearchingForNode();
    5555
    56         void enableMonitoringXHR();
    57         void disableMonitoringXHR();
     56        [handler=Controller] void enableMonitoringXHR();
     57        [handler=Controller] void disableMonitoringXHR();
    5858
    59         void enableResourceTracking(in boolean always);
    60         void disableResourceTracking(in boolean always);
    61         void getResourceContent(in long callId, in unsigned long identifier);
    62         void reloadPage();
     59        [handler=Controller] void enableResourceTracking(in boolean always);
     60        [handler=Controller] void disableResourceTracking(in boolean always);
     61        [handler=Controller] void getResourceContent(in long callId, in unsigned long identifier);
     62        [handler=Controller] void reloadPage();
    6363
    64         void startTimelineProfiler();
    65         void stopTimelineProfiler();
     64        [handler=Controller] void startTimelineProfiler();
     65        [handler=Controller] void stopTimelineProfiler();
    6666
    6767#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
    68         void enableDebugger(in boolean always);
    69         void disableDebugger(in boolean always);
     68        [handler=Backend] void enableDebugger(in boolean always);
     69        [handler=Controller] void disableDebugger(in boolean always);
    7070
    71         void setBreakpoint(in long callId, in String sourceID, in unsigned long lineNumber, in boolean enabled, in String condition);
    72         void removeBreakpoint(in String sourceID, in unsigned long lineNumber);
    73         void activateBreakpoints();
    74         void deactivateBreakpoints();
     71        [handler=Controller] void setBreakpoint(in long callId, in String sourceID, in unsigned long lineNumber, in boolean enabled, in String condition);
     72        [handler=Controller] void removeBreakpoint(in String sourceID, in unsigned long lineNumber);
     73        [handler=Debug] void activateBreakpoints();
     74        [handler=Debug] void deactivateBreakpoints();
    7575
    76         void pause();
    77         void resume();
     76        [handler=Debug] void pause();
     77        [handler=Controller] void resume();
    7878
    79         void stepOverStatement();
    80         void stepIntoStatement();
    81         void stepOutOfFunction();
     79        [handler=Debug] void stepOverStatement();
     80        [handler=Debug] void stepIntoStatement();
     81        [handler=Debug] void stepOutOfFunction();
    8282
    83         void setPauseOnExceptionsState(in long pauseOnExceptionsState);
     83        [handler=Controller] void setPauseOnExceptionsState(in long pauseOnExceptionsState);
    8484
    85         void editScriptSource(in long callId, in String sourceID, in String newContent);
    86         void getScriptSource(in long callId, in String sourceID);
     85        [handler=Controller] void editScriptSource(in long callId, in String sourceID, in String newContent);
     86        [handler=Controller] void getScriptSource(in long callId, in String sourceID);
    8787
    88         void enableProfiler(in boolean always);
    89         void disableProfiler(in boolean always);
     88        [handler=Controller] void enableProfiler(in boolean always);
     89        [handler=Controller] void disableProfiler(in boolean always);
    9090
    91         void startProfiling();
    92         void stopProfiling();
     91        [handler=Controller] void startProfiling();
     92        [handler=Controller] void stopProfiling();
    9393
    94         void getProfileHeaders(in long callId);
    95         void getProfile(in long callId, in unsigned long uid);
     94        [handler=Controller] void getProfileHeaders(in long callId);
     95        [handler=Controller] void getProfile(in long callId, in unsigned long uid);
    9696
    97         void removeProfile(in unsigned long uid);
    98         void clearProfiles();
     97        [handler=Controller] void removeProfile(in unsigned long uid);
     98        [handler=Controller] void clearProfiles();
    9999
    100         void takeHeapSnapshot();
    101         void getProfilerLogLines(in long callId, in long inPosition, out long outPosition, out String log);
     100        [handler=Backend] void takeHeapSnapshot();
     101        [handler=Backend] void getProfilerLogLines(in long callId, in long inPosition, out long outPosition, out String log);
    102102#endif
    103         void setInjectedScriptSource(in String scriptSource);
    104         void dispatchOnInjectedScript(in long callId, in long injectedScriptId, in String methodName, in String arguments, in boolean async);
     103        [handler=Backend] void setInjectedScriptSource(in String scriptSource);
     104        [handler=Backend] void dispatchOnInjectedScript(in long callId, in long injectedScriptId, in String methodName, in String arguments, in boolean async);
    105105
    106         void addScriptToEvaluateOnLoad(in String scriptSource);
    107         void removeAllScriptsToEvaluateOnLoad();
     106        [handler=Controller] void addScriptToEvaluateOnLoad(in String scriptSource);
     107        [handler=Controller] void removeAllScriptsToEvaluateOnLoad();
    108108
    109         void getChildNodes(in long callId, in long nodeId);
    110         [customResponse=didApplyDomChange] void setAttribute(in long callId, in long elementId, in String name, in String value, out boolean success);
    111         [customResponse=didApplyDomChange] void removeAttribute(in long callId, in long elementId, in String name, out boolean success);
    112         void setTextNodeValue(in long callId, in long nodeId, in String value);
    113         void getEventListenersForNode(in long callId, in long nodeId, out long nodeId, out Array listenersArray);
    114         void copyNode(in long nodeId);
    115         void removeNode(in long callId, in long nodeId, out long nodeId);
    116         void changeTagName(in long callId, in long nodeId, in String newTagName, out long nodeId);
    117         void getOuterHTML(in long callId, in long nodeId, out String outerHTML);
    118         void setOuterHTML(in long callId, in long nodeId, in String outerHTML, out long nodeId);
    119         void addInspectedNode(in long nodeId);
    120         void performSearch(in String query, in boolean runSynchronously);
    121         void searchCanceled();
    122         void pushNodeByPathToFrontend(in long callId, in String path, out long nodeId);
     109        [handler=DOM] void getChildNodes(in long callId, in long nodeId);
     110        [handler=DOM, customResponse=didApplyDomChange] void setAttribute(in long callId, in long elementId, in String name, in String value, out boolean success);
     111        [handler=DOM, customResponse=didApplyDomChange] void removeAttribute(in long callId, in long elementId, in String name, out boolean success);
     112        [handler=DOM] void setTextNodeValue(in long callId, in long nodeId, in String value);
     113        [handler=DOM] void getEventListenersForNode(in long callId, in long nodeId, out long nodeId, out Array listenersArray);
     114        [handler=DOM] void copyNode(in long nodeId);
     115        [handler=DOM] void removeNode(in long callId, in long nodeId, out long nodeId);
     116        [handler=DOM] void changeTagName(in long callId, in long nodeId, in String newTagName, out long nodeId);
     117        [handler=DOM] void getOuterHTML(in long callId, in long nodeId, out String outerHTML);
     118        [handler=DOM] void setOuterHTML(in long callId, in long nodeId, in String outerHTML, out long nodeId);
     119        [handler=DOM] void addInspectedNode(in long nodeId);
     120        [handler=DOM] void performSearch(in String query, in boolean runSynchronously);
     121        [handler=DOM] void searchCanceled();
     122        [handler=DOM] void pushNodeByPathToFrontend(in long callId, in String path, out long nodeId);
    123123
    124         void clearConsoleMessages(in long callId);
     124        [handler=Backend] void clearConsoleMessages(in long callId);
    125125
    126         void highlightDOMNode(in long nodeId);
    127         void hideDOMNodeHighlight();
     126        [handler=Controller] void highlightDOMNode(in long nodeId);
     127        [handler=Controller] void hideDOMNodeHighlight();
    128128
    129         void getStyles(in long callId, in long nodeId, in boolean authOnly, out Value styles);
    130         void getAllStyles(in long callId, out Array styles);
    131         void getInlineStyle(in long callId, in long nodeId, out Value style);
    132         void getComputedStyle(in long callId, in long nodeId, out Value style);
    133         void getStyleSheet(in long callId, in long styleSheetId, out Value styleSheet);
    134         void getRuleRanges(in long callId, in long styleSheetId, out Value ranges);
    135         void applyStyleText(in long callId, in long styleId, in String styleText, in String propertyName, out boolean success, out Value style, out Array changedProperties);
    136         void setStyleText(in long callId, in long styleId, in String styleText, out boolean success);
    137         void setStyleProperty(in long callId, in long styleId, in String name, in String value, out boolean success);
    138         void toggleStyleEnabled(in long callId, in long styleId, in String propertyName, in boolean disabled, out Value style);
    139         void setRuleSelector(in long callId, in long ruleId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
    140         void addRule(in long callId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
     129        [handler=DOM] void getStyles(in long callId, in long nodeId, in boolean authOnly, out Value styles);
     130        [handler=DOM] void getAllStyles(in long callId, out Array styles);
     131        [handler=DOM] void getInlineStyle(in long callId, in long nodeId, out Value style);
     132        [handler=DOM] void getComputedStyle(in long callId, in long nodeId, out Value style);
     133        [handler=DOM] void getStyleSheet(in long callId, in long styleSheetId, out Value styleSheet);
     134        [handler=DOM] void getRuleRanges(in long callId, in long styleSheetId, out Value ranges);
     135        [handler=DOM] void applyStyleText(in long callId, in long styleId, in String styleText, in String propertyName, out boolean success, out Value style, out Array changedProperties);
     136        [handler=DOM] void setStyleText(in long callId, in long styleId, in String styleText, out boolean success);
     137        [handler=DOM] void setStyleProperty(in long callId, in long styleId, in String name, in String value, out boolean success);
     138        [handler=DOM] void toggleStyleEnabled(in long callId, in long styleId, in String propertyName, in boolean disabled, out Value style);
     139        [handler=DOM] void setRuleSelector(in long callId, in long ruleId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
     140        [handler=DOM] void addRule(in long callId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
    141141
    142         void getCookies(in long callId);
    143         void deleteCookie(in String cookieName, in String domain);
     142        [handler=Controller] void getCookies(in long callId);
     143        [handler=Controller] void deleteCookie(in String cookieName, in String domain);
    144144
    145145#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
    146         void getApplicationCaches(in long callId);
     146        [handler=ApplicationCache] void getApplicationCaches(in long callId);
    147147#endif
    148148
    149         void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
    150         void didEvaluateForTestInFrontend(in long callId, in String jsonResult);
     149        [handler=Backend] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
     150        [handler=Controller] void didEvaluateForTestInFrontend(in long callId, in String jsonResult);
    151151
    152152#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
    153         void getDatabaseTableNames(in long callId, in long databaseId);
     153        [handler=Backend] void getDatabaseTableNames(in long callId, in long databaseId);
    154154#endif
    155155
    156156#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
    157         void getDOMStorageEntries(in long callId, in long storageId);
    158         void setDOMStorageItem(in long callId, in long storageId, in String key, in String value);
    159         void removeDOMStorageItem(in long callId, in long storageId, in String key);
     157        [handler=Controller] void getDOMStorageEntries(in long callId, in long storageId);
     158        [handler=Controller] void setDOMStorageItem(in long callId, in long storageId, in String key, in String value);
     159        [handler=Controller] void removeDOMStorageItem(in long callId, in long storageId, in String key);
    160160#endif
    161161

  • trunk/WebCore/inspector/InspectorBackend.cpp

    r64534 r64536  
    3737#endif
    3838
    39 #include "Element.h"
    40 #include "Frame.h"
    41 #include "FrameLoader.h"
    42 #include "HTMLFrameOwnerElement.h"
    4339#include "InjectedScript.h"
    4440#include "InjectedScriptHost.h"
    45 #include "InspectorClient.h"
    4641#include "InspectorController.h"
    4742#include "InspectorDOMAgent.h"
    4843#include "InspectorFrontend.h"
    49 #include "InspectorResource.h"
    50 #include "Page.h"
    51 #include "Pasteboard.h"
    5244#include "RemoteInspectorFrontend.h"
    5345#include "ScriptArray.h"
    … …  
    5547#include "ScriptProfiler.h"
    5648#include "SerializedScriptValue.h"
    57 
    58 #if ENABLE(DOM_STORAGE)
    59 #include "Storage.h"
    60 #endif
    61 
    62 #if ENABLE(JAVASCRIPT_DEBUGGER)
    63 #include "ScriptDebugServer.h"
    64 #endif
    65 
    66 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    67 #include "InspectorApplicationCacheAgent.h"
    68 #endif
    69 
    70 #include "markup.h"
    71 
    72 #include <wtf/RefPtr.h>
    73 #include <wtf/StdLibExtras.h>
    7449
    7550using namespace std;
    … …  
    8661}
    8762
    88 void InspectorBackend::saveApplicationSettings(const String& settings)
    89 {
    90     if (m_inspectorController)
    91         m_inspectorController->saveApplicationSettings(settings);
    92 }
    93 
    94 void InspectorBackend::saveSessionSettings(const String& settings)
    95 {
    96     if (m_inspectorController)
    97         m_inspectorController->saveSessionSettings(settings);
    98 }
    99 
    100 void InspectorBackend::storeLastActivePanel(const String& panelName)
    101 {
    102     if (m_inspectorController)
    103         m_inspectorController->storeLastActivePanel(panelName);
    104 }
    105 
    106 void InspectorBackend::enableSearchingForNode()
    107 {
    108     if (m_inspectorController)
    109         m_inspectorController->enableSearchingForNode();
    110 }
    111 
    112 void InspectorBackend::disableSearchingForNode()
    113 {
    114     if (m_inspectorController)
    115         m_inspectorController->disableSearchingForNode();
    116 }
    117 
    118 void InspectorBackend::enableMonitoringXHR()
    119 {
    120     if (m_inspectorController)
    121         m_inspectorController->enableMonitoringXHR();
    122 }
    123 
    124 void InspectorBackend::disableMonitoringXHR()
    125 {
    126     if (m_inspectorController)
    127         m_inspectorController->disableMonitoringXHR();
    128 }
    129 
    130 void InspectorBackend::enableResourceTracking(bool always)
    131 {
    132     if (m_inspectorController)
    133         m_inspectorController->enableResourceTracking(always);
    134 }
    135 
    136 void InspectorBackend::disableResourceTracking(bool always)
    137 {
    138     if (m_inspectorController)
    139         m_inspectorController->disableResourceTracking(always);
    140 }
    141 
    142 void InspectorBackend::getResourceContent(long callId, unsigned long identifier)
    143 {
    144     if (m_inspectorController)
    145         m_inspectorController->getResourceContent(callId, identifier);
    146 }
    147 
    148 void InspectorBackend::reloadPage()
    149 {
    150     if (m_inspectorController)
    151         m_inspectorController->reloadPage();
    152 }
    153 
    154 void InspectorBackend::startTimelineProfiler()
    155 {
    156     if (m_inspectorController)
    157         m_inspectorController->startTimelineProfiler();
    158 }
    159 
    160 void InspectorBackend::stopTimelineProfiler()
    161 {
    162     if (m_inspectorController)
    163         m_inspectorController->stopTimelineProfiler();
    164 }
    16563
    16664#if ENABLE(JAVASCRIPT_DEBUGGER)
    … …  
    17068    if (m_inspectorController)
    17169        m_inspectorController->enableDebuggerFromFrontend(always);
    172 }
    173 
    174 void InspectorBackend::disableDebugger(bool always)
    175 {
    176     if (m_inspectorController)
    177         m_inspectorController->disableDebugger(always);
    178 }
    179 
    180 void InspectorBackend::setBreakpoint(long callId, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition)
    181 {
    182     if (m_inspectorController)
    183         m_inspectorController->setBreakpoint(callId, sourceID, lineNumber, enabled, condition);
    184 }
    185 
    186 void InspectorBackend::removeBreakpoint(const String& sourceID, unsigned lineNumber)
    187 {
    188     if (m_inspectorController)
    189         m_inspectorController->removeBreakpoint(sourceID, lineNumber);
    190 }
    191 
    192 void InspectorBackend::activateBreakpoints()
    193 {
    194     ScriptDebugServer::shared().activateBreakpoints();
    195 }
    196 
    197 void InspectorBackend::deactivateBreakpoints()
    198 {
    199     ScriptDebugServer::shared().deactivateBreakpoints();
    200 }
    201 
    202 void InspectorBackend::pause()
    203 {
    204     ScriptDebugServer::shared().pause();
    205 }
    206 
    207 void InspectorBackend::resume()
    208 {
    209     if (m_inspectorController)
    210         m_inspectorController->resume();
    211 }
    212 
    213 void InspectorBackend::stepOverStatement()
    214 {
    215     ScriptDebugServer::shared().stepOverStatement();
    216 }
    217 
    218 void InspectorBackend::stepIntoStatement()
    219 {
    220     ScriptDebugServer::shared().stepIntoStatement();
    221 }
    222 
    223 void InspectorBackend::stepOutOfFunction()
    224 {
    225     ScriptDebugServer::shared().stepOutOfFunction();
    226 }
    227 
    228 void InspectorBackend::setPauseOnExceptionsState(long pauseState)
    229 {
    230     if (m_inspectorController)
    231         m_inspectorController->setPauseOnExceptionsState(pauseState);
    232 }
    233 
    234 void InspectorBackend::editScriptSource(long callId, const String& sourceID, const String& newContent)
    235 {
    236     if (m_inspectorController)
    237         m_inspectorController->editScriptSource(callId, sourceID, newContent);
    238 }
    239 
    240 void InspectorBackend::getScriptSource(long callId, const String& sourceID)
    241 {
    242     if (m_inspectorController)
    243         m_inspectorController->getScriptSource(callId, sourceID);
    244 }
    245 
    246 void InspectorBackend::enableProfiler(bool always)
    247 {
    248     if (m_inspectorController)
    249         m_inspectorController->enableProfiler(always);
    250 }
    251 
    252 void InspectorBackend::disableProfiler(bool always)
    253 {
    254     if (m_inspectorController)
    255         m_inspectorController->disableProfiler(always);
    256 }
    257 
    258 void InspectorBackend::startProfiling()
    259 {
    260     if (m_inspectorController)
    261         m_inspectorController->startUserInitiatedProfiling();
    262 }
    263 
    264 void InspectorBackend::stopProfiling()
    265 {
    266     if (m_inspectorController)
    267         m_inspectorController->stopUserInitiatedProfiling();
    268 }
    269 
    270 void InspectorBackend::getProfileHeaders(long callId)
    271 {
    272     if (m_inspectorController)
    273         m_inspectorController->getProfileHeaders(callId);
    274 }
    275 
    276 void InspectorBackend::getProfile(long callId, unsigned uid)
    277 {
    278     if (m_inspectorController)
    279         m_inspectorController->getProfile(callId, uid);
    280 }
    281 
    282 void InspectorBackend::removeProfile(unsigned uid)
    283 {
    284     if (m_inspectorController)
    285         m_inspectorController->removeProfile(uid);
    286 }
    287 
    288 void InspectorBackend::clearProfiles()
    289 {
    290     if (m_inspectorController)
    291         m_inspectorController->clearProfiles();
    29270}
    29371
    … …  
    341119}
    342120
    343 void InspectorBackend::getChildNodes(long callId, long nodeId)
    344 {
    345     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    346         domAgent->getChildNodes(callId, nodeId);
    347 }
    348 
    349 void InspectorBackend::setAttribute(long callId, long elementId, const String& name, const String& value)
    350 {
    351     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    352         domAgent->setAttribute(callId, elementId, name, value);
    353 }
    354 
    355 void InspectorBackend::removeAttribute(long callId, long elementId, const String& name)
    356 {
    357     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    358         domAgent->removeAttribute(callId, elementId, name);
    359 }
    360 
    361 void InspectorBackend::setTextNodeValue(long callId, long nodeId, const String& value)
    362 {
    363     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    364         domAgent->setTextNodeValue(callId, nodeId, value);
    365 }
    366 
    367 void InspectorBackend::getEventListenersForNode(long callId, long nodeId)
    368 {
    369     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    370         domAgent->getEventListenersForNode(callId, nodeId);
    371 }
    372 
    373 void InspectorBackend::copyNode(long nodeId)
    374 {
    375     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    376         domAgent->copyNode(nodeId);
    377 }
    378 
    379 void InspectorBackend::removeNode(long callId, long nodeId)
    380 {
    381     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    382         domAgent->removeNode(callId, nodeId);
    383 }
    384 
    385 void InspectorBackend::changeTagName(long callId, long nodeId, const String& tagName)
    386 {
    387     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    388         domAgent->changeTagName(callId, nodeId, tagName);
    389 }
    390 
    391 void InspectorBackend::getOuterHTML(long callId, long nodeId)
    392 {
    393     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    394         domAgent->getOuterHTML(callId, nodeId);
    395 }
    396 
    397 void InspectorBackend::setOuterHTML(long callId, long nodeId, const String& outerHTML)
    398 {
    399     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    400         domAgent->setOuterHTML(callId, nodeId, outerHTML);
    401 }
    402 
    403 void InspectorBackend::addInspectedNode(long nodeId)
    404 {
    405     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    406         domAgent->addInspectedNode(nodeId);
    407 }
    408 
    409 void InspectorBackend::performSearch(const String& query, bool runSynchronously)
    410 {
    411     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    412         domAgent->performSearch(query, runSynchronously);
    413 }
    414 
    415 void InspectorBackend::searchCanceled()
    416 {
    417     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    418         domAgent->searchCanceled();
    419 }
    420 
    421 void InspectorBackend::pushNodeByPathToFrontend(long callId, const String& path)
    422 {
    423     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    424         domAgent->pushNodeByPathToFrontend(callId, path);
    425 }
    426 
    427121void InspectorBackend::clearConsoleMessages(long callId)
    428122{
    429     if (m_inspectorController) {
    430         m_inspectorController->clearConsoleMessages();
    431         if (RemoteInspectorFrontend* frontend = remoteFrontend())
    432             frontend->didClearConsoleMessages(callId);
    433     }
    434 }
    435 
    436 void InspectorBackend::getStyles(long callId, long nodeId, bool authorOnly)
    437 {
    438     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    439         domAgent->getStyles(callId, nodeId, authorOnly);
    440 }
    441 
    442 void InspectorBackend::getAllStyles(long callId)
    443 {
    444     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    445         domAgent->getAllStyles(callId);
    446 }
    447 
    448 void InspectorBackend::getInlineStyle(long callId, long nodeId)
    449 {
    450     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    451         domAgent->getInlineStyle(callId, nodeId);
    452 }
    453 
    454 void InspectorBackend::getComputedStyle(long callId, long nodeId)
    455 {
    456     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    457         domAgent->getComputedStyle(callId, nodeId);
    458 }
    459 
    460 void InspectorBackend::getStyleSheet(long callId, long styleSheetId)
    461 {
    462     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    463         domAgent->getStyleSheet(callId, styleSheetId);
    464 }
    465 
    466 void InspectorBackend::getRuleRanges(long callId, long styleSheetId)
    467 {
    468     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    469         domAgent->getRuleRanges(callId, styleSheetId);
    470 }
    471 
    472 void InspectorBackend::applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName)
    473 {
    474     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    475         domAgent->applyStyleText(callId, styleId, styleText, propertyName);
    476 }
    477 
    478 void InspectorBackend::setStyleText(long callId, long styleId, const String& cssText)
    479 {
    480     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    481         domAgent->setStyleText(callId, styleId, cssText);
    482 }
    483 
    484 void InspectorBackend::setStyleProperty(long callId, long styleId, const String& name, const String& value)
    485 {
    486     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    487         domAgent->setStyleProperty(callId, styleId, name, value);
    488 }
    489 
    490 void InspectorBackend::toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled)
    491 {
    492     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    493         domAgent->toggleStyleEnabled(callId, styleId, propertyName, disabled);
    494 }
    495 
    496 void InspectorBackend::setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId)
    497 {
    498     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    499         domAgent->setRuleSelector(callId, ruleId, selector, selectedNodeId);
    500 }
    501 
    502 void InspectorBackend::addRule(long callId, const String& selector, long selectedNodeId)
    503 {
    504     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    505         domAgent->addRule(callId, selector, selectedNodeId);
    506 }
    507 
    508 void InspectorBackend::highlightDOMNode(long nodeId)
    509 {
    510     if (m_inspectorController)
    511         m_inspectorController->highlightDOMNode(nodeId);
    512 }
    513 
    514 void InspectorBackend::hideDOMNodeHighlight()
    515 {
    516     if (m_inspectorController)
    517         m_inspectorController->hideDOMNodeHighlight();
    518 }
    519 
    520 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    521 void InspectorBackend::getApplicationCaches(long callId)
    522 {
    523     if (InspectorApplicationCacheAgent* agent = inspectorApplicationCacheAgent())
    524         agent->getApplicationCaches(callId);
    525 }
    526 #endif
    527 
    528 void InspectorBackend::getCookies(long callId)
    529 {
    530     if (!m_inspectorController)
    531         return;
    532     m_inspectorController->getCookies(callId);
    533 }
    534 
    535 void InspectorBackend::deleteCookie(const String& cookieName, const String& domain)
    536 {
    537     if (!m_inspectorController)
    538         return;
    539     m_inspectorController->deleteCookie(cookieName, domain);
     123    m_inspectorController->clearConsoleMessages();
     124    if (RemoteInspectorFrontend* frontend = remoteFrontend())
     125        frontend->didClearConsoleMessages(callId);
    540126}
    541127
    542128void InspectorBackend::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
    543129{
    544     if (!m_inspectorController)
    545         return;
    546     m_inspectorController->injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
    547 }
    548 
    549 void InspectorBackend::didEvaluateForTestInFrontend(long callId, const String& jsonResult)
    550 {
    551130    if (m_inspectorController)
    552         m_inspectorController->didEvaluateForTestInFrontend(callId, jsonResult);
     131        m_inspectorController->injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
    553132}
    554133
    … …  
    570149#endif
    571150
    572 #if ENABLE(DOM_STORAGE)
    573 void InspectorBackend::getDOMStorageEntries(long callId, long storageId)
    574 {
    575     if (m_inspectorController)
    576         m_inspectorController->getDOMStorageEntries(callId, storageId);
    577 }
    578 
    579 void InspectorBackend::setDOMStorageItem(long callId, long storageId, const String& key, const String& value)
    580 {
    581     if (m_inspectorController)
    582         m_inspectorController->setDOMStorageItem(callId, storageId, key, value);
    583 }
    584 
    585 void InspectorBackend::removeDOMStorageItem(long callId, long storageId, const String& key)
    586 {
    587     if (m_inspectorController)
    588         m_inspectorController->removeDOMStorageItem(callId, storageId, key);
    589 }
    590 #endif
    591 
    592 InspectorDOMAgent* InspectorBackend::inspectorDOMAgent()
    593 {
    594     if (!m_inspectorController)
    595         return 0;
    596     return m_inspectorController->domAgent();
    597 }
    598 
    599 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    600 InspectorApplicationCacheAgent* InspectorBackend::inspectorApplicationCacheAgent()
    601 {
    602     if (!m_inspectorController)
    603         return 0;
    604     return m_inspectorController->applicationCacheAgent();
    605 }
    606 #endif
    607 
    608151InspectorFrontend* InspectorBackend::inspectorFrontend()
    609152{
    610     if (!m_inspectorController)
    611         return 0;
    612153    return m_inspectorController->m_frontend.get();
    613154}
    … …  
    615156RemoteInspectorFrontend* InspectorBackend::remoteFrontend()
    616157{
    617     if (!m_inspectorController)
    618         return 0;
    619158    return m_inspectorController->m_remoteFrontend.get();
    620 }
    621 
    622 void InspectorBackend::addScriptToEvaluateOnLoad(const String& source)
    623 {
    624     if (m_inspectorController)
    625         m_inspectorController->addScriptToEvaluateOnLoad(source);
    626 }
    627 
    628 void InspectorBackend::removeAllScriptsToEvaluateOnLoad()
    629 {
    630     if (m_inspectorController)
    631         m_inspectorController->removeAllScriptsToEvaluateOnLoad();
    632159}
    633160

  • trunk/WebCore/inspector/InspectorBackend.h

    r64534 r64536  
    3838namespace WebCore {
    3939
    40 class CachedResource;
    41 class Database;
    4240class InspectorApplicationCacheAgent;
    4341class InspectorDOMAgent;
    4442class InspectorFrontend;
    45 class Node;
    4643class RemoteInspectorFrontend;
    47 class Storage;
    4844
    4945class InspectorBackend : public RefCounted<InspectorBackend>
    … …  
    5854
    5955    InspectorController* inspectorController() { return m_inspectorController; }
     56    InspectorDOMAgent* inspectorDOMAgent() { return m_inspectorController->domAgent(); }
     57#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     58    InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() { return m_inspectorController->applicationCacheAgent(); }
     59#endif
    6060    void disconnectController() { m_inspectorController = 0; }
    61 
    62     void saveApplicationSettings(const String&);
    63     void saveSessionSettings(const String&);
    64 
    65     void storeLastActivePanel(const String& panelName);
    66 
    67     void enableSearchingForNode();
    68     void disableSearchingForNode();
    69 
    70     void enableMonitoringXHR();
    71     void disableMonitoringXHR();
    72 
    73     void enableResourceTracking(bool always);
    74     void disableResourceTracking(bool always);
    75     void getResourceContent(long callId, unsigned long identifier);
    76     void reloadPage();
    77 
    78     void startTimelineProfiler();
    79     void stopTimelineProfiler();
    8061
    8162#if ENABLE(JAVASCRIPT_DEBUGGER)
    8263    void enableDebugger(bool always);
    83     void disableDebugger(bool always);
    84 
    85     void setBreakpoint(long callId, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition);
    86     void removeBreakpoint(const String& sourceID, unsigned lineNumber);
    87     void activateBreakpoints();
    88     void deactivateBreakpoints();
    89 
    90     void pause();
    91     void resume();
    92 
    93     void stepOverStatement();
    94     void stepIntoStatement();
    95     void stepOutOfFunction();
    96 
    97     void setPauseOnExceptionsState(long pauseState);
    98 
    99     void editScriptSource(long callId, const String& sourceID, const String& newContent);
    100     void getScriptSource(long callId, const String& sourceID);
    101 
    102     void enableProfiler(bool always);
    103     void disableProfiler(bool always);
    104 
    105     void startProfiling();
    106     void stopProfiling();
    107 
    108     void getProfileHeaders(long callId);
    109     void getProfile(long callId, unsigned uid);
    110 
    111     void removeProfile(unsigned uid);
    112     void clearProfiles();
    113 
    11464    void takeHeapSnapshot();
    11565    void getProfilerLogLines(long callId, long position);
    … …  
    11868    void setInjectedScriptSource(const String& source);
    11969    void dispatchOnInjectedScript(long callId, long injectedScriptId, const String& methodName, const String& arguments, bool async);
    120     void addScriptToEvaluateOnLoad(const String& source);
    121     void removeAllScriptsToEvaluateOnLoad();
    122 
    123     void getChildNodes(long callId, long nodeId);
    124     void setAttribute(long callId, long elementId, const String& name, const String& value);
    125     void removeAttribute(long callId, long elementId, const String& name);
    126     void setTextNodeValue(long callId, long nodeId, const String& value);
    127     void getEventListenersForNode(long callId, long nodeId);
    128     void copyNode(long nodeId);
    129     void removeNode(long callId, long nodeId);
    130     void changeTagName(long callId, long nodeId, const String& tagName);
    131     void getOuterHTML(long callId, long nodeId);
    132     void setOuterHTML(long callId, long nodeId, const String& outerHTML);
    133     void addInspectedNode(long nodeId);
    134     void performSearch(const String& query, bool runSynchronously);
    135     void searchCanceled();
    136     void pushNodeByPathToFrontend(long callId, const String& path);
    137 
    13870    void clearConsoleMessages(long callId);
    139 
    140     void getStyles(long callId, long nodeId, bool authOnly);
    141     void getAllStyles(long callId);
    142     void getInlineStyle(long callId, long nodeId);
    143     void getComputedStyle(long callId, long nodeId);
    144     void getStyleSheet(long callId, long styleSheetId);
    145     void getRuleRanges(long callId, long styleSheetId);
    146     void applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName);
    147     void setStyleText(long callId, long styleId, const String& cssText);
    148     void setStyleProperty(long callId, long styleId, const String& name, const String& value);
    149     void toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled);
    150     void setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId);
    151     void addRule(long callId, const String& selector, long selectedNodeId);
    152 
    153     void highlightDOMNode(long nodeId);
    154     void hideDOMNodeHighlight();
    155 
    156     void getCookies(long callId);
    157     void deleteCookie(const String& cookieName, const String& domain);
    158 
    159 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    160     void getApplicationCaches(long callId);
    161 #endif
    16271
    16372    // Generic code called from custom implementations.
    16473    void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
    165     void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
    16674
    16775#if ENABLE(DATABASE)
    … …  
    16977#endif
    17078
    171 #if ENABLE(DOM_STORAGE)
    172     void getDOMStorageEntries(long callId, long storageId);
    173     void setDOMStorageItem(long callId, long storageId, const String& key, const String& value);
    174     void removeDOMStorageItem(long callId, long storageId, const String& key);
    175 #endif
    176 
    17779private:
    17880    InspectorBackend(InspectorController* inspectorController);
    179     InspectorDOMAgent* inspectorDOMAgent();
    180 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    181     InspectorApplicationCacheAgent* inspectorApplicationCacheAgent();
    182 #endif
    18381    InspectorFrontend* inspectorFrontend();
    18482    RemoteInspectorFrontend* remoteFrontend();
    185     Node* nodeForId(long nodeId);
    18683
    18784    InspectorController* m_inspectorController;

  • trunk/WebCore/inspector/InspectorController.h

    r64534 r64536  
    290290
    291291    friend class InspectorBackend;
     292    friend class InspectorBackendDispatcher;
    292293    friend class InjectedScriptHost;
    293294
Note: See TracChangeset for help on using the changeset viewer.