Commit 4aaff343 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

2011-10-04 Pavel Feldman <pfeldman@google.com>

        Not reviewed: fixed poor inspector merge, drive-by front-endcompilation fix.

        * inspector/front-end/ContentProviders.js:
        (WebInspector.ScriptContentProvider.prototype.requestContent):
        (WebInspector.ScriptContentProvider.prototype.searchInContent):
        (WebInspector.ConcatenatedScriptsContentProvider.prototype.searchInContent):
        * inspector/front-end/DebuggerPresentationModel.js:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent aa34921e
2011-10-04 Pavel Feldman <pfeldman@google.com>
Not reviewed: fixed poor inspector merge, drive-by front-endcompilation fix.
* inspector/front-end/ContentProviders.js:
(WebInspector.ScriptContentProvider.prototype.requestContent):
(WebInspector.ScriptContentProvider.prototype.searchInContent):
(WebInspector.ConcatenatedScriptsContentProvider.prototype.searchInContent):
* inspector/front-end/DebuggerPresentationModel.js:
2011-10-04 Pavel Feldman <pfeldman@google.com>
Web Inspector: remove dependency from GoToLine dialog from Panel.
......@@ -46,6 +46,11 @@ WebInspector.ScriptContentProvider.prototype = {
callback(this._mimeType, source);
}
this._script.requestSource(didRequestSource.bind(this));
},
searchInContent: function(query, callback)
{
callback([]);
}
}
......@@ -77,6 +82,11 @@ WebInspector.ConcatenatedScriptsContentProvider.prototype = {
scripts[i].requestSource(didRequestSource.bind(this));
},
searchInContent: function(query, callback)
{
callback([]);
},
_concatenateScriptsContent: function(scripts, sources)
{
var content = "";
......
......@@ -72,7 +72,7 @@ WebInspector.DebuggerPresentationModel.prototype = {
var linkText = WebInspector.formatLinkText(sourceURL, lineNumber);
var anchor = WebInspector.linkifyURLAsNode(sourceURL, linkText, classes, false);
var rawSourceCode = this._rawSourceCodeForScript(sourceURL);
var rawSourceCode = this._rawSourceCodeForScriptWithURL(sourceURL);
if (!rawSourceCode) {
anchor.setAttribute("preferred_panel", "resources");
anchor.setAttribute("line_number", lineNumber);
......@@ -384,11 +384,17 @@ WebInspector.DebuggerPresentationModel.prototype = {
return this._presentationCallFrames[this._selectedCallFrameIndex];
},
/**
* @param {string} sourceURL
*/
_rawSourceCodeForScriptWithURL: function(sourceURL)
{
return this._rawSourceCode[sourceURL];
},
/**
* @param {WebInspector.Script} script
*/
_rawSourceCodeForScript: function(script)
{
return this._rawSourceCode[this._createRawSourceCodeId(script)];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment