Changeset 64986 in webkit


Ignore:
Timestamp:
Aug 9, 2010 9:11:11 AM (14 years ago)
Author:
loislo@chromium.org
Message:

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

Reviewed by Pavel Feldman.

Web Inspector: Remove callId argument from all backend agents' methods.
https://bugs.webkit.org/show_bug.cgi?id=43723

  • inspector/CodeGeneratorInspector.pm:
  • inspector/InspectorApplicationCacheAgent.cpp: (WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
  • inspector/InspectorApplicationCacheAgent.h:
  • inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::getProfilerLogLines): (WebCore::InspectorBackend::clearConsoleMessages): (WebCore::InspectorBackend::getDatabaseTableNames):
  • inspector/InspectorBackend.h:
  • inspector/InspectorController.cpp: (WebCore::InspectorController::getCookies): (WebCore::InspectorController::getDOMStorageEntries): (WebCore::InspectorController::setDOMStorageItem): (WebCore::InspectorController::removeDOMStorageItem): (WebCore::InspectorController::getProfileHeaders): (WebCore::InspectorController::getProfile): (WebCore::InspectorController::getResourceContent):
  • inspector/InspectorController.h:
  • inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::getChildNodes): (WebCore::InspectorDOMAgent::setAttribute): (WebCore::InspectorDOMAgent::removeAttribute): (WebCore::InspectorDOMAgent::removeNode): (WebCore::InspectorDOMAgent::changeTagName): (WebCore::InspectorDOMAgent::getOuterHTML): (WebCore::InspectorDOMAgent::setOuterHTML): (WebCore::InspectorDOMAgent::setTextNodeValue): (WebCore::InspectorDOMAgent::getEventListenersForNode): (WebCore::InspectorDOMAgent::getStyles): (WebCore::InspectorDOMAgent::getAllStyles): (WebCore::InspectorDOMAgent::getStyleSheet): (WebCore::InspectorDOMAgent::getRuleRanges): (WebCore::InspectorDOMAgent::getInlineStyle): (WebCore::InspectorDOMAgent::getComputedStyle): (WebCore::InspectorDOMAgent::applyStyleText): (WebCore::InspectorDOMAgent::setStyleText): (WebCore::InspectorDOMAgent::setStyleProperty): (WebCore::InspectorDOMAgent::toggleStyleEnabled): (WebCore::InspectorDOMAgent::setRuleSelector): (WebCore::InspectorDOMAgent::addRule): (WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
  • inspector/InspectorDOMAgent.h:
  • inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::setBreakpoint): (WebCore::InspectorDebuggerAgent::editScriptSource): (WebCore::InspectorDebuggerAgent::getScriptSource):
  • inspector/InspectorDebuggerAgent.h:
