Changeset 86752 in webkit
- Timestamp:
- May 18, 2011 5:04:35 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/http/tests/inspector/debugger-test.js
r83290 r86752 107 107 for (var i = 0; i < callFrames.length; i++) { 108 108 var frame = callFrames[i]; 109 var script = WebInspector.debuggerModel.scriptForSourceID(frame.location.sourceI D);109 var script = WebInspector.debuggerModel.scriptForSourceID(frame.location.sourceId); 110 110 var url; 111 111 if (script) -
trunk/Source/WebCore/ChangeLog
r86751 r86752 1 2011-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 1 58 2011-05-18 Sheriff Bot <webkit.review.bot@gmail.com> 2 59 -
trunk/Source/WebCore/inspector/InjectedScriptSource.js
r86751 r86752 455 455 this.id = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + "}"; 456 456 this.functionName = (callFrame.type === "function" ? callFrame.functionName : ""); 457 this.location = { sourceI D: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };457 this.location = { sourceId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column }; 458 458 this.scopeChain = this._wrapScopeChain(callFrame); 459 459 } -
trunk/Source/WebCore/inspector/Inspector.json
r86751 r86752 433 433 { "name": "requestHeadersText", "type": "string", "optional": true, "description": "HTTP request headers text." }, 434 434 { "name": "connectionReused", "type": "boolean", "description": "Specifies whether physical connection was actually reused for this request." }, 435 { "name": "connectionI D", "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." }, 436 436 { "name": "fromDiskCache", "type": "boolean", "optional": true, "description": "Specifies that the resource was loaded from the disk cache." }, 437 437 { "name": "timing", "$ref": "ResourceTiming", "optional": true, "description": "Timing information for the given request." } … … 1342 1342 "type": "object", 1343 1343 "properties": [ 1344 { "name": "sourceI D", "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>" }, 1345 1345 { "name": "lineNumber", "type": "integer", "description": "Line number in the script." }, 1346 1346 { "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number in the script." } … … 1449 1449 "name": "editScriptSource", 1450 1450 "parameters": [ 1451 { "name": "sourceI D", "type": "string", "description": "Id of the script to edit." },1451 { "name": "sourceId", "type": "string", "description": "Id of the script to edit." }, 1452 1452 { "name": "scriptSource", "type": "string", "description": "New content of the script." } 1453 1453 ], … … 1460 1460 "name": "getScriptSource", 1461 1461 "parameters": [ 1462 { "name": "sourceI D", "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." } 1463 1463 ], 1464 1464 "returns": [ … … 1501 1501 "name": "scriptParsed", 1502 1502 "parameters": [ 1503 { "name": "sourceI D", "type": "string", "description": "Identifier of the script parsed." },1503 { "name": "sourceId", "type": "string", "description": "Identifier of the script parsed." }, 1504 1504 { "name": "url", "type": "string", "description": "URL of the script parsed (if any)." }, 1505 1505 { "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 132 132 } 133 133 134 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceI D)135 { 136 if (!m_inspectorAgent->enabled()) 137 return; 138 addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, sourceI D)));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))); 139 139 } 140 140 -
trunk/Source/WebCore/inspector/InspectorConsoleAgent.h
r86751 r86752 67 67 68 68 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& sourceI D);69 void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceId); 70 70 71 71 void startTiming(const String& title); -
trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h
r86751 r86752 47 47 } 48 48 49 inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceI D)49 inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId) 50 50 { 51 51 #if ENABLE(INSPECTOR) 52 52 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page)) 53 addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, lineNumber, sourceI D);53 addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, lineNumber, sourceId); 54 54 #endif 55 55 } -
trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
r86751 r86752 194 194 static bool parseLocation(ErrorString* errorString, RefPtr<InspectorObject> location, String* sourceId, int* lineNumber, int* columnNumber) 195 195 { 196 if (!location->getString("sourceI D", sourceId) || !location->getNumber("lineNumber", lineNumber)) {196 if (!location->getString("sourceId", sourceId) || !location->getNumber("lineNumber", lineNumber)) { 197 197 // FIXME: replace with input validation. 198 198 *errorString = "sourceId and lineNumber are required."; … … 280 280 281 281 RefPtr<InspectorObject> location = InspectorObject::create(); 282 location->setString("sourceI D", sourceId);282 location->setString("sourceId", sourceId); 283 283 location->setNumber("lineNumber", actualLineNumber); 284 284 location->setNumber("columnNumber", actualColumnNumber); … … 286 286 } 287 287 288 void InspectorDebuggerAgent::editScriptSource(ErrorString* error, const String& sourceI D, const String& newContent, RefPtr<InspectorArray>* newCallFrames)289 { 290 if (scriptDebugServer().editScriptSource(sourceI D, newContent, error, &m_currentCallStack))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)) 291 291 *newCallFrames = currentCallFrames(); 292 292 } 293 293 294 void InspectorDebuggerAgent::getScriptSource(ErrorString*, const String& sourceI D, String* scriptSource)295 { 296 *scriptSource = m_scripts.get(sourceI D).data;294 void InspectorDebuggerAgent::getScriptSource(ErrorString*, const String& sourceId, String* scriptSource) 295 { 296 *scriptSource = m_scripts.get(sourceId).data; 297 297 } 298 298 … … 384 384 // JavaScriptDebugListener functions 385 385 386 void InspectorDebuggerAgent::didParseSource(const String& sourceI D, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript)386 void InspectorDebuggerAgent::didParseSource(const String& sourceId, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript) 387 387 { 388 388 // Don't send script content to the front end until it's really needed. 389 m_frontend->scriptParsed(sourceI D, url, startLine, startColumn, endLine, endColumn, isContentScript);390 391 m_scripts.set(sourceI D, 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)); 392 392 393 393 if (url.isEmpty()) … … 405 405 breakpointObject->getNumber("columnNumber", &breakpoint.columnNumber); 406 406 breakpointObject->getString("condition", &breakpoint.condition); 407 RefPtr<InspectorObject> location = resolveBreakpoint(it->first, sourceI D, breakpoint);407 RefPtr<InspectorObject> location = resolveBreakpoint(it->first, sourceId, breakpoint); 408 408 if (location) 409 409 m_frontend->breakpointResolved(it->first, location); -
trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h
r86751 r86752 86 86 void continueToLocation(ErrorString*, PassRefPtr<InspectorObject> location); 87 87 88 void editScriptSource(ErrorString*, const String& sourceI D, const String& newContent, RefPtr<InspectorArray>* newCallFrames);89 void getScriptSource(ErrorString*, const String& sourceI D, String* scriptSource);88 void editScriptSource(ErrorString*, const String& sourceId, const String& newContent, RefPtr<InspectorArray>* newCallFrames); 89 void getScriptSource(ErrorString*, const String& sourceId, String* scriptSource); 90 90 void schedulePauseOnNextStatement(DebuggerEventType type, PassRefPtr<InspectorValue> data); 91 91 void cancelPauseOnNextStatement(); … … 121 121 PassRefPtr<InspectorArray> currentCallFrames(); 122 122 123 virtual void didParseSource(const String& sourceI D, 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); 124 124 virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage); 125 125 virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception); -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r86751 r86752 633 633 } 634 634 635 void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceI D)635 void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId) 636 636 { 637 637 if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent()) 638 consoleAgent->addMessageToConsole(source, type, level, message, lineNumber, sourceI D);638 consoleAgent->addMessageToConsole(source, type, level, message, lineNumber, sourceId); 639 639 } 640 640 -
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
r86751 r86752 262 262 263 263 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& sourceI D);264 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceId); 265 265 static void consoleCountImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>); 266 266 static void startConsoleTimingImpl(InstrumentingAgents*, const String& title); -
trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp
r86751 r86752 150 150 responseObject->setString("mimeType", response.mimeType()); 151 151 responseObject->setBoolean("connectionReused", response.connectionReused()); 152 responseObject->setNumber("connectionI D", response.connectionID());152 responseObject->setNumber("connectionId", response.connectionID()); 153 153 responseObject->setBoolean("fromDiskCache", response.wasCached()); 154 154 if (response.resourceLoadTiming()) -
trunk/Source/WebCore/inspector/ScriptDebugListener.h
r86751 r86752 43 43 virtual ~ScriptDebugListener() { } 44 44 45 virtual void didParseSource(const String& sourceI D, 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; 46 46 virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0; 47 47 virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception) = 0; -
trunk/Source/WebCore/inspector/front-end/DebuggerModel.js
r86751 r86752 125 125 }, 126 126 127 scriptForSourceID: function(sourceI D)128 { 129 return this._scripts[sourceI D];127 scriptForSourceID: function(sourceId) 128 { 129 return this._scripts[sourceId]; 130 130 }, 131 131 … … 138 138 { 139 139 var scripts = []; 140 for (var sourceI Din this._scripts) {141 var script = this._scripts[sourceI D];140 for (var sourceId in this._scripts) { 141 var script = this._scripts[sourceId]; 142 142 if (filter(script)) 143 143 scripts.push(script); … … 146 146 }, 147 147 148 editScriptSource: function(sourceI D, newSource, callback)149 { 150 this._scripts[sourceI D].editSource(newSource, this._didEditScriptSource.bind(this, sourceID, newSource, callback));151 }, 152 153 _didEditScriptSource: function(sourceI D, 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) 154 154 { 155 155 if (!error && callFrames && callFrames.length) … … 180 180 }, 181 181 182 _parsedScriptSource: function(sourceI D, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)183 { 184 var script = new WebInspector.Script(sourceI D, sourceURL, startLine, startColumn, endLine, endColumn, undefined, undefined, isContentScript);185 this._scripts[sourceI D] = 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; 186 186 this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ParsedScriptSource, script); 187 187 }, … … 228 228 }, 229 229 230 scriptParsed: function(sourceI D, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)231 { 232 this._debuggerModel._parsedScriptSource(sourceI D, 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); 233 233 }, 234 234 … … 238 238 }, 239 239 240 breakpointResolved: function(breakpointId, sourceI D, lineNumber, columnNumber)241 { 242 this._debuggerModel._breakpointResolved(breakpointId, sourceI D, lineNumber, columnNumber);240 breakpointResolved: function(breakpointId, sourceId, lineNumber, columnNumber) 241 { 242 this._debuggerModel._breakpointResolved(breakpointId, sourceId, lineNumber, columnNumber); 243 243 } 244 244 } -
trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js
r86751 r86752 98 98 _addScript: function(script) 99 99 { 100 var sourceFileId = this._createSourceFileId(script.sourceURL, script.sourceI D);100 var sourceFileId = this._createSourceFileId(script.sourceURL, script.sourceId); 101 101 var sourceFile = this._sourceFiles[sourceFileId]; 102 102 if (sourceFile) { … … 167 167 function didReceiveSource(oldSource) 168 168 { 169 WebInspector.debuggerModel.editScriptSource(script.sourceI D, newSource, didEditScriptSource.bind(this, oldSource));169 WebInspector.debuggerModel.editScriptSource(script.sourceId, newSource, didEditScriptSource.bind(this, oldSource)); 170 170 } 171 171 }, … … 336 336 { 337 337 var location = mapping.sourceLineToScriptLocation(breakpoint.lineNumber); 338 var script = WebInspector.debuggerModel.scriptForSourceID(location.sourceI D);338 var script = WebInspector.debuggerModel.scriptForSourceID(location.sourceId); 339 339 if (script.sourceURL) 340 340 WebInspector.debuggerModel.setBreakpoint(script.sourceURL, location.lineNumber, location.columnNumber, breakpoint.condition, didSetBreakpoint.bind(this)); 341 341 else { 342 location.sourceI D = script.sourceID;342 location.sourceId = script.sourceId; 343 343 WebInspector.debuggerModel.setBreakpointBySourceId(location, breakpoint.condition, didSetBreakpoint.bind(this)); 344 344 } … … 521 521 var callFrame = callFrames[i]; 522 522 var sourceFile; 523 var script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceI D);523 var script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceId); 524 524 if (script) 525 sourceFile = this._sourceFileForScript(script.sourceURL, script.sourceI D);525 sourceFile = this._sourceFileForScript(script.sourceURL, script.sourceId); 526 526 this._presentationCallFrames.push(new WebInspector.PresenationCallFrame(callFrame, i, sourceFile)); 527 527 } … … 551 551 }, 552 552 553 _sourceFileForScript: function(sourceURL, sourceI D)554 { 555 return this._sourceFiles[this._createSourceFileId(sourceURL, sourceI D)];553 _sourceFileForScript: function(sourceURL, sourceId) 554 { 555 return this._sourceFiles[this._createSourceFileId(sourceURL, sourceId)]; 556 556 }, 557 557 … … 560 560 function filter(script) 561 561 { 562 return this._createSourceFileId(script.sourceURL, script.sourceI D) === sourceFileId;562 return this._createSourceFileId(script.sourceURL, script.sourceId) === sourceFileId; 563 563 } 564 564 return WebInspector.debuggerModel.queryScripts(filter.bind(this))[0]; 565 565 }, 566 566 567 _createSourceFileId: function(sourceURL, sourceI D)567 _createSourceFileId: function(sourceURL, sourceId) 568 568 { 569 569 var prefix = this._formatSourceFiles ? "deobfuscated:" : ""; 570 return prefix + (sourceURL || sourceI D);570 return prefix + (sourceURL || sourceId); 571 571 }, 572 572 … … 655 655 this._index = index; 656 656 this._sourceFile = sourceFile; 657 this._script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceI D);657 this._script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceId); 658 658 } 659 659 -
trunk/Source/WebCore/inspector/front-end/NetworkManager.js
r86751 r86752 99 99 100 100 resource.connectionReused = response.connectionReused; 101 resource.connectionI D = response.connectionID;101 resource.connectionId = response.connectionId; 102 102 103 103 if (response.fromDiskCache) -
trunk/Source/WebCore/inspector/front-end/Script.js
r86751 r86752 24 24 */ 25 25 26 WebInspector.Script = function(sourceI D, sourceURL, startLine, startColumn, endLine, endColumn, errorLine, errorMessage, isContentScript)26 WebInspector.Script = function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, errorLine, errorMessage, isContentScript) 27 27 { 28 this.sourceI D = sourceID;28 this.sourceId = sourceId; 29 29 this.sourceURL = sourceURL; 30 30 this.lineOffset = startLine; … … 50 50 callback(this._source); 51 51 } 52 DebuggerAgent.getScriptSource(this.sourceI D, didGetScriptSource.bind(this));52 DebuggerAgent.getScriptSource(this.sourceId, didGetScriptSource.bind(this)); 53 53 }, 54 54 … … 61 61 callback(error, callFrames); 62 62 } 63 DebuggerAgent.editScriptSource(this.sourceI D, newSource, didEditScriptSource.bind(this));63 DebuggerAgent.editScriptSource(this.sourceId, newSource, didEditScriptSource.bind(this)); 64 64 } 65 65 } -
trunk/Source/WebCore/inspector/front-end/SourceFile.js
r86751 r86752 94 94 if (!this._concatenatedScripts) 95 95 this._concatenatedScripts = {}; 96 if (this._concatenatedScripts[script.sourceI D])96 if (this._concatenatedScripts[script.sourceId]) 97 97 return; 98 98 for (var i = 0; i < this._scripts.length; ++i) 99 this._concatenatedScripts[this._scripts[i].sourceI D] = true;99 this._concatenatedScripts[this._scripts[i].sourceId] = true; 100 100 101 101 this.reload(); … … 193 193 var end = { lineNumber: lineNumber, columnNumber: columnNumber }; 194 194 if (script) 195 scriptRanges.push({ start: start, end: end, sourceI D: script.sourceID});195 scriptRanges.push({ start: start, end: end, sourceId: script.sourceId }); 196 196 } 197 197 … … 290 290 closestScript = script; 291 291 } 292 return { sourceI D: closestScript.sourceID, lineNumber: lineNumber, columnNumber: columnNumber };292 return { sourceId: closestScript.sourceId, lineNumber: lineNumber, columnNumber: columnNumber }; 293 293 } 294 294 }
Note: See TracChangeset
for help on using the changeset viewer.