Diff
Modified: trunk/Source/WebCore/ChangeLog (86746 => 86747)
--- trunk/Source/WebCore/ChangeLog 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/ChangeLog 2011-05-18 09:48:35 UTC (rev 86747)
@@ -2,6 +2,63 @@
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):
+
+2011-05-18 Pavel Feldman <pfeld...@google.com>
+
+ Reviewed by Yury Semikhatsky.
+
Web Inspector: do not reveal line -1 when navigating to anchor without line specified.
https://bugs.webkit.org/show_bug.cgi?id=60971
Modified: trunk/Source/WebCore/inspector/InjectedScriptSource.js (86746 => 86747)
--- trunk/Source/WebCore/inspector/InjectedScriptSource.js 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InjectedScriptSource.js 2011-05-18 09:48:35 UTC (rev 86747)
@@ -454,7 +454,7 @@
{
this.id = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + "}";
this.functionName = (callFrame.type === "function" ? callFrame.functionName : "");
- this.location = { sourceID: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };
+ this.location = { sourceId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };
this.scopeChain = this._wrapScopeChain(callFrame);
}
Modified: trunk/Source/WebCore/inspector/Inspector.json (86746 => 86747)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-05-18 09:48:35 UTC (rev 86747)
@@ -432,7 +432,7 @@
{ "name": "requestHeaders", "type": "object", "optional": true, "description": "Refined HTTP request headers that were actually transmitted over the network." },
{ "name": "requestHeadersText", "type": "string", "optional": true, "description": "HTTP request headers text." },
{ "name": "connectionReused", "type": "boolean", "description": "Specifies whether physical connection was actually reused for this request." },
- { "name": "connectionID", "type": "number", "description": "Physical connection id that was actually used for this request." },
+ { "name": "connectionId", "type": "number", "description": "Physical connection id that was actually used for this request." },
{ "name": "fromDiskCache", "type": "boolean", "optional": true, "description": "Specifies that the resource was loaded from the disk cache." },
{ "name": "timing", "$ref": "ResourceTiming", "optional": true, "description": "Timing information for the given request." }
]
@@ -1341,7 +1341,7 @@
"id": "Location",
"type": "object",
"properties": [
- { "name": "sourceID", "type": "string", "description": "Script identifier as reported by the <code>scriptParsed</code>" },
+ { "name": "sourceId", "type": "string", "description": "Script identifier as reported by the <code>scriptParsed</code>" },
{ "name": "lineNumber", "type": "integer", "description": "Line number in the script." },
{ "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number in the script." }
],
@@ -1448,7 +1448,7 @@
{
"name": "editScriptSource",
"parameters": [
- { "name": "sourceID", "type": "string", "description": "Id of the script to edit." },
+ { "name": "sourceId", "type": "string", "description": "Id of the script to edit." },
{ "name": "scriptSource", "type": "string", "description": "New content of the script." }
],
"returns": [
@@ -1459,7 +1459,7 @@
{
"name": "getScriptSource",
"parameters": [
- { "name": "sourceID", "type": "string", "description": "Id of the script to get source for." }
+ { "name": "sourceId", "type": "string", "description": "Id of the script to get source for." }
],
"returns": [
{ "name": "scriptSource", "type": "string", "description": "Script source." }
@@ -1500,7 +1500,7 @@
{
"name": "scriptParsed",
"parameters": [
- { "name": "sourceID", "type": "string", "description": "Identifier of the script parsed." },
+ { "name": "sourceId", "type": "string", "description": "Identifier of the script parsed." },
{ "name": "url", "type": "string", "description": "URL of the script parsed (if any)." },
{ "name": "startLine", "type": "integer", "description": "Line offset of the script within the resource with given URL (for script tags)." },
{ "name": "startColumn", "type": "integer", "description": "Column offset of the script within the resource with given URL." },
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-05-18 09:48:35 UTC (rev 86747)
@@ -131,11 +131,11 @@
addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, arguments, callStack)));
}
-void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
+void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId)
{
if (!m_inspectorAgent->enabled())
return;
- addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, sourceID)));
+ addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, sourceId)));
}
void InspectorConsoleAgent::startTiming(const String& title)
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2011-05-18 09:48:35 UTC (rev 86747)
@@ -66,7 +66,7 @@
void clearFrontend();
void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
- void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
+ void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceId);
void startTiming(const String& title);
void stopTiming(const String& title, PassRefPtr<ScriptCallStack>);
Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2011-05-18 09:48:35 UTC (rev 86747)
@@ -46,11 +46,11 @@
#endif
}
-inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
+inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId)
{
#if ENABLE(INSPECTOR)
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, lineNumber, sourceID);
+ addMessageToConsoleImpl(instrumentingAgents, source, type, level, message, lineNumber, sourceId);
#endif
}
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2011-05-18 09:48:35 UTC (rev 86747)
@@ -193,7 +193,7 @@
static bool parseLocation(ErrorString* errorString, RefPtr<InspectorObject> location, String* sourceId, int* lineNumber, int* columnNumber)
{
- if (!location->getString("sourceID", sourceId) || !location->getNumber("lineNumber", lineNumber)) {
+ if (!location->getString("sourceId", sourceId) || !location->getNumber("lineNumber", lineNumber)) {
// FIXME: replace with input validation.
*errorString = "sourceId and lineNumber are required.";
return false;
@@ -279,21 +279,21 @@
debugServerBreakpointIdsIterator->second.append(debugServerBreakpointId);
RefPtr<InspectorObject> location = InspectorObject::create();
- location->setString("sourceID", sourceId);
+ location->setString("sourceId", sourceId);
location->setNumber("lineNumber", actualLineNumber);
location->setNumber("columnNumber", actualColumnNumber);
return location;
}
-void InspectorDebuggerAgent::editScriptSource(ErrorString* error, const String& sourceID, const String& newContent, RefPtr<InspectorArray>* newCallFrames)
+void InspectorDebuggerAgent::editScriptSource(ErrorString* error, const String& sourceId, const String& newContent, RefPtr<InspectorArray>* newCallFrames)
{
- if (scriptDebugServer().editScriptSource(sourceID, newContent, error, &m_currentCallStack))
+ if (scriptDebugServer().editScriptSource(sourceId, newContent, error, &m_currentCallStack))
*newCallFrames = currentCallFrames();
}
-void InspectorDebuggerAgent::getScriptSource(ErrorString*, const String& sourceID, String* scriptSource)
+void InspectorDebuggerAgent::getScriptSource(ErrorString*, const String& sourceId, String* scriptSource)
{
- *scriptSource = m_scripts.get(sourceID).data;
+ *scriptSource = m_scripts.get(sourceId).data;
}
void InspectorDebuggerAgent::schedulePauseOnNextStatement(DebuggerEventType type, PassRefPtr<InspectorValue> data)
@@ -383,12 +383,12 @@
// _javascript_DebugListener functions
-void InspectorDebuggerAgent::didParseSource(const String& sourceID, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript)
+void InspectorDebuggerAgent::didParseSource(const String& sourceId, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript)
{
// Don't send script content to the front end until it's really needed.
- m_frontend->scriptParsed(sourceID, url, startLine, startColumn, endLine, endColumn, isContentScript);
+ m_frontend->scriptParsed(sourceId, url, startLine, startColumn, endLine, endColumn, isContentScript);
- m_scripts.set(sourceID, Script(url, data, startLine, startColumn, endLine, endColumn));
+ m_scripts.set(sourceId, Script(url, data, startLine, startColumn, endLine, endColumn));
if (url.isEmpty())
return;
@@ -404,7 +404,7 @@
breakpointObject->getNumber("lineNumber", &breakpoint.lineNumber);
breakpointObject->getNumber("columnNumber", &breakpoint.columnNumber);
breakpointObject->getString("condition", &breakpoint.condition);
- RefPtr<InspectorObject> location = resolveBreakpoint(it->first, sourceID, breakpoint);
+ RefPtr<InspectorObject> location = resolveBreakpoint(it->first, sourceId, breakpoint);
if (location)
m_frontend->breakpointResolved(it->first, location);
}
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2011-05-18 09:48:35 UTC (rev 86747)
@@ -85,8 +85,8 @@
void removeBreakpoint(ErrorString*, const String& breakpointId);
void continueToLocation(ErrorString*, PassRefPtr<InspectorObject> location);
- void editScriptSource(ErrorString*, const String& sourceID, const String& newContent, RefPtr<InspectorArray>* newCallFrames);
- void getScriptSource(ErrorString*, const String& sourceID, String* scriptSource);
+ void editScriptSource(ErrorString*, const String& sourceId, const String& newContent, RefPtr<InspectorArray>* newCallFrames);
+ void getScriptSource(ErrorString*, const String& sourceId, String* scriptSource);
void schedulePauseOnNextStatement(DebuggerEventType type, PassRefPtr<InspectorValue> data);
void cancelPauseOnNextStatement();
void breakProgram(DebuggerEventType type, PassRefPtr<InspectorValue> data);
@@ -120,7 +120,7 @@
PassRefPtr<InspectorArray> currentCallFrames();
- virtual void didParseSource(const String& sourceID, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript);
+ virtual void didParseSource(const String& sourceId, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript);
virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage);
virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception);
virtual void didContinue();
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-05-18 09:48:35 UTC (rev 86747)
@@ -632,10 +632,10 @@
consoleAgent->addMessageToConsole(source, type, level, message, arguments, callStack);
}
-void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
+void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceId)
{
if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
- consoleAgent->addMessageToConsole(source, type, level, message, lineNumber, sourceID);
+ consoleAgent->addMessageToConsole(source, type, level, message, lineNumber, sourceId);
}
void InspectorInstrumentation::consoleCountImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> stack)
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-05-18 09:48:35 UTC (rev 86747)
@@ -261,7 +261,7 @@
static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned int endLine);
static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
- static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
+ static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceId);
static void consoleCountImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
static void startConsoleTimingImpl(InstrumentingAgents*, const String& title);
static void stopConsoleTimingImpl(InstrumentingAgents*, const String& title, PassRefPtr<ScriptCallStack>);
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (86746 => 86747)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-05-18 09:48:35 UTC (rev 86747)
@@ -149,7 +149,7 @@
responseObject->setString("mimeType", response.mimeType());
responseObject->setBoolean("connectionReused", response.connectionReused());
- responseObject->setNumber("connectionID", response.connectionID());
+ responseObject->setNumber("connectionId", response.connectionID());
responseObject->setBoolean("fromDiskCache", response.wasCached());
if (response.resourceLoadTiming())
responseObject->setObject("timing", buildObjectForTiming(*response.resourceLoadTiming()));
Modified: trunk/Source/WebCore/inspector/ScriptDebugListener.h (86746 => 86747)
--- trunk/Source/WebCore/inspector/ScriptDebugListener.h 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/ScriptDebugListener.h 2011-05-18 09:48:35 UTC (rev 86747)
@@ -42,7 +42,7 @@
public:
virtual ~ScriptDebugListener() { }
- virtual void didParseSource(const String& sourceID, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript) = 0;
+ virtual void didParseSource(const String& sourceId, const String& url, const String& data, int startLine, int startColumn, int endLine, int endColumn, bool isContentScript) = 0;
virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception) = 0;
virtual void didContinue() = 0;
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerModel.js (86746 => 86747)
--- trunk/Source/WebCore/inspector/front-end/DebuggerModel.js 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerModel.js 2011-05-18 09:48:35 UTC (rev 86747)
@@ -124,9 +124,9 @@
return this._scripts;
},
- scriptForSourceID: function(sourceID)
+ scriptForSourceID: function(sourceId)
{
- return this._scripts[sourceID];
+ return this._scripts[sourceId];
},
scriptsForURL: function(url)
@@ -137,20 +137,20 @@
queryScripts: function(filter)
{
var scripts = [];
- for (var sourceID in this._scripts) {
- var script = this._scripts[sourceID];
+ for (var sourceId in this._scripts) {
+ var script = this._scripts[sourceId];
if (filter(script))
scripts.push(script);
}
return scripts;
},
- editScriptSource: function(sourceID, newSource, callback)
+ editScriptSource: function(sourceId, newSource, callback)
{
- this._scripts[sourceID].editSource(newSource, this._didEditScriptSource.bind(this, sourceID, newSource, callback));
+ this._scripts[sourceId].editSource(newSource, this._didEditScriptSource.bind(this, sourceId, newSource, callback));
},
- _didEditScriptSource: function(sourceID, newSource, callback, error, callFrames)
+ _didEditScriptSource: function(sourceId, newSource, callback, error, callFrames)
{
if (!error && callFrames && callFrames.length)
this._debuggerPausedDetails.callFrames = callFrames;
@@ -179,10 +179,10 @@
this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.DebuggerResumed);
},
- _parsedScriptSource: function(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
+ _parsedScriptSource: function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
{
- var script = new WebInspector.Script(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, undefined, undefined, isContentScript);
- this._scripts[sourceID] = script;
+ var script = new WebInspector.Script(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, undefined, undefined, isContentScript);
+ this._scripts[sourceId] = script;
this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ParsedScriptSource, script);
},
@@ -227,9 +227,9 @@
this._debuggerModel._debuggerWasDisabled();
},
- scriptParsed: function(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
+ scriptParsed: function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript)
{
- this._debuggerModel._parsedScriptSource(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript);
+ this._debuggerModel._parsedScriptSource(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript);
},
scriptFailedToParse: function(sourceURL, source, startingLine, errorLine, errorMessage)
@@ -237,8 +237,8 @@
this._debuggerModel._failedToParseScriptSource(sourceURL, source, startingLine, errorLine, errorMessage);
},
- breakpointResolved: function(breakpointId, sourceID, lineNumber, columnNumber)
+ breakpointResolved: function(breakpointId, sourceId, lineNumber, columnNumber)
{
- this._debuggerModel._breakpointResolved(breakpointId, sourceID, lineNumber, columnNumber);
+ this._debuggerModel._breakpointResolved(breakpointId, sourceId, lineNumber, columnNumber);
}
}
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (86746 => 86747)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-18 09:48:35 UTC (rev 86747)
@@ -97,7 +97,7 @@
_addScript: function(script)
{
- var sourceFileId = this._createSourceFileId(script.sourceURL, script.sourceID);
+ var sourceFileId = this._createSourceFileId(script.sourceURL, script.sourceId);
var sourceFile = this._sourceFiles[sourceFileId];
if (sourceFile) {
sourceFile.addScript(script);
@@ -166,7 +166,7 @@
var oldSource = sourceFile.requestContent(didReceiveSource.bind(this));
function didReceiveSource(oldSource)
{
- WebInspector.debuggerModel.editScriptSource(script.sourceID, newSource, didEditScriptSource.bind(this, oldSource));
+ WebInspector.debuggerModel.editScriptSource(script.sourceId, newSource, didEditScriptSource.bind(this, oldSource));
}
},
@@ -335,11 +335,11 @@
function didRequestSourceMapping(mapping)
{
var location = mapping.sourceLineToScriptLocation(breakpoint.lineNumber);
- var script = WebInspector.debuggerModel.scriptForSourceID(location.sourceID);
+ var script = WebInspector.debuggerModel.scriptForSourceID(location.sourceId);
if (script.sourceURL)
WebInspector.debuggerModel.setBreakpoint(script.sourceURL, location.lineNumber, location.columnNumber, breakpoint.condition, didSetBreakpoint.bind(this));
else {
- location.sourceID = script.sourceID;
+ location.sourceId = script.sourceId;
WebInspector.debuggerModel.setBreakpointBySourceId(location, breakpoint.condition, didSetBreakpoint.bind(this));
}
}
@@ -520,9 +520,9 @@
for (var i = 0; i < callFrames.length; ++i) {
var callFrame = callFrames[i];
var sourceFile;
- var script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceID);
+ var script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceId);
if (script)
- sourceFile = this._sourceFileForScript(script.sourceURL, script.sourceID);
+ sourceFile = this._sourceFileForScript(script.sourceURL, script.sourceId);
this._presentationCallFrames.push(new WebInspector.PresenationCallFrame(callFrame, i, sourceFile));
}
var details = WebInspector.debuggerModel.debuggerPausedDetails;
@@ -550,24 +550,24 @@
return this._presentationCallFrames[this._selectedCallFrameIndex];
},
- _sourceFileForScript: function(sourceURL, sourceID)
+ _sourceFileForScript: function(sourceURL, sourceId)
{
- return this._sourceFiles[this._createSourceFileId(sourceURL, sourceID)];
+ return this._sourceFiles[this._createSourceFileId(sourceURL, sourceId)];
},
_scriptForSourceFileId: function(sourceFileId)
{
function filter(script)
{
- return this._createSourceFileId(script.sourceURL, script.sourceID) === sourceFileId;
+ return this._createSourceFileId(script.sourceURL, script.sourceId) === sourceFileId;
}
return WebInspector.debuggerModel.queryScripts(filter.bind(this))[0];
},
- _createSourceFileId: function(sourceURL, sourceID)
+ _createSourceFileId: function(sourceURL, sourceId)
{
var prefix = this._formatSourceFiles ? "deobfuscated:" : "";
- return prefix + (sourceURL || sourceID);
+ return prefix + (sourceURL || sourceId);
},
_reset: function()
@@ -654,7 +654,7 @@
this._callFrame = callFrame;
this._index = index;
this._sourceFile = sourceFile;
- this._script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceID);
+ this._script = WebInspector.debuggerModel.scriptForSourceID(callFrame.location.sourceId);
}
WebInspector.PresenationCallFrame.prototype = {
Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (86746 => 86747)
--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-05-18 09:48:35 UTC (rev 86747)
@@ -98,7 +98,7 @@
resource.requestHeadersText = response.requestHeadersText;
resource.connectionReused = response.connectionReused;
- resource.connectionID = response.connectionID;
+ resource.connectionId = response.connectionId;
if (response.fromDiskCache)
resource.cached = true;
Modified: trunk/Source/WebCore/inspector/front-end/Script.js (86746 => 86747)
--- trunk/Source/WebCore/inspector/front-end/Script.js 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/front-end/Script.js 2011-05-18 09:48:35 UTC (rev 86747)
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-WebInspector.Script = function(sourceID, sourceURL, startLine, startColumn, endLine, endColumn, errorLine, errorMessage, isContentScript)
+WebInspector.Script = function(sourceId, sourceURL, startLine, startColumn, endLine, endColumn, errorLine, errorMessage, isContentScript)
{
- this.sourceID = sourceID;
+ this.sourceId = sourceId;
this.sourceURL = sourceURL;
this.lineOffset = startLine;
this.columnOffset = startColumn;
@@ -49,7 +49,7 @@
this._source = source;
callback(this._source);
}
- DebuggerAgent.getScriptSource(this.sourceID, didGetScriptSource.bind(this));
+ DebuggerAgent.getScriptSource(this.sourceId, didGetScriptSource.bind(this));
},
editSource: function(newSource, callback)
@@ -60,6 +60,6 @@
this._source = newSource;
callback(error, callFrames);
}
- DebuggerAgent.editScriptSource(this.sourceID, newSource, didEditScriptSource.bind(this));
+ DebuggerAgent.editScriptSource(this.sourceId, newSource, didEditScriptSource.bind(this));
}
}
Modified: trunk/Source/WebCore/inspector/front-end/SourceFile.js (86746 => 86747)
--- trunk/Source/WebCore/inspector/front-end/SourceFile.js 2011-05-18 09:46:51 UTC (rev 86746)
+++ trunk/Source/WebCore/inspector/front-end/SourceFile.js 2011-05-18 09:48:35 UTC (rev 86747)
@@ -93,10 +93,10 @@
if (!this._concatenatedScripts)
this._concatenatedScripts = {};
- if (this._concatenatedScripts[script.sourceID])
+ if (this._concatenatedScripts[script.sourceId])
return;
for (var i = 0; i < this._scripts.length; ++i)
- this._concatenatedScripts[this._scripts[i].sourceID] = true;
+ this._concatenatedScripts[this._scripts[i].sourceId] = true;
this.reload();
@@ -192,7 +192,7 @@
}
var end = { lineNumber: lineNumber, columnNumber: columnNumber };
if (script)
- scriptRanges.push({ start: start, end: end, sourceID: script.sourceID });
+ scriptRanges.push({ start: start, end: end, sourceId: script.sourceId });
}
var scriptOpenTag = "<script>";
@@ -289,7 +289,7 @@
break;
closestScript = script;
}
- return { sourceID: closestScript.sourceID, lineNumber: lineNumber, columnNumber: columnNumber };
+ return { sourceId: closestScript.sourceId, lineNumber: lineNumber, columnNumber: columnNumber };
}
}