Location:
trunk/WebCore
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r64984 r64986  
     12010-08-09  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: Remove callId argument from all backend agents' methods.
     6        https://bugs.webkit.org/show_bug.cgi?id=43723
     7
     8        * inspector/CodeGeneratorInspector.pm:
     9        * inspector/InspectorApplicationCacheAgent.cpp:
     10        (WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
     11        * inspector/InspectorApplicationCacheAgent.h:
     12        * inspector/InspectorBackend.cpp:
     13        (WebCore::InspectorBackend::getProfilerLogLines):
     14        (WebCore::InspectorBackend::clearConsoleMessages):
     15        (WebCore::InspectorBackend::getDatabaseTableNames):
     16        * inspector/InspectorBackend.h:
     17        * inspector/InspectorController.cpp:
     18        (WebCore::InspectorController::getCookies):
     19        (WebCore::InspectorController::getDOMStorageEntries):
     20        (WebCore::InspectorController::setDOMStorageItem):
     21        (WebCore::InspectorController::removeDOMStorageItem):
     22        (WebCore::InspectorController::getProfileHeaders):
     23        (WebCore::InspectorController::getProfile):
     24        (WebCore::InspectorController::getResourceContent):
     25        * inspector/InspectorController.h:
     26        * inspector/InspectorDOMAgent.cpp:
     27        (WebCore::InspectorDOMAgent::getChildNodes):
     28        (WebCore::InspectorDOMAgent::setAttribute):
     29        (WebCore::InspectorDOMAgent::removeAttribute):
     30        (WebCore::InspectorDOMAgent::removeNode):
     31        (WebCore::InspectorDOMAgent::changeTagName):
     32        (WebCore::InspectorDOMAgent::getOuterHTML):
     33        (WebCore::InspectorDOMAgent::setOuterHTML):
     34        (WebCore::InspectorDOMAgent::setTextNodeValue):
     35        (WebCore::InspectorDOMAgent::getEventListenersForNode):
     36        (WebCore::InspectorDOMAgent::getStyles):
     37        (WebCore::InspectorDOMAgent::getAllStyles):
     38        (WebCore::InspectorDOMAgent::getStyleSheet):
     39        (WebCore::InspectorDOMAgent::getRuleRanges):
     40        (WebCore::InspectorDOMAgent::getInlineStyle):
     41        (WebCore::InspectorDOMAgent::getComputedStyle):
     42        (WebCore::InspectorDOMAgent::applyStyleText):
     43        (WebCore::InspectorDOMAgent::setStyleText):
     44        (WebCore::InspectorDOMAgent::setStyleProperty):
     45        (WebCore::InspectorDOMAgent::toggleStyleEnabled):
     46        (WebCore::InspectorDOMAgent::setRuleSelector):
     47        (WebCore::InspectorDOMAgent::addRule):
     48        (WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
     49        * inspector/InspectorDOMAgent.h:
     50        * inspector/InspectorDebuggerAgent.cpp:
     51        (WebCore::InspectorDebuggerAgent::setBreakpoint):
     52        (WebCore::InspectorDebuggerAgent::editScriptSource):
     53        (WebCore::InspectorDebuggerAgent::getScriptSource):
     54        * inspector/InspectorDebuggerAgent.h:
     55
    1562010-08-09  François Sausset  <sausset@gmail.com>
    257
  • trunk/WebCore/inspector/CodeGeneratorInspector.pm

    r64981 r64986  
    348348    }
    349349
    350 
    351     my $args = join(", ", (map($_->name, @inArgs), map("&" . $_->name, @outArgs)));
     350    my $async = $function->signature->extendedAttributes->{"async"};
     351    my $args = join(", ", (grep($async || !($_ eq "callId"), map($_->name, @inArgs)), map("&" . $_->name, @outArgs)));
    352352    push(@function, "    $handlerAccessor->$functionName($args);");
    353353
    354354    # The results of function call should be transfered back to frontend (except async methods - need to fix that).
    355     if (scalar(grep($_->name eq "callId", @inArgs)) && !$function->signature->extendedAttributes->{"async"}) {
     355    if (scalar(grep($_->name eq "callId", @inArgs)) && !$async) {
    356356        my @pushArguments = map("        arguments->push" . $typeTransform{$_->type}->{"accessorSuffix"} . "(" . $_->name . ");", @outArgs);
    357357        my $customResponse = $function->signature->extendedAttributes->{"customResponse"};
  • trunk/WebCore/inspector/InspectorApplicationCacheAgent.cpp

    r64770 r64986  
    6262}
    6363
    64 void InspectorApplicationCacheAgent::getApplicationCaches(long, RefPtr<InspectorValue>* applicationCaches)
     64void InspectorApplicationCacheAgent::getApplicationCaches(RefPtr<InspectorValue>* applicationCaches)
    6565{
    6666    DocumentLoader* documentLoader = m_inspectorController->inspectedPage()->mainFrame()->loader()->documentLoader();
  • trunk/WebCore/inspector/InspectorApplicationCacheAgent.h

    r64770 r64986  
    5252
    5353    // From Frontend
    54     void getApplicationCaches(long callId, RefPtr<InspectorValue>* applicationCaches);
     54    void getApplicationCaches(RefPtr<InspectorValue>* applicationCaches);
    5555
    5656private:
  • trunk/WebCore/inspector/InspectorBackend.cpp

    r64951 r64986  
    7373}
    7474
    75 void InspectorBackend::getProfilerLogLines(long, long position, long* outPosition, String* data)
     75void InspectorBackend::getProfilerLogLines(long position, long* outPosition, String* data)
    7676{
    7777    // FIXME: we should make inspector dispatcher pluggable, so that embedders could contribute APIs instead of polluting the core one
     
    109109}
    110110
    111 void InspectorBackend::clearConsoleMessages(long)
     111void InspectorBackend::clearConsoleMessages()
    112112{
    113113    m_inspectorController->clearConsoleMessages();
     
    120120
    121121#if ENABLE(DATABASE)
    122 void InspectorBackend::getDatabaseTableNames(long, long databaseId, RefPtr<InspectorArray>* names)
     122void InspectorBackend::getDatabaseTableNames(long databaseId, RefPtr<InspectorArray>* names)
    123123{
    124124    Database* database = m_inspectorController->databaseForId(databaseId);
  • trunk/WebCore/inspector/InspectorBackend.h

    r64770 r64986  
    6363    void enableDebugger(bool always);
    6464    void takeHeapSnapshot();
    65     void getProfilerLogLines(long callId, long position, long* outPosition, String* data);
     65    void getProfilerLogLines(long position, long* outPosition, String* data);
    6666#endif
    6767
    6868    void setInjectedScriptSource(const String& source);
    6969    void dispatchOnInjectedScript(long callId, long injectedScriptId, const String& methodName, const String& arguments, bool async, RefPtr<InspectorValue>* result, bool* hadException);
    70     void clearConsoleMessages(long callId);
     70    void clearConsoleMessages();
    7171
    7272    // Generic code called from custom implementations.
     
    7474
    7575#if ENABLE(DATABASE)
    76     void getDatabaseTableNames(long callId, long databaseId, RefPtr<InspectorArray>* names);
     76    void getDatabaseTableNames(long databaseId, RefPtr<InspectorArray>* names);
    7777#endif
    7878
  • trunk/WebCore/inspector/InspectorController.cpp

    r64973 r64986  
    12751275#endif
    12761276
    1277 void InspectorController::getCookies(long, RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString)
     1277void InspectorController::getCookies(RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString)
    12781278{
    12791279    // If we can get raw cookies.
     
    13961396}
    13971397
    1398 void InspectorController::getDOMStorageEntries(long, long storageId, RefPtr<InspectorArray>* entries)
     1398void InspectorController::getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries)
    13991399{
    14001400    InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
     
    14131413}
    14141414
    1415 void InspectorController::setDOMStorageItem(long, long storageId, const String& key, const String& value, bool* success)
     1415void InspectorController::setDOMStorageItem(long storageId, const String& key, const String& value, bool* success)
    14161416{
    14171417    InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
     
    14231423}
    14241424
    1425 void InspectorController::removeDOMStorageItem(long, long storageId, const String& key, bool* success)
     1425void InspectorController::removeDOMStorageItem(long storageId, const String& key, bool* success)
    14261426{
    14271427    InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
     
    14911491}
    14921492
    1493 void InspectorController::getProfileHeaders(long, RefPtr<InspectorArray>* headers)
     1493void InspectorController::getProfileHeaders(RefPtr<InspectorArray>* headers)
    14941494{
    14951495    ProfilesMap::iterator profilesEnd = m_profiles.end();
     
    14981498}
    14991499
    1500 void InspectorController::getProfile(long, unsigned uid, RefPtr<InspectorObject>* profileObject)
     1500void InspectorController::getProfile(unsigned uid, RefPtr<InspectorObject>* profileObject)
    15011501{
    15021502    ProfilesMap::iterator it = m_profiles.find(uid);
     
    19321932}
    19331933
    1934 void InspectorController::getResourceContent(long, unsigned long identifier, String* content)
     1934void InspectorController::getResourceContent(unsigned long identifier, String* content)
    19351935{
    19361936    RefPtr<InspectorResource> resource = m_resources.get(identifier);
  • trunk/WebCore/inspector/InspectorController.h

    r64973 r64986  
    176176    InspectorTimelineAgent* timelineAgent() { return m_timelineAgent.get(); }
    177177
    178     void getCookies(long callId, RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString);
     178    void getCookies(RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString);
    179179    void deleteCookie(const String& cookieName, const String& domain);
    180180
     
    203203    void didUseDOMStorage(StorageArea* storageArea, bool isLocalStorage, Frame* frame);
    204204    void selectDOMStorage(Storage* storage);
    205     void getDOMStorageEntries(long callId, long storageId, RefPtr<InspectorArray>* entries);
    206     void setDOMStorageItem(long callId, long storageId, const String& key, const String& value, bool* success);
    207     void removeDOMStorageItem(long callId, long storageId, const String& key, bool* success);
     205    void getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries);
     206    void setDOMStorageItem(long storageId, const String& key, const String& value, bool* success);
     207    void removeDOMStorageItem(long storageId, const String& key, bool* success);
    208208#endif
    209209
     
    251251#endif
    252252
    253     void evaluateForTestInFrontend(long callId, const String& script);
     253    void evaluateForTestInFrontend(long testCallId, const String& script);
    254254
    255255    InjectedScript injectedScriptForNodeId(long id);
     
    288288    void toggleRecordButton(bool);
    289289    void enableDebuggerFromFrontend(bool always);
    290     void getProfileHeaders(long callId, RefPtr<InspectorArray>* headers);
    291     void getProfile(long callId, unsigned uid, RefPtr<InspectorObject>* profileObject);
     290    void getProfileHeaders(RefPtr<InspectorArray>* headers);
     291    void getProfile(unsigned uid, RefPtr<InspectorObject>* profileObject);
    292292    PassRefPtr<InspectorObject> createProfileHeader(const ScriptProfile& profile);
    293293#endif
     
    310310    void removeResource(InspectorResource*);
    311311    InspectorResource* getTrackedResource(unsigned long identifier);
    312     void getResourceContent(long callId, unsigned long identifier, String* content);
     312    void getResourceContent(unsigned long identifier, String* content);
    313313
    314314    void pruneResources(ResourcesMap*, DocumentLoader* loaderToKeep = 0);
  • trunk/WebCore/inspector/InspectorDOMAgent.cpp

    r64770 r64986  
    385385}
    386386
    387 void InspectorDOMAgent::getChildNodes(long, long nodeId)
     387void InspectorDOMAgent::getChildNodes(long nodeId)
    388388{
    389389    pushChildNodesToFrontend(nodeId);
     
    432432}
    433433
    434 void InspectorDOMAgent::setAttribute(long, long elementId, const String& name, const String& value, bool* success)
     434void InspectorDOMAgent::setAttribute(long elementId, const String& name, const String& value, bool* success)
    435435{
    436436    Node* node = nodeForId(elementId);
     
    443443}
    444444
    445 void InspectorDOMAgent::removeAttribute(long, long elementId, const String& name, bool* success)
     445void InspectorDOMAgent::removeAttribute(long elementId, const String& name, bool* success)
    446446{
    447447    Node* node = nodeForId(elementId);
     
    454454}
    455455
    456 void InspectorDOMAgent::removeNode(long, long nodeId, long* outNodeId)
     456void InspectorDOMAgent::removeNode(long nodeId, long* outNodeId)
    457457{
    458458    Node* node = nodeForId(nodeId);
     
    472472}
    473473
    474 void InspectorDOMAgent::changeTagName(long, long nodeId, const String& tagName, long* newId)
     474void InspectorDOMAgent::changeTagName(long nodeId, const String& tagName, long* newId)
    475475{
    476476    Node* oldNode = nodeForId(nodeId);
     
    507507}
    508508
    509 void InspectorDOMAgent::getOuterHTML(long, long nodeId, WebCore::String* outerHTML)
     509void InspectorDOMAgent::getOuterHTML(long nodeId, WebCore::String* outerHTML)
    510510{
    511511    Node* node = nodeForId(nodeId);
     
    516516}
    517517
    518 void InspectorDOMAgent::setOuterHTML(long, long nodeId, const String& outerHTML, long* newId)
     518void InspectorDOMAgent::setOuterHTML(long nodeId, const String& outerHTML, long* newId)
    519519{
    520520    Node* node = nodeForId(nodeId);
     
    539539}
    540540
    541 void InspectorDOMAgent::setTextNodeValue(long, long nodeId, const String& value, bool* success)
     541void InspectorDOMAgent::setTextNodeValue(long nodeId, const String& value, bool* success)
    542542{
    543543    Node* node = nodeForId(nodeId);
     
    550550}
    551551
    552 void InspectorDOMAgent::getEventListenersForNode(long, long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray)
     552void InspectorDOMAgent::getEventListenersForNode(long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray)
    553553{
    554554    Node* node = nodeForId(nodeId);
     
    972972}
    973973
    974 void InspectorDOMAgent::getStyles(long, long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles)
     974void InspectorDOMAgent::getStyles(long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles)
    975975{
    976976    Node* node = nodeForId(nodeId);
     
    10151015}
    10161016
    1017 void InspectorDOMAgent::getAllStyles(long, RefPtr<InspectorArray>* styles)
     1017void InspectorDOMAgent::getAllStyles(RefPtr<InspectorArray>* styles)
    10181018{
    10191019    for (ListHashSet<RefPtr<Document> >::iterator it = m_documents.begin(); it != m_documents.end(); ++it) {
     
    10271027}
    10281028
    1029 void InspectorDOMAgent::getStyleSheet(long, long styleSheetId, RefPtr<InspectorObject>* styleSheetObject)
     1029void InspectorDOMAgent::getStyleSheet(long styleSheetId, RefPtr<InspectorObject>* styleSheetObject)
    10301030{
    10311031    CSSStyleSheet* styleSheet = cssStore()->styleSheetForId(styleSheetId);
     
    10341034}
    10351035
    1036 void InspectorDOMAgent::getRuleRanges(long, long styleSheetId, RefPtr<InspectorValue>* ruleRange)
     1036void InspectorDOMAgent::getRuleRanges(long styleSheetId, RefPtr<InspectorValue>* ruleRange)
    10371037{
    10381038    CSSStyleSheet* styleSheet = cssStore()->styleSheetForId(styleSheetId);
     
    10561056}
    10571057
    1058 void InspectorDOMAgent::getInlineStyle(long, long nodeId, RefPtr<InspectorValue>* style)
     1058void InspectorDOMAgent::getInlineStyle(long nodeId, RefPtr<InspectorValue>* style)
    10591059{
    10601060    Node* node = nodeForId(nodeId);
     
    10641064}
    10651065
    1066 void InspectorDOMAgent::getComputedStyle(long, long nodeId, RefPtr<InspectorValue>* style)
     1066void InspectorDOMAgent::getComputedStyle(long nodeId, RefPtr<InspectorValue>* style)
    10671067{
    10681068    Node* node = nodeForId(nodeId);
     
    11211121}
    11221122
    1123 void InspectorDOMAgent::applyStyleText(long, long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedPropertiesArray)
     1123void InspectorDOMAgent::applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedPropertiesArray)
    11241124{
    11251125    CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
     
    12031203}
    12041204
    1205 void InspectorDOMAgent::setStyleText(long, long styleId, const String& cssText, bool* success)
     1205void InspectorDOMAgent::setStyleText(long styleId, const String& cssText, bool* success)
    12061206{
    12071207    CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
     
    12131213}
    12141214
    1215 void InspectorDOMAgent::setStyleProperty(long, long styleId, const String& name, const String& value, bool* success)
     1215void InspectorDOMAgent::setStyleProperty(long styleId, const String& name, const String& value, bool* success)
    12161216{
    12171217    CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
     
    12241224}
    12251225
    1226 void InspectorDOMAgent::toggleStyleEnabled(long, long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject)
     1226void InspectorDOMAgent::toggleStyleEnabled(long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject)
    12271227{
    12281228    CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
     
    12491249}
    12501250
    1251 void InspectorDOMAgent::setRuleSelector(long, long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
     1251void InspectorDOMAgent::setRuleSelector(long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
    12521252{
    12531253    CSSStyleRule* rule = cssStore()->ruleForId(ruleId);
     
    12781278}
    12791279
    1280 void InspectorDOMAgent::addRule(long, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
     1280void InspectorDOMAgent::addRule(const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
    12811281{
    12821282    Node* node = nodeForId(selectedNodeId);
     
    15681568}
    15691569
    1570 void InspectorDOMAgent::pushNodeByPathToFrontend(long, const String& path, long* nodeId)
     1570void InspectorDOMAgent::pushNodeByPathToFrontend(const String& path, long* nodeId)
    15711571{
    15721572    if (Node* node = nodeForPath(path))
  • trunk/WebCore/inspector/InspectorDOMAgent.h

    r64770 r64986  
    101101
    102102        // Methods called from the frontend for DOM nodes inspection.
    103         void getChildNodes(long callId, long nodeId);
    104         void setAttribute(long callId, long elementId, const String& name, const String& value, bool* success);
    105         void removeAttribute(long callId, long elementId, const String& name, bool* success);
    106         void removeNode(long callId, long nodeId, long* outNodeId);
    107         void changeTagName(long callId, long nodeId, const String& tagName, long* newId);
    108         void getOuterHTML(long callId, long nodeId, WebCore::String* outerHTML);
    109         void setOuterHTML(long callId, long nodeId, const String& outerHTML, long* newId);
    110         void setTextNodeValue(long callId, long nodeId, const String& value, bool* success);
    111         void getEventListenersForNode(long callId, long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray);
     103        void getChildNodes(long nodeId);
     104        void setAttribute(long elementId, const String& name, const String& value, bool* success);
     105        void removeAttribute(long elementId, const String& name, bool* success);
     106        void removeNode(long nodeId, long* outNodeId);
     107        void changeTagName(long nodeId, const String& tagName, long* newId);
     108        void getOuterHTML(long nodeId, WebCore::String* outerHTML);
     109        void setOuterHTML(long nodeId, const String& outerHTML, long* newId);
     110        void setTextNodeValue(long nodeId, const String& value, bool* success);
     111        void getEventListenersForNode(long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray);
    112112        void addInspectedNode(long nodeId);
    113113        void performSearch(const String& whitespaceTrimmedQuery, bool runSynchronously);
     
    115115
    116116        // Methods called from the frontend for CSS styles inspection.
    117         void getStyles(long callId, long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles);
    118         void getAllStyles(long callId, RefPtr<InspectorArray>* styles);
    119         void getInlineStyle(long callId, long nodeId, RefPtr<InspectorValue>* styles);
    120         void getComputedStyle(long callId, long nodeId, RefPtr<InspectorValue>* styles);
    121         void getStyleSheet(long callId, long styleSheetId, RefPtr<InspectorObject>* styleSheetObject);
    122         void getRuleRanges(long callId, long styleSheetId, RefPtr<InspectorValue>* ruleRange);
    123         void applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedProperties);
    124         void setStyleText(long callId, long styleId, const String& cssText, bool* success);
    125         void setStyleProperty(long callId, long styleId, const String& name, const String& value, bool* success);
    126         void toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject);
    127         void setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
    128         void addRule(long callId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
     117        void getStyles(long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles);
     118        void getAllStyles(RefPtr<InspectorArray>* styles);
     119        void getInlineStyle(long nodeId, RefPtr<InspectorValue>* styles);
     120        void getComputedStyle(long nodeId, RefPtr<InspectorValue>* styles);
     121        void getStyleSheet(long styleSheetId, RefPtr<InspectorObject>* styleSheetObject);
     122        void getRuleRanges(long styleSheetId, RefPtr<InspectorValue>* ruleRange);
     123        void applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedProperties);
     124        void setStyleText(long styleId, const String& cssText, bool* success);
     125        void setStyleProperty(long styleId, const String& name, const String& value, bool* success);
     126        void toggleStyleEnabled(long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject);
     127        void setRuleSelector(long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
     128        void addRule(const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
    129129
    130130        // Methods called from the InspectorController.
     
    139139        long pushNodePathToFrontend(Node* node);
    140140        void pushChildNodesToFrontend(long nodeId);
    141         void pushNodeByPathToFrontend(long callId, const String& path, long* nodeId);
     141        void pushNodeByPathToFrontend(const String& path, long* nodeId);
    142142        long inspectedNode(unsigned long num);
    143143        void copyNode(long nodeId);
  • trunk/WebCore/inspector/InspectorDebuggerAgent.cpp

    r64964 r64986  
    8383}
    8484
    85 void InspectorDebuggerAgent::setBreakpoint(long, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber)
     85void InspectorDebuggerAgent::setBreakpoint(const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber)
    8686{
    8787    ScriptBreakpoint breakpoint(enabled, condition);
     
    128128}
    129129
    130 void InspectorDebuggerAgent::editScriptSource(long, const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames)
     130void InspectorDebuggerAgent::editScriptSource(const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames)
    131131{
    132132    if ((*success = ScriptDebugServer::shared().editScriptSource(sourceID, newContent, *result)))
     
    134134}
    135135
    136 void InspectorDebuggerAgent::getScriptSource(long, const String& sourceID, String* scriptSource)
     136void InspectorDebuggerAgent::getScriptSource(const String& sourceID, String* scriptSource)
    137137{
    138138    *scriptSource = m_scriptIDToContent.get(sourceID);
  • trunk/WebCore/inspector/InspectorDebuggerAgent.h

    r64864 r64986  
    5555    void activateBreakpoints();
    5656    void deactivateBreakpoints();
    57     void setBreakpoint(long callId, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber);
     57    void setBreakpoint(const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber);
    5858    void removeBreakpoint(const String& sourceID, unsigned lineNumber);
    5959
    60     void editScriptSource(long callId, const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames);
    61     void getScriptSource(long callId, const String& sourceID, String* scriptSource);
     60    void editScriptSource(const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames);
     61    void getScriptSource(const String& sourceID, String* scriptSource);
    6262
    6363    void pause();
Note: See TracChangeset for help on using the changeset viewer.