Title: [140966] trunk/Source/WebCore
- Revision
- 140966
- Author
- [email protected]
- Date
- 2013-01-28 04:47:43 -0800 (Mon, 28 Jan 2013)
Log Message
Web Inspector: [Regression] Search all sources should not search across service projects.
https://bugs.webkit.org/show_bug.cgi?id=108068
Reviewed by Pavel Feldman.
* inspector/front-end/ScriptsSearchScope.js:
(WebInspector.ScriptsSearchScope):
(WebInspector.ScriptsSearchScope.prototype._sortedUISourceCodes):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140965 => 140966)
--- trunk/Source/WebCore/ChangeLog 2013-01-28 12:45:24 UTC (rev 140965)
+++ trunk/Source/WebCore/ChangeLog 2013-01-28 12:47:43 UTC (rev 140966)
@@ -1,3 +1,14 @@
+2013-01-28 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] Search all sources should not search across service projects.
+ https://bugs.webkit.org/show_bug.cgi?id=108068
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/ScriptsSearchScope.js:
+ (WebInspector.ScriptsSearchScope):
+ (WebInspector.ScriptsSearchScope.prototype._sortedUISourceCodes):
+
2013-01-28 Pavel Feldman <[email protected]>
Web Inspector: SourceURL and SourceMappingURL together in evalled code
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js (140965 => 140966)
--- trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js 2013-01-28 12:45:24 UTC (rev 140965)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsSearchScope.js 2013-01-28 12:47:43 UTC (rev 140966)
@@ -29,14 +29,14 @@
/**
* @constructor
* @implements {WebInspector.SearchScope}
- * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
+ * @param {WebInspector.Workspace} workspace
*/
-WebInspector.ScriptsSearchScope = function(uiSourceCodeProvider)
+WebInspector.ScriptsSearchScope = function(workspace)
{
// FIXME: Add title once it is used by search controller.
WebInspector.SearchScope.call(this)
this._searchId = 0;
- this._uiSourceCodeProvider = uiSourceCodeProvider;
+ this._workspace = workspace;
}
WebInspector.ScriptsSearchScope.prototype = {
@@ -118,7 +118,13 @@
return a.originURL().compareTo(b.originURL());
}
- var uiSourceCodes = this._uiSourceCodeProvider.uiSourceCodes();
+ var projects = this._workspace.projects();
+ var uiSourceCodes = [];
+ for (var i = 0; i < projects.length; ++i) {
+ if (projects[i].isServiceProject())
+ continue;
+ uiSourceCodes = this._uiSourceCodes.concat(projects[i].uiSourceCodes());
+ }
uiSourceCodes = uiSourceCodes.filter(filterOutAnonymous);
uiSourceCodes.sort(comparator);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
