Changeset 86752 in webkit


Ignore:
Timestamp:
May 18, 2011 5:04:35 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

2011-05-18 Pavel Feldman <pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: make "Id" suffixes use consistent case.
https://bugs.webkit.org/show_bug.cgi?id=61028

  • inspector/InjectedScriptSource.js:
  • inspector/Inspector.json:
  • inspector/InspectorConsoleAgent.cpp: (WebCore::InspectorConsoleAgent::addMessageToConsole):
  • inspector/InspectorConsoleAgent.h:
  • inspector/InspectorConsoleInstrumentation.h: (WebCore::InspectorInstrumentation::addMessageToConsole):
  • inspector/InspectorDebuggerAgent.cpp: (WebCore::parseLocation): (WebCore::InspectorDebuggerAgent::resolveBreakpoint): (WebCore::InspectorDebuggerAgent::editScriptSource): (WebCore::InspectorDebuggerAgent::getScriptSource): (WebCore::InspectorDebuggerAgent::didParseSource):
  • inspector/InspectorDebuggerAgent.h:
  • inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
  • inspector/InspectorInstrumentation.h:
  • inspector/InspectorResourceAgent.cpp: (WebCore::buildObjectForResourceResponse):
  • inspector/ScriptDebugListener.h:
  • inspector/front-end/DebuggerModel.js: (WebInspector.DebuggerModel.prototype.scriptForSourceID): (WebInspector.DebuggerModel.prototype.queryScripts): (WebInspector.DebuggerModel.prototype.editScriptSource): (WebInspector.DebuggerModel.prototype._didEditScriptSource): (WebInspector.DebuggerModel.prototype._parsedScriptSource): (WebInspector.DebuggerDispatcher.prototype.scriptParsed): (WebInspector.DebuggerDispatcher.prototype.breakpointResolved):
  • inspector/front-end/DebuggerPresentationModel.js: (WebInspector.DebuggerPresentationModel.prototype.editScriptSource.didReceiveSource): (WebInspector.DebuggerPresentationModel.prototype.editScriptSource): (WebInspector.DebuggerPresentationModel.prototype._setBreakpointInDebugger.didRequestSourceMapping): (WebInspector.DebuggerPresentationModel.prototype._setBreakpointInDebugger): (WebInspector.DebuggerPresentationModel.prototype._debuggerPaused): (WebInspector.DebuggerPresentationModel.prototype._sourceFileForScript): (WebInspector.DebuggerPresentationModel.prototype._scriptForSourceFileId): (WebInspector.DebuggerPresentationModel.prototype._createSourceFileId): (WebInspector.PresenationCallFrame):
  • inspector/front-end/NetworkManager.js: (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
  • inspector/front-end/Script.js: (WebInspector.Script): (WebInspector.Script.prototype.requestSource): (WebInspector.Script.prototype.editSource):
  • inspector/front-end/SourceFile.js: (WebInspector.SourceFile.prototype.forceLoadContent): (WebInspector.SourceFile.prototype._concatenateScriptsContent): (WebInspector.SourceMapping.prototype._sourceLocationToScriptLocation): (WebInspector):
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/http/tests/inspector/debugger-test.js

    r83290 r86752  
    107107    for (var i = 0; i < callFrames.length; i++) {
    108108        var frame = callFrames[i];
    109         var script = WebInspector.debuggerModel.scriptForSourceID(frame.location.sourceID);
     109        var script = WebInspector.debuggerModel.scriptForSourceID(frame.location.sourceId);
    110110        var url;
    111111        if (script)
  • trunk/Source/WebCore/ChangeLog

    r86751 r86752  
     12011-05-18  Pavel Feldman  <pfeldman@google.com>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: make "Id" suffixes use consistent case.
     6        https://bugs.webkit.org/show_bug.cgi?id=61028
     7
     8        * inspector/InjectedScriptSource.js:
     9        * inspector/Inspector.json:
     10        * inspector/InspectorConsoleAgent.cpp:
     11        (WebCore::InspectorConsoleAgent::addMessageToConsole):
     12        * inspector/InspectorConsoleAgent.h:
     13        * inspector/InspectorConsoleInstrumentation.h:
     14        (WebCore::InspectorInstrumentation::addMessageToConsole):
     15        * inspector/InspectorDebuggerAgent.cpp:
     16        (WebCore::parseLocation):
     17        (WebCore::InspectorDebuggerAgent::resolveBreakpoint):
     18        (WebCore::InspectorDebuggerAgent::editScriptSource):
     19        (WebCore::InspectorDebuggerAgent::getScriptSource):
     20        (WebCore::InspectorDebuggerAgent::didParseSource):
     21        * inspector/InspectorDebuggerAgent.h:
     22        * inspector/InspectorInstrumentation.cpp:
     23        (WebCore::InspectorInstrumentation::addMessageToConsoleImpl):
     24        * inspector/InspectorInstrumentation.h:
     25        * inspector/InspectorResourceAgent.cpp:
     26        (WebCore::buildObjectForResourceResponse):
     27        * inspector/ScriptDebugListener.h:
     28        * inspector/front-end/DebuggerModel.js:
     29        (WebInspector.DebuggerModel.prototype.scriptForSourceID):
     30        (WebInspector.DebuggerModel.prototype.queryScripts):
     31        (WebInspector.DebuggerModel.prototype.editScriptSource):
     32        (WebInspector.DebuggerModel.prototype._didEditScriptSource):
     33        (WebInspector.DebuggerModel.prototype._parsedScriptSource):
     34        (WebInspector.DebuggerDispatcher.prototype.scriptParsed):
     35        (WebInspector.DebuggerDispatcher.prototype.breakpointResolved):
     36        * inspector/front-end/DebuggerPresentationModel.js:
     37        (WebInspector.DebuggerPresentationModel.prototype.editScriptSource.didReceiveSource):
     38        (WebInspector.DebuggerPresentationModel.prototype.editScriptSource):
     39        (WebInspector.DebuggerPresentationModel.prototype._setBreakpointInDebugger.didRequestSourceMapping):
     40        (WebInspector.DebuggerPresentationModel.prototype._setBreakpointInDebugger):
     41        (WebInspector.DebuggerPresentationModel.prototype._debuggerPaused):
     42        (WebInspector.DebuggerPresentationModel.prototype._sourceFileForScript):
     43        (WebInspector.DebuggerPresentationModel.prototype._scriptForSourceFileId):
     44        (WebInspector.DebuggerPresentationModel.prototype._createSourceFileId):
     45        (WebInspector.PresenationCallFrame):
     46        * inspector/front-end/NetworkManager.js:
     47        (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
     48        * inspector/front-end/Script.js:
     49        (WebInspector.Script):
     50        (WebInspector.Script.prototype.requestSource):
     51        (WebInspector.Script.prototype.editSource):
     52        * inspector/front-end/SourceFile.js:
     53        (WebInspector.SourceFile.prototype.forceLoadContent):
     54        (WebInspector.SourceFile.prototype._concatenateScriptsContent):
     55        (WebInspector.SourceMapping.prototype._sourceLocationToScriptLocation):
     56        (WebInspector):
     57
    1582011-05-18  Sheriff Bot  <webkit.review.bot@gmail.com>
    259
  • trunk/Source/WebCore/inspector/InjectedScriptSource.js

    r86751 r86752  
    455455    this.id = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + "}";
    456456    this.functionName = (callFrame.type === "function" ? callFrame.functionName : "");
    457     this.location = { sourceID: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };
     457    this.location = { sourceId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };
    458458    this.scopeChain = this._wrapScopeChain(callFrame);
    459459}
  • trunk/Source/WebCore/inspector/Inspector.json

    r86751 r86752  
    433433                    { "name": "requestHeadersText", "type": "string", "optional": true, "description": "HTTP request headers text." },
    434434                    { "name": "connectionReused", "type": "boolean", "description": "Specifies whether physical connection was actually reused for this request." },
    435                     { "name": "connectionID", "type": "number", "description": "Physical connection id that was actually used for this request." },
     435                    { "name": "connectionId", "type": "number", "description": "Physical connection id that was actually used for this request." },
    436436                    { "name": "fromDiskCache", "type": "boolean", "optional": true, "description": "Specifies that the resource was loaded from the disk cache." },
    437437                    { "name": "timing", "$ref": "ResourceTiming", "optional": true, "description": "Timing information for the given request." }
     
    13421342                "type": "object",
    13431343                "properties": [
    1344                     { "name": "sourceID", "type": "string", "description": "Script identifier as reported by the <code>scriptParsed</code>" },
     1344                    { "name": "sourceId", "type": "string", "description": "Script identifier as reported by the <code>scriptParsed</code>" },
    13451345                    { "name": "lineNumber", "type": "integer", "description": "Line number in the script." },
    13461346                    { "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number in the script." }
     
    14491449                "name": "editScriptSource",
    14501450                "parameters": [
    1451                     { "name": "sourceID", "type": "string", "description": "Id of the script to edit." },
     1451                    { "name": "sourceId", "type": "string", "description": "Id of the script to edit." },
    14521452                    { "name": "scriptSource", "type": "string", "description": "New content of the script." }
    14531453                ],
     
    14601460                "name": "getScriptSource",
    14611461                "parameters": [
    1462                     { "name": "sourceID", "type": "string", "description": "Id of the script to get source for." }
     1462                    { "name": "sourceId", "type": "string", "description": "Id of the script to get source for." }
    14631463                ],
    14641464                "returns": [
     
    15011501                "name": "scriptParsed",
    15021502                "parameters": [
    1503                     { "name": "sourceID", "type": "string", "description": "Identifier of the script parsed." },
     1503                    { "name": "sourceId", "type": "string", "description": "Identifier of the script parsed." },
    15041504                    { "name": "url", "type": "string", "description": "URL of the script parsed (if any)." },
    15051505                    { "name": "startLine", "type": "integer", "description": "Line offset of the script within the resource with given URL (for script tags)." },
  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp

    r86751 r86752  
    132132}
    133133
    134 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
    135 {
    136     if (!m_inspectorAgent->enabled())
    137         return;
    138     addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, sourceID)));
     134void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId)
     135{
     136    if (!m_inspectorAgent->enabled())
     137        return;
     138    addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, sourceId)));
    139139}
    140140
  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.h

    r86751 r86752  
    6767
    6868    void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
    69     void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
     69    void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceId);
    7070
    7171    void startTiming(const String& title);
  • trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h

    r86751 r86752  
    4747}
    4848
    49 inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
     49inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId)
    5050{
    5151#if ENABLE(INSPECTOR)
    5252    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
    53         addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, lineNumber, sourceID);
     53        addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, lineNumber, sourceId);
    5454#endif
    5555}
  • trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

    r86751 r86752  
    194194static bool parseLocation(ErrorString* errorString, RefPtr<InspectorObject> location, String* sourceId, int* lineNumber, int* columnNumber)
    195195{
    196     if (!location->getString("sourceID", sourceId) || !location->getNumber("lineNumber", lineNumber)) {
     196    if (!location->getString("sourceId", sourceId) || !location->getNumber("lineNumber", lineNumber)) {
    197197        // FIXME: replace with input validation.
    198198        *errorString = "sourceId and lineNumber are required.";
     
    280280
    281281    RefPtr<InspectorObject> location = InspectorObject::create();
    282     location->setString("sourceID", sourceId);
     282    location->setString("sourceId", sourceId);
    283283    location->setNumber("lineNumber", actualLineNumber);
    284284    location->setNumber("columnNumber", actualColumnNumber);
     
    286286}
    287287
    288 void InspectorDebuggerAgent::editScriptSource(ErrorString* error, const String& sourceID, const String& newContent, RefPtr<InspectorArray>* newCallFrames)
    289 {
    290     if (scriptDebugServer().editScriptSource(sourceID, newContent, error, &m_currentCallStack))
     288void InspectorDebuggerAgent::editScriptSource(ErrorString* error, const String& sourceId, const String& newContent, RefPtr<InspectorArray>* newCallFrames)
     289{
     290    if (scriptDebugServer().editScriptSource(sourceId, newContent, error, &m_currentCallStack))
    291291        *newCallFrames = currentCallFrames();
    292292}
    293293
    294 void InspectorDebuggerAgent::getScriptSource(ErrorString*, const String& sourceID, String* scriptSource)
    295 {
    296     *scriptSource = m_scripts.get(sourceID).data;
     294void InspectorDebuggerAgent::getScriptSource(ErrorString*, const String& sourceId, String* scriptSource)
     295{
     296    *scriptSource = m_scripts.get(sourceId).data;
    297297}
    298298
     
    384384// JavaScriptDebugListener functions
    385385
    386 void InspectorDebuggerAgent::didParseSource(const String& sourceID, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript)
     386void InspectorDebuggerAgent::didParseSource(const String& sourceId, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript)
    387387{
    388388    // Don't send script content to the front end until it's really needed.
    389     m_frontend->scriptParsed(sourceID, url, startLine, startColumn, endLine, endColumn, isContentScript);
    390 
    391     m_scripts.set(sourceID, Script(url, data, startLine, startColumn, endLine, endColumn));
     389    m_frontend->scriptParsed(sourceId, url, startLine, startColumn, endLine, endColumn, isContentScript);
     390
     391    m_scripts.set(sourceId, Script(url, data, startLine, startColumn, endLine, endColumn));
    392392
    393393    if (url.isEmpty())
     
    405405        breakpointObject->getNumber("columnNumber", &breakpoint.columnNumber);
    406406        breakpointObject->getString("condition", &breakpoint.condition);
    407         RefPtr<InspectorObject> location = resolveBreakpoint(it->first, sourceID, breakpoint);
     407        RefPtr<InspectorObject> location = resolveBreakpoint(it->first, sourceId, breakpoint);
    408408        if (location)
    409409            m_frontend->breakpointResolved(it->first, location);
  • trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

    r86751 r86752  
    8686    void continueToLocation(ErrorString*, PassRefPtr<InspectorObject> location);
    8787
    88     void editScriptSource(ErrorString*, const String& sourceID, const String& newContent, RefPtr<InspectorArray>* newCallFrames);
    89     void getScriptSource(ErrorString*, const String& sourceID, String* scriptSource);
     88    void editScriptSource(ErrorString*, const String& sourceId, const String& newContent, RefPtr<InspectorArray>* newCallFrames);
     89    void getScriptSource(ErrorString*, const String& sourceId, String* scriptSource);
    9090    void schedulePauseOnNextStatement(DebuggerEventType type, PassRefPtr<InspectorValue> data);
    9191    void cancelPauseOnNextStatement();
     
    121121    PassRefPtr<InspectorArray> currentCallFrames();
    122122
    123     virtual void didParseSource(const String& sourceID, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript);
     123    virtual void didParseSource(const String& sourceId, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript);
    124124    virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage);
    125125    virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception);
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r86751 r86752  
    633633}
    634634
    635 void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
     635void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId)
    636636{
    637637    if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
    638         consoleAgent->addMessageToConsole(source, type, level, message, lineNumber, sourceID);
     638        consoleAgent->addMessageToConsole(source, type, level, message, lineNumber, sourceId);
    639639}
    640640
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r86751 r86752  
    262262
    263263    static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
    264     static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
     264    static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceId);
    265265    static void consoleCountImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
    266266    static void startConsoleTimingImpl(InstrumentingAgents*, const String& title);
  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r86751 r86752  
    150150    responseObject->setString("mimeType", response.mimeType());
    151151    responseObject->setBoolean("connectionReused", response.connectionReused());
    152     responseObject->setNumber("connectionID", response.connectionID());
     152    responseObject->setNumber("connectionId", response.connectionID());
    153153    responseObject->setBoolean("fromDiskCache", response.wasCached());
    154154    if (response.resourceLoadTiming())
  • trunk/Source/WebCore/inspector/ScriptDebugListener.h

    r86751 r86752  
    4343    virtual ~ScriptDebugListener() { }
    4444
    45     virtual void didParseSource(const String&  sourceID, const String& url, const String& data,  int startLine, int startColumn, int endLine, int endColumn, bool isContentScript) = 0;
     45    virtual void didParseSource(const String&  sourceId, const String& url, const String& data,  int startLine, int startColumn, int endLine, int endColumn, bool isContentScript) = 0;
    4646    virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
    4747    virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception) = 0;
  • trunk/Source/WebCore/inspector/front-end/DebuggerModel.js

    r86751 r86752  
    125125    },
    126126
    127     scriptForSourceID: function(sourceID)
    128     {
    129         return this._scripts[sourceID];
     127    scriptForSourceID: function(sourceId)
     128    {
     129        return this._scripts[sourceId];
    130130    },
    131131
     
    138138    {
    139139        var scripts = [];
    140         for (var sourceID in this._scripts) {
    141             var script = this._scripts[sourceID];
     140        for (var sourceId in this._scripts) {
     141            var script = this._scripts[sourceId];
    142142            if (filter(script))
    143143                scripts.push(script);
     
    146146    },
    147147
    148     editScriptSource: function(sourceID, newSource, callback)
    149     {
    150         this._scripts[sourceID].editSource(newSource, this._didEditScriptSource.bind(this, sourceID, newSource, callback));
    151     },
    152 
    153     _didEditScriptSource: function(sourceID, newSource, callback, error, callFrames)
     148    editScriptSource: function(sourceId, newSource, callback)
     149    {
     150        this._scripts[sourceId].editSource(newSource, this._didEditScriptSource.bind(this, sourceId, newSource, callback));
     151    },
     152
     153    _didEditScriptSource: function(sourceId, newSource, callback, error, callFrames)
    154154    {
    155155        if (!error && callFrames && callFrames.length)
     
    180180    },
    181181
    182     _parsedScriptSource: function(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
    183     {
    184         var script = new WebInspector.Script(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, undefined, undefined, isContentScript);
    185         this._scripts[sourceID] = script;
     182    _parsedScriptSource: function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
     183    {
     184        var script = new WebInspector.Script(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, undefined, undefined, isContentScript);
     185        this._scripts[sourceId] = script;
    186186        this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ParsedScriptSource, script);
    187187    },
     
    228228    },
    229229
    230     scriptParsed: function(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
    231     {
    232         this._debuggerModel._parsedScriptSource(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript);
     230    scriptParsed: function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
     231    {
     232        this._debuggerModel._parsedScriptSource(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript);
    233233    },
    234234
     
    238238    },
    239239
    240     breakpointResolved: function(breakpointId, sourceID, lineNumber, columnNumber)
    241     {
    242         this._debuggerModel._breakpointResolved(breakpointId, sourceID, lineNumber, columnNumber);
     240    breakpointResolved: function(breakpointId, sourceId, lineNumber, columnNumber)
     241    {
     242        this._debuggerModel._breakpointResolved(breakpointId, sourceId, lineNumber, columnNumber);
    243243    }
    244244}
  • trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

    r86751 r86752  
    9898    _addScript: function(script)
    9999    {
    100         var sourceFileId = this._createSourceFileId(script.sourceURL, script.sourceID);
     100        var sourceFileId = this._createSourceFileId(script.sourceURL, script.sourceId);
    101101        var sourceFile = this._sourceFiles[sourceFileId];
    102102        if (sourceFile) {
     
    167167        function didReceiveSource(oldSource)
    168168        {
    169             WebInspector.debuggerModel.editScriptSource(script.sourceID, newSource, didEditScriptSource.bind(this, oldSource));
     169            WebInspector.debuggerModel.editScriptSource(script.sourceId, newSource, didEditScriptSource.bind(this, oldSource));
    170170        }
    171171    },
     
    336336        {
    337337            var location = mapping.sourceLineToScriptLocation(breakpoint.lineNumber);
    338             var script = WebInspector.debuggerModel.scriptForSourceID(location.sourceID);
     338            var script = WebInspector.debuggerModel.scriptForSourceID(location.sourceId);
    339339            if (script.sourceURL)
    340340                WebInspector.debuggerModel.setBreakpoint(script.sourceURL, location.lineNumber, location.columnNumber, breakpoint.condition, didSetBreakpoint.bind(this));
    341341            else {
    342                 location.sourceID = script.sourceID;
     342                location.sourceId = script.sourceId;
    343343                WebInspector.debuggerModel.setBreakpointBySourceId(location, breakpoint.condition, didSetBreakpoint.bind(this));
    344344            }
     
    521521            var callFrame = callFrames[i];
    522522            var sourceFile;
    523             var script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceID);
     523            var script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceId);
    524524            if (script)
    525                 sourceFile = this._sourceFileForScript(script.sourceURL, script.sourceID);
     525                sourceFile = this._sourceFileForScript(script.sourceURL, script.sourceId);
    526526            this._presentationCallFrames.push(new WebInspector.PresenationCallFrame(callFrame, i, sourceFile));
    527527        }
     
    551551    },
    552552
    553     _sourceFileForScript: function(sourceURL, sourceID)
    554     {
    555         return this._sourceFiles[this._createSourceFileId(sourceURL, sourceID)];
     553    _sourceFileForScript: function(sourceURL, sourceId)
     554    {
     555        return this._sourceFiles[this._createSourceFileId(sourceURL, sourceId)];
    556556    },
    557557
     
    560560        function filter(script)
    561561        {
    562             return this._createSourceFileId(script.sourceURL, script.sourceID) === sourceFileId;
     562            return this._createSourceFileId(script.sourceURL, script.sourceId) === sourceFileId;
    563563        }
    564564        return WebInspector.debuggerModel.queryScripts(filter.bind(this))[0];
    565565    },
    566566
    567     _createSourceFileId: function(sourceURL, sourceID)
     567    _createSourceFileId: function(sourceURL, sourceId)
    568568    {
    569569        var prefix = this._formatSourceFiles ? "deobfuscated:" : "";
    570         return prefix + (sourceURL || sourceID);
     570        return prefix + (sourceURL || sourceId);
    571571    },
    572572
     
    655655    this._index = index;
    656656    this._sourceFile = sourceFile;
    657     this._script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceID);
     657    this._script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceId);
    658658}
    659659
  • trunk/Source/WebCore/inspector/front-end/NetworkManager.js

    r86751 r86752  
    9999
    100100        resource.connectionReused = response.connectionReused;
    101         resource.connectionID = response.connectionID;
     101        resource.connectionId = response.connectionId;
    102102
    103103        if (response.fromDiskCache)
  • trunk/Source/WebCore/inspector/front-end/Script.js

    r86751 r86752  
    2424 */
    2525
    26 WebInspector.Script = function(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, errorLine, errorMessage, isContentScript)
     26WebInspector.Script = function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, errorLine, errorMessage, isContentScript)
    2727{
    28     this.sourceID = sourceID;
     28    this.sourceId = sourceId;
    2929    this.sourceURL = sourceURL;
    3030    this.lineOffset = startLine;
     
    5050            callback(this._source);
    5151        }
    52         DebuggerAgent.getScriptSource(this.sourceID, didGetScriptSource.bind(this));
     52        DebuggerAgent.getScriptSource(this.sourceId, didGetScriptSource.bind(this));
    5353    },
    5454
     
    6161            callback(error, callFrames);
    6262        }
    63         DebuggerAgent.editScriptSource(this.sourceID, newSource, didEditScriptSource.bind(this));
     63        DebuggerAgent.editScriptSource(this.sourceId, newSource, didEditScriptSource.bind(this));
    6464    }
    6565}
  • trunk/Source/WebCore/inspector/front-end/SourceFile.js

    r86751 r86752  
    9494        if (!this._concatenatedScripts)
    9595            this._concatenatedScripts = {};
    96         if (this._concatenatedScripts[script.sourceID])
     96        if (this._concatenatedScripts[script.sourceId])
    9797            return;
    9898        for (var i = 0; i < this._scripts.length; ++i)
    99             this._concatenatedScripts[this._scripts[i].sourceID] = true;
     99            this._concatenatedScripts[this._scripts[i].sourceId] = true;
    100100
    101101        this.reload();
     
    193193            var end = { lineNumber: lineNumber, columnNumber: columnNumber };
    194194            if (script)
    195                 scriptRanges.push({ start: start, end: end, sourceID: script.sourceID });
     195                scriptRanges.push({ start: start, end: end, sourceId: script.sourceId });
    196196        }
    197197
     
    290290            closestScript = script;
    291291        }
    292         return { sourceID: closestScript.sourceID, lineNumber: lineNumber, columnNumber: columnNumber };
     292        return { sourceId: closestScript.sourceId, lineNumber: lineNumber, columnNumber: columnNumber };
    293293    }
    294294}
Note: See TracChangeset for help on using the changeset viewer.