Changeset 86751 in webkit
- Timestamp:
- May 18, 2011 4:33:52 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r86748 r86751 1 2011-05-18 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86747. 4 http://trac.webkit.org/changeset/86747 5 https://bugs.webkit.org/show_bug.cgi?id=61039 6 7 Breaks JSC debugger tests. (Requested by pfeldman on #webkit). 8 9 * inspector/InjectedScriptSource.js: 10 (): 11 * inspector/Inspector.json: 12 * inspector/InspectorConsoleAgent.cpp: 13 (WebCore::InspectorConsoleAgent::addMessageToConsole): 14 * inspector/InspectorConsoleAgent.h: 15 * inspector/InspectorConsoleInstrumentation.h: 16 (WebCore::InspectorInstrumentation::addMessageToConsole): 17 * inspector/InspectorDebuggerAgent.cpp: 18 (WebCore::parseLocation): 19 (WebCore::InspectorDebuggerAgent::resolveBreakpoint): 20 (WebCore::InspectorDebuggerAgent::editScriptSource): 21 (WebCore::InspectorDebuggerAgent::getScriptSource): 22 (WebCore::InspectorDebuggerAgent::didParseSource): 23 * inspector/InspectorDebuggerAgent.h: 24 * inspector/InspectorInstrumentation.cpp: 25 (WebCore::InspectorInstrumentation::addMessageToConsoleImpl): 26 * inspector/InspectorInstrumentation.h: 27 * inspector/InspectorResourceAgent.cpp: 28 (WebCore::buildObjectForResourceResponse): 29 * inspector/ScriptDebugListener.h: 30 * inspector/front-end/DebuggerModel.js: 31 (WebInspector.DebuggerModel.prototype.scriptForSourceID): 32 (WebInspector.DebuggerModel.prototype.queryScripts): 33 (WebInspector.DebuggerModel.prototype.editScriptSource): 34 (WebInspector.DebuggerModel.prototype._didEditScriptSource): 35 (WebInspector.DebuggerModel.prototype._parsedScriptSource): 36 (WebInspector.DebuggerDispatcher.prototype.scriptParsed): 37 (WebInspector.DebuggerDispatcher.prototype.breakpointResolved): 38 * inspector/front-end/DebuggerPresentationModel.js: 39 (WebInspector.DebuggerPresentationModel.prototype.editScriptSource.didReceiveSource): 40 (WebInspector.DebuggerPresentationModel.prototype.editScriptSource): 41 (WebInspector.DebuggerPresentationModel.prototype._setBreakpointInDebugger.didRequestSourceMapping): 42 (WebInspector.DebuggerPresentationModel.prototype._setBreakpointInDebugger): 43 (WebInspector.DebuggerPresentationModel.prototype._debuggerPaused): 44 (WebInspector.DebuggerPresentationModel.prototype._sourceFileForScript): 45 (WebInspector.DebuggerPresentationModel.prototype._scriptForSourceFileId): 46 (WebInspector.DebuggerPresentationModel.prototype._createSourceFileId): 47 (WebInspector.PresenationCallFrame): 48 * inspector/front-end/NetworkManager.js: 49 (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse): 50 * inspector/front-end/Script.js: 51 (WebInspector.Script): 52 (WebInspector.Script.prototype.requestSource): 53 (WebInspector.Script.prototype.editSource): 54 * inspector/front-end/SourceFile.js: 55 (WebInspector.SourceFile.prototype.forceLoadContent): 56 (WebInspector.SourceFile.prototype._concatenateScriptsContent): 57 (WebInspector.SourceMapping.prototype._sourceLocationToScriptLocation): 58 (WebInspector): 59 1 60 2011-05-18 Abhishek Arya <inferno@chromium.org> 2 61 -
trunk/Source/WebCore/inspector/InjectedScriptSource.js
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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
r86747 r86751 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.