Title: [96579] trunk/Source/WebCore
- Revision
- 96579
- Author
- [email protected]
- Date
- 2011-10-04 02:51:47 -0700 (Tue, 04 Oct 2011)
Log Message
2011-10-04 Pavel Feldman <[email protected]>
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96578 => 96579)
--- trunk/Source/WebCore/ChangeLog 2011-10-04 09:30:03 UTC (rev 96578)
+++ trunk/Source/WebCore/ChangeLog 2011-10-04 09:51:47 UTC (rev 96579)
@@ -1,5 +1,15 @@
2011-10-04 Pavel Feldman <[email protected]>
+ 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 <[email protected]>
+
Web Inspector: remove dependency from GoToLine dialog from Panel.
https://bugs.webkit.org/show_bug.cgi?id=69327
Modified: trunk/Source/WebCore/inspector/front-end/ContentProviders.js (96578 => 96579)
--- trunk/Source/WebCore/inspector/front-end/ContentProviders.js 2011-10-04 09:30:03 UTC (rev 96578)
+++ trunk/Source/WebCore/inspector/front-end/ContentProviders.js 2011-10-04 09:51:47 UTC (rev 96579)
@@ -46,6 +46,11 @@
callback(this._mimeType, source);
}
this._script.requestSource(didRequestSource.bind(this));
+ },
+
+ searchInContent: function(query, callback)
+ {
+ callback([]);
}
}
@@ -77,6 +82,11 @@
scripts[i].requestSource(didRequestSource.bind(this));
},
+ searchInContent: function(query, callback)
+ {
+ callback([]);
+ },
+
_concatenateScriptsContent: function(scripts, sources)
{
var content = "";
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (96578 => 96579)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-10-04 09:30:03 UTC (rev 96578)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-10-04 09:51:47 UTC (rev 96579)
@@ -72,7 +72,7 @@
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 @@
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)];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
