Changeset 80349 in webkit


Ignore:
Timestamp:
Mar 4, 2011 7:05:59 AM (13 years ago)
Author:
loislo@chromium.org
Message:

2011-03-04 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: rename RuntimeAgent's function from releaseWrapperObjectGroup to releaseObjectGroup.
​https://bugs.webkit.org/show_bug.cgi?id=55773

  • inspector/protocol/runtime-agent-expected.txt:
  • inspector/protocol/runtime-agent.html:

2011-03-04 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: rename RuntimeAgent's function from releaseWrapperObjectGroup to releaseObjectGroup.
​https://bugs.webkit.org/show_bug.cgi?id=55773

  • inspector/CodeGeneratorInspector.pm:
  • inspector/InjectedScript.cpp: (WebCore::InjectedScript::releaseObjectGroup):
  • inspector/InjectedScript.h:
  • inspector/InjectedScriptHost.cpp: (WebCore::InjectedScriptHost::releaseObjectGroup):
  • inspector/InjectedScriptHost.h:
  • inspector/InjectedScriptSource.js: (.):
  • inspector/Inspector.idl:
  • inspector/InspectorConsoleAgent.cpp: (WebCore::InspectorConsoleAgent::clearConsoleMessages):
  • inspector/InspectorRuntimeAgent.cpp: (WebCore::InspectorRuntimeAgent::releaseObjectGroup):
  • inspector/InspectorRuntimeAgent.h:
  • inspector/front-end/ConsoleView.js: (WebInspector.ConsoleView.prototype.completions.evaluatedProperties): (WebInspector.ConsoleView.prototype.completions):
  • inspector/front-end/PropertiesSidebarPane.js:
  • inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype._hidePopup):
  • inspector/front-end/WatchExpressionsSidebarPane.js: (WebInspector.WatchExpressionsSection.prototype.update):
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r80345 r80349  
     12011-03-04  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: rename RuntimeAgent's function from releaseWrapperObjectGroup to releaseObjectGroup.
     6        https://bugs.webkit.org/show_bug.cgi?id=55773
     7
     8        * inspector/protocol/runtime-agent-expected.txt:
     9        * inspector/protocol/runtime-agent.html:
     10
    1112011-03-04  Ilya Tikhonovsky  <loislo@chromium.org>
    212

  • trunk/LayoutTests/inspector/protocol/runtime-agent-expected.txt

    r80345 r80349  
    200200
    201201-----------------------------------------------------------
    202 RuntimeAgent.releaseWrapperObjectGroup(<number>,"test")
    203 
    204 request:
    205 {
    206     seq : <number>
    207     domain : "Runtime"
    208     command : "releaseWrapperObjectGroup"
     202RuntimeAgent.releaseObjectGroup(<number>,"test")
     203
     204request:
     205{
     206    seq : <number>
     207    domain : "Runtime"
     208    command : "releaseObjectGroup"
    209209    arguments : {
    210210        injectedScriptId : <number>
    … …  
    226226    setPropertyValue : "checked"
    227227    releaseObject : "checked"
    228     releaseWrapperObjectGroup : "checked"
    229 }
    230 
     228    releaseObjectGroup : "checked"
     229}
     230

  • trunk/LayoutTests/inspector/protocol/runtime-agent.html

    r80342 r80349  
    2424            ["getProperties", result.objectId, false, false],
    2525            ["releaseObject", result.objectId],
    26             ["releaseWrapperObjectGroup", result.objectId.injectedScriptId, 'test']];
     26            ["releaseObjectGroup", result.objectId.injectedScriptId, 'test']];
    2727
    2828        InspectorTest.runProtocolTestSuite("RuntimeAgent", testSuite, ['seq', 'id', 'injectedScriptId']);

  • trunk/Source/WebCore/ChangeLog

    r80348 r80349  
     12011-03-04  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: rename RuntimeAgent's function from releaseWrapperObjectGroup to releaseObjectGroup.
     6        https://bugs.webkit.org/show_bug.cgi?id=55773
     7
     8        * inspector/CodeGeneratorInspector.pm:
     9        * inspector/InjectedScript.cpp:
     10        (WebCore::InjectedScript::releaseObjectGroup):
     11        * inspector/InjectedScript.h:
     12        * inspector/InjectedScriptHost.cpp:
     13        (WebCore::InjectedScriptHost::releaseObjectGroup):
     14        * inspector/InjectedScriptHost.h:
     15        * inspector/InjectedScriptSource.js:
     16        (.):
     17        * inspector/Inspector.idl:
     18        * inspector/InspectorConsoleAgent.cpp:
     19        (WebCore::InspectorConsoleAgent::clearConsoleMessages):
     20        * inspector/InspectorRuntimeAgent.cpp:
     21        (WebCore::InspectorRuntimeAgent::releaseObjectGroup):
     22        * inspector/InspectorRuntimeAgent.h:
     23        * inspector/front-end/ConsoleView.js:
     24        (WebInspector.ConsoleView.prototype.completions.evaluatedProperties):
     25        (WebInspector.ConsoleView.prototype.completions):
     26        * inspector/front-end/PropertiesSidebarPane.js:
     27        * inspector/front-end/SourceFrame.js:
     28        (WebInspector.SourceFrame.prototype._hidePopup):
     29        * inspector/front-end/WatchExpressionsSidebarPane.js:
     30        (WebInspector.WatchExpressionsSection.prototype.update):
     31
    1322011-03-02  Andrey Adaikin  <aandrey@google.com>
    233

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

    r80345 r80349  
    295295    );
    296296    generateFunctions($interface, \%agent);
    297     if (@{%agent->{methodDeclarations}}) {
     297    if (@{$agent{methodDeclarations}}) {
    298298        generateAgentDeclaration($interface, \%agent);
    299299    }

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

    r80342 r80349  
    165165}
    166166
    167 void InjectedScript::releaseWrapperObjectGroup(const String& objectGroup)
    168 {
    169     ASSERT(!hasNoValue());
    170     ScriptFunctionCall releaseFunction(m_injectedScriptObject, "releaseWrapperObjectGroup");
     167void InjectedScript::releaseObjectGroup(const String& objectGroup)
     168{
     169    ASSERT(!hasNoValue());
     170    ScriptFunctionCall releaseFunction(m_injectedScriptObject, "releaseObjectGroup");
    171171    releaseFunction.appendArgument(objectGroup);
    172172    releaseFunction.call();

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

    r80342 r80349  
    6868    PassRefPtr<InspectorObject> wrapNode(Node*, const String& groupName);
    6969    void inspectNode(Node*);
    70     void releaseWrapperObjectGroup(const String&);
     70    void releaseObjectGroup(const String&);
    7171    ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }
    7272

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

    r80204 r80349  
    164164}
    165165
    166 void InjectedScriptHost::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
     166void InjectedScriptHost::releaseObjectGroup(long injectedScriptId, const String& objectGroup)
    167167{
    168168    if (injectedScriptId) {
    169169         InjectedScript injectedScript = m_idToInjectedScript.get(injectedScriptId);
    170170         if (!injectedScript.hasNoValue())
    171              injectedScript.releaseWrapperObjectGroup(objectGroup);
     171             injectedScript.releaseObjectGroup(objectGroup);
    172172    } else {
    173173         // Iterate over all injected scripts if injectedScriptId is not specified.
    174174         for (IdToInjectedScriptMap::iterator it = m_idToInjectedScript.begin(); it != m_idToInjectedScript.end(); ++it)
    175               it->second.releaseWrapperObjectGroup(objectGroup);
     175              it->second.releaseObjectGroup(objectGroup);
    176176    }
    177177}

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

    r80141 r80349  
    9494    InjectedScript injectedScriptForMainFrame();
    9595    void discardInjectedScripts();
    96     void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
     96    void releaseObjectGroup(long injectedScriptId, const String& objectGroup);
    9797
    9898    static bool canAccessInspectedWindow(ScriptState*);

  • trunk/Source/WebCore/inspector/InjectedScriptSource.js

    r80342 r80349  
    119119    },
    120120
    121     releaseWrapperObjectGroup: function(objectGroupName)
     121    releaseObjectGroup: function(objectGroupName)
    122122    {
    123123        var group = this._objectGroups[objectGroupName];
    … …  
    295295            return false;
    296296   
    297         injectedScript.releaseWrapperObjectGroup("backtrace");
     297        injectedScript.releaseObjectGroup("backtrace");
    298298        var result = [];
    299299        var depth = 0;

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

    r80342 r80349  
    7878        void setPropertyValue(in Object objectId, in String propertyName, in String expression, out Value result);
    7979        void releaseObject(in Object objectId);
    80         void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
     80        void releaseObjectGroup(in long injectedScriptId, in String objectGroup);
    8181    };
    8282

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

    r80204 r80349  
    9090    m_expiredConsoleMessageCount = 0;
    9191    m_previousMessage = 0;
    92     m_injectedScriptHost->releaseWrapperObjectGroup(0 /* release the group in all scripts */, "console");
     92    m_injectedScriptHost->releaseObjectGroup(0 /* release the group in all scripts */, "console");
    9393    if (InspectorDOMAgent* domAgent = m_inspectorAgent->domAgent())
    9494        domAgent->releaseDanglingNodes();

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

    r80342 r80349  
    8181}
    8282
    83 void InspectorRuntimeAgent::releaseWrapperObjectGroup(ErrorString*, long injectedScriptId, const String& objectGroup)
     83void InspectorRuntimeAgent::releaseObjectGroup(ErrorString*, long injectedScriptId, const String& objectGroup)
    8484{
    85     m_injectedScriptHost->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
     85    m_injectedScriptHost->releaseObjectGroup(injectedScriptId, objectGroup);
    8686}
    8787

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

    r80342 r80349  
    6565    void getProperties(ErrorString*, PassRefPtr<InspectorObject> objectId, bool ignoreHasOwnProperty, bool abbreviate, RefPtr<InspectorValue>* result);
    6666    void setPropertyValue(ErrorString*, PassRefPtr<InspectorObject> objectId, const String& propertyName, const String& expression, RefPtr<InspectorValue>* result);
    67     void releaseWrapperObjectGroup(ErrorString*, long injectedScriptId, const String& objectGroup);
     67    void releaseObjectGroup(ErrorString*, long injectedScriptId, const String& objectGroup);
    6868
    6969private:

  • trunk/Source/WebCore/inspector/front-end/ConsoleView.js

    r80342 r80349  
    365365        function evaluatedProperties(properties)
    366366        {
    367             RuntimeAgent.releaseWrapperObjectGroup("completion");
     367            RuntimeAgent.releaseObjectGroup("completion");
    368368            var propertyNames = [];
    369369            for (var i = 0; properties && i < properties.length; ++i)

  • trunk/Source/WebCore/inspector/front-end/PropertiesSidebarPane.js

    r80141 r80349  
    4343        }
    4444
    45         RuntimeAgent.releaseWrapperObjectGroup(0, "dom-selection");
     45        RuntimeAgent.releaseObjectGroup(0, "dom-selection");
    4646        WebInspector.RemoteObject.resolveNode(node, nodeResolved.bind(this));
    4747

  • trunk/Source/WebCore/inspector/front-end/SourceFrame.js

    r80342 r80349  
    625625        this._popup.hide();
    626626        delete this._popup;
    627         RuntimeAgent.releaseWrapperObjectGroup(0, this._popoverObjectGroup);
     627        RuntimeAgent.releaseObjectGroup(0, this._popoverObjectGroup);
    628628    },
    629629

  • trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js

    r78717 r80349  
    121121
    122122        // TODO: pass exact injected script id.
    123         RuntimeAgent.releaseWrapperObjectGroup(0, this._watchObjectGroupId)
     123        RuntimeAgent.releaseObjectGroup(0, this._watchObjectGroupId)
    124124        var properties = [];
    125125
Note: See TracChangeset for help on using the changeset viewer.