Changeset 80623 in webkit


Ignore:
Timestamp:
Mar 8, 2011 10:32:41 PM (13 years ago)
Author:
loislo@chromium.org
Message:

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

Reviewed by Pavel Feldman.

Web Inspector: remove groupName from objectId.
​https://bugs.webkit.org/show_bug.cgi?id=55825

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

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

Reviewed by Pavel Feldman.

Web Inspector: remove groupName from objectId.
​https://bugs.webkit.org/show_bug.cgi?id=55825

  • inspector/InjectedScriptSource.js:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r80622 r80623  
     12011-03-08  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: remove groupName from objectId.
     6        https://bugs.webkit.org/show_bug.cgi?id=55825
     7
     8        * inspector/protocol/runtime-agent-expected.txt:
     9
    1102011-03-08  Xiaomei Ji  <xji@chromium.org>
    211

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

    r80349 r80623  
    2424                injectedScriptId : <number>
    2525                id : <number>
    26                 groupName : "test"
    2726            }
    2827            type : "object"
    … …  
    3433
    3534-----------------------------------------------------------
    36 RuntimeAgent.evaluateOn({"injectedScriptId":<number>,"id":<number>,"groupName":"test"},"this.assignedByEvaluateOn = \"evaluateOn function works fine\";")
     35RuntimeAgent.evaluateOn({"injectedScriptId":<number>,"id":<number>},"this.assignedByEvaluateOn = \"evaluateOn function works fine\";")
    3736
    3837request:
    … …  
    4544            injectedScriptId : <number>
    4645            id : <number>
    47             groupName : "test"
    4846        }
    4947        expression : "this.assignedByEvaluateOn = "evaluateOn function works fine";"
    … …  
    6563
    6664-----------------------------------------------------------
    67 RuntimeAgent.setPropertyValue({"injectedScriptId":<number>,"id":<number>,"groupName":"test"},"assignedBySetPropertyValue","true")
     65RuntimeAgent.setPropertyValue({"injectedScriptId":<number>,"id":<number>},"assignedBySetPropertyValue","true")
    6866
    6967request:
    … …  
    7674            injectedScriptId : <number>
    7775            id : <number>
    78             groupName : "test"
    7976        }
    8077        propertyName : "assignedBySetPropertyValue"
    … …  
    9289
    9390-----------------------------------------------------------
    94 RuntimeAgent.setPropertyValue({"injectedScriptId":<number>,"id":<number>,"groupName":"test"},"removedBySetPropertyValue","")
     91RuntimeAgent.setPropertyValue({"injectedScriptId":<number>,"id":<number>},"removedBySetPropertyValue","")
    9592
    9693request:
    … …  
    103100            injectedScriptId : <number>
    104101            id : <number>
    105             groupName : "test"
    106102        }
    107103        propertyName : "removedBySetPropertyValue"
    … …  
    119115
    120116-----------------------------------------------------------
    121 RuntimeAgent.getProperties({"injectedScriptId":<number>,"id":<number>,"groupName":"test"},false,false)
     117RuntimeAgent.getProperties({"injectedScriptId":<number>,"id":<number>},false,false)
    122118
    123119request:
    … …  
    130126            injectedScriptId : <number>
    131127            id : <number>
    132             groupName : "test"
    133128        }
    134129        ignoreHasOwnProperty : false
    … …  
    166161                        injectedScriptId : <number>
    167162                        id : <number>
    168                         groupName : "test"
    169163                    }
    170164                    type : "object"
    … …  
    178172
    179173-----------------------------------------------------------
    180 RuntimeAgent.releaseObject({"injectedScriptId":<number>,"id":<number>,"groupName":"test"})
     174RuntimeAgent.releaseObject({"injectedScriptId":<number>,"id":<number>})
    181175
    182176request:
    … …  
    189183            injectedScriptId : <number>
    190184            id : <number>
    191             groupName : "test"
    192185        }
    193186    }

  • trunk/Source/WebCore/ChangeLog

    r80622 r80623  
     12011-03-08  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: remove groupName from objectId.
     6        https://bugs.webkit.org/show_bug.cgi?id=55825
     7
     8        * inspector/InjectedScriptSource.js:
     9
    1102011-03-08  Xiaomei Ji  <xji@chromium.org>
    211

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

    r80349 r80623  
    4747    this._lastBoundObjectId = 1;
    4848    this._idToWrappedObject = {};
     49    this._idToObjectGroupName = {};
    4950    this._objectGroups = {};
    5051}
    … …  
    105106                    }
    106107                    group.push(id);
    107                     objectId.groupName = objectGroupName;
     108                    this._idToObjectGroupName[id] = objectGroupName;
    108109                }
    109110            }
    … …  
    125126            return;
    126127        for (var i = 0; i < group.length; i++)
    127             delete this._idToWrappedObject[group[i]];
     128            this._releaseObject(group[i]);
    128129        delete this._objectGroups[objectGroupName];
    129130    },
    … …  
    144145        var parsedObjectId = this._parseObjectId(objectId);
    145146        var object = this._objectForId(parsedObjectId);
     147        var objectGroupName = this._idToObjectGroupName[parsedObjectId.id];
    146148
    147149        if (!this._isDefined(object))
    … …  
    162164            if (!isGetter) {
    163165                try {
    164                     property.value = this._wrapObject(object[propertyName], parsedObjectId.groupName, abbreviate);
     166                    property.value = this._wrapObject(object[propertyName], objectGroupName, abbreviate);
    165167                } catch(e) {
    166168                    property.value = new InjectedScript.RemoteObject.fromException(e);
    … …  
    214216    {
    215217        var parsedObjectId = this._parseObjectId(objectId);
    216         delete this._idToWrappedObject[parsedObjectId.id];
     218        this._releaseObject(parsedObjectId.id);
     219    },
     220
     221    _releaseObject: function(id)
     222    {
     223        delete this._idToWrappedObject[id];
     224        delete this._idToObjectGroupName[id];
    217225    },
    218226
Note: See TracChangeset for help on using the changeset viewer.