Diff
Modified: trunk/LayoutTests/ChangeLog (176357 => 176358)
--- trunk/LayoutTests/ChangeLog 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/LayoutTests/ChangeLog 2014-11-19 23:49:40 UTC (rev 176358)
@@ -1,5 +1,16 @@
2014-11-19 Joseph Pecoraro <[email protected]>
+ Web Inspector: JSContext inspection Resource search does not work
+ https://bugs.webkit.org/show_bug.cgi?id=131252
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/debugger/search-scripts-expected.txt: Added.
+ * inspector/debugger/search-scripts.html: Added.
+ Tests for Debugger.searchInContent.
+
+2014-11-19 Joseph Pecoraro <[email protected]>
+
Web Inspector: Provide $exception in the console for the thrown exception value
https://bugs.webkit.org/show_bug.cgi?id=138726
Added: trunk/LayoutTests/inspector/debugger/search-scripts-expected.txt (0 => 176358)
--- trunk/LayoutTests/inspector/debugger/search-scripts-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/search-scripts-expected.txt 2014-11-19 23:49:40 UTC (rev 176358)
@@ -0,0 +1,28 @@
+Test DebuggerAgent.searchInContent to search script content.
+
+
+SCRIPT: LayoutTests/http/tests/inspector/inspector-test.js
+RESULTS: 0
+
+SCRIPT: LayoutTests/inspector/debugger/search-scripts.html
+RESULTS: 2
+ LINE: 1
+ CONTENT: // SEARCHTEST: Comment in inline <script>.
+ LINE: 28
+ CONTENT: DebuggerAgent.searchInContent(script.id, "SEARCHTEST", false, false, function(error, results) {
+
+SCRIPT: LayoutTests/inspector/debugger/search-scripts.html
+RESULTS: 1
+ LINE: 0
+ CONTENT: (function(event) {runTest(); // SEARCHTEST: onload attribute string
+
+SCRIPT: eval1.js
+RESULTS: 1
+ LINE: 0
+ CONTENT: // SEARCHTEST: Eval 1
+
+SCRIPT: eval2.js
+RESULTS: 1
+ LINE: 0
+ CONTENT: var SEARCHTEST = "SEARCHTEST";
+
Added: trunk/LayoutTests/inspector/debugger/search-scripts.html (0 => 176358)
--- trunk/LayoutTests/inspector/debugger/search-scripts.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/search-scripts.html 2014-11-19 23:49:40 UTC (rev 176358)
@@ -0,0 +1,58 @@
+<!doctype html>
+<html>
+<head>
+<script type="text/_javascript_" src=""
+<script>
+// SEARCHTEST: Comment in inline <script>.
+function performEvals()
+{
+ // Find the line with the search term.
+ eval("// SEARCH" + "TEST: Eval 1\n//# sourceURL=eval1.js");
+ // If the search term shows up multiple times on a single line, the line is returned once.
+ eval("var SEARCH" + "TEST = \"SEARCH" + "TEST\";\n//# sourceURL=eval2.js");
+};
+
+function test()
+{
+ function sanitizeScriptURL(url) {
+ return url.substring(url.indexOf("LayoutTests"));
+ }
+
+ function chomp(line) {
+ return line.replace(/\n$/, "");
+ }
+
+ var scriptsCount = 0;
+ const expectedScriptsCount = 5;
+
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, function(event) {
+ var script = event.data.script;
+ if (!/LayoutTests/.test(script.url) && !/eval\d\.js/.test(script.url))
+ return;
+
+ DebuggerAgent.searchInContent(script.id, "SEARCHTEST", false, false, function(error, results) {
+ InspectorTest.log("");
+ InspectorTest.log("SCRIPT: " + sanitizeScriptURL(script.url));
+ InspectorTest.log("RESULTS: " + results.length);
+ for (var result of results) {
+ InspectorTest.log(" LINE: " + result.lineNumber);
+ InspectorTest.log(" CONTENT: " + chomp(result.lineContent));
+ }
+
+ if (++scriptsCount === expectedScriptsCount)
+ InspectorTest.completeTest();
+ });
+ });
+
+ InspectorTest.eventDispatcher.addEventListener(InspectorTest.EventDispatcher.Event.TestPageDidLoad, function() {
+ InspectorTest.evaluateInPage("performEvals()");
+ });
+
+ InspectorTest.reloadPage();
+}
+</script>
+</head>
+<body _onload_="runTest(); // SEARCHTEST: onload attribute string">
+ <p>Test <code>DebuggerAgent.searchInContent</code> to search script content.</p>
+</body>
+</html>
Modified: trunk/Source/_javascript_Core/ChangeLog (176357 => 176358)
--- trunk/Source/_javascript_Core/ChangeLog 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-11-19 23:49:40 UTC (rev 176358)
@@ -1,5 +1,17 @@
2014-11-19 Joseph Pecoraro <[email protected]>
+ Web Inspector: JSContext inspection Resource search does not work
+ https://bugs.webkit.org/show_bug.cgi?id=131252
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::searchInContent):
+ * inspector/protocol/Debugger.json:
+ Do some cleanup of the description and implementation of content searching.
+
+2014-11-19 Joseph Pecoraro <[email protected]>
+
Web Inspector: Provide $exception in the console for the thrown exception value
https://bugs.webkit.org/show_bug.cgi?id=138726
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (176357 => 176358)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-11-19 23:49:40 UTC (rev 176358)
@@ -401,17 +401,18 @@
return location;
}
-void InspectorDebuggerAgent::searchInContent(ErrorString& error, const String& scriptIDStr, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
+void InspectorDebuggerAgent::searchInContent(ErrorString& error, const String& scriptIDStr, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
{
+ JSC::SourceID sourceID = scriptIDStr.toIntPtr();
+ auto it = m_scripts.find(sourceID);
+ if (it == m_scripts.end()) {
+ error = ASCIILiteral("No script for id: ") + scriptIDStr;
+ return;
+ }
+
bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
-
- JSC::SourceID sourceID = scriptIDStr.toIntPtr();
- ScriptsMap::iterator it = m_scripts.find(sourceID);
- if (it != m_scripts.end())
- results = ContentSearchUtilities::searchInTextByLines(it->value.source, query, caseSensitive, isRegex);
- else
- error = ASCIILiteral("No script for id: ") + scriptIDStr;
+ results = ContentSearchUtilities::searchInTextByLines(it->value.source, query, caseSensitive, isRegex);
}
void InspectorDebuggerAgent::getScriptSource(ErrorString& error, const String& scriptIDStr, String* scriptSource)
Modified: trunk/Source/_javascript_Core/inspector/protocol/Debugger.json (176357 => 176358)
--- trunk/Source/_javascript_Core/inspector/protocol/Debugger.json 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/_javascript_Core/inspector/protocol/Debugger.json 2014-11-19 23:49:40 UTC (rev 176358)
@@ -193,16 +193,16 @@
},
{
"name": "searchInContent",
+ "description": "Searches for given string in script content.",
"parameters": [
{ "name": "scriptId", "$ref": "ScriptId", "description": "Id of the script to search in." },
- { "name": "query", "type": "string", "description": "String to search for." },
+ { "name": "query", "type": "string", "description": "String to search for." },
{ "name": "caseSensitive", "type": "boolean", "optional": true, "description": "If true, search is case sensitive." },
{ "name": "isRegex", "type": "boolean", "optional": true, "description": "If true, treats string parameter as regex." }
],
"returns": [
{ "name": "result", "type": "array", "items": { "$ref": "GenericTypes.SearchMatch" }, "description": "List of search matches." }
- ],
- "description": "Searches for given string in script content."
+ ]
},
{
"name": "getScriptSource",
Modified: trunk/Source/_javascript_Core/inspector/protocol/Page.json (176357 => 176358)
--- trunk/Source/_javascript_Core/inspector/protocol/Page.json 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/_javascript_Core/inspector/protocol/Page.json 2014-11-19 23:49:40 UTC (rev 176358)
@@ -162,7 +162,7 @@
"parameters": [
{ "name": "frameId", "$ref": "Network.FrameId", "description": "Frame id for resource to search in." },
{ "name": "url", "type": "string", "description": "URL of the resource to search in." },
- { "name": "query", "type": "string", "description": "String to search for." },
+ { "name": "query", "type": "string", "description": "String to search for." },
{ "name": "caseSensitive", "type": "boolean", "optional": true, "description": "If true, search is case sensitive." },
{ "name": "isRegex", "type": "boolean", "optional": true, "description": "If true, treats string parameter as regex." }
],
@@ -174,7 +174,7 @@
"name": "searchInResources",
"description": "Searches for given string in frame / resource tree structure.",
"parameters": [
- { "name": "text", "type": "string", "description": "String to search for." },
+ { "name": "text", "type": "string", "description": "String to search for." },
{ "name": "caseSensitive", "type": "boolean", "optional": true, "description": "If true, search is case sensitive." },
{ "name": "isRegex", "type": "boolean", "optional": true, "description": "If true, treats string parameter as regex." }
],
Modified: trunk/Source/WebCore/ChangeLog (176357 => 176358)
--- trunk/Source/WebCore/ChangeLog 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebCore/ChangeLog 2014-11-19 23:49:40 UTC (rev 176358)
@@ -1,5 +1,18 @@
2014-11-19 Joseph Pecoraro <[email protected]>
+ Web Inspector: JSContext inspection Resource search does not work
+ https://bugs.webkit.org/show_bug.cgi?id=131252
+
+ Reviewed by Timothy Hatcher.
+
+ Test: inspector/debugger/search-scripts.html
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::searchInResources):
+ A little cleanup.
+
+2014-11-19 Joseph Pecoraro <[email protected]>
+
Web Inspector: Provide $exception in the console for the thrown exception value
https://bugs.webkit.org/show_bug.cgi?id=138726
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (176357 => 176358)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-11-19 23:49:40 UTC (rev 176358)
@@ -607,9 +607,9 @@
.release();
}
-void InspectorPageAgent::searchInResources(ErrorString&, const String& text, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>& results)
+void InspectorPageAgent::searchInResources(ErrorString&, const String& text, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>& result)
{
- RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>> searchResults = Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>::create();
+ result = Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>::create();
bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
@@ -622,18 +622,16 @@
if (textContentForCachedResource(cachedResource, &content)) {
int matchesCount = ContentSearchUtilities::countRegularExpressionMatches(regex, content);
if (matchesCount)
- searchResults->addItem(buildObjectForSearchResult(frameId(frame), cachedResource->url(), matchesCount));
+ result->addItem(buildObjectForSearchResult(frameId(frame), cachedResource->url(), matchesCount));
}
}
if (mainResourceContent(frame, false, &content)) {
int matchesCount = ContentSearchUtilities::countRegularExpressionMatches(regex, content);
if (matchesCount)
- searchResults->addItem(buildObjectForSearchResult(frameId(frame), frame->document()->url(), matchesCount));
+ result->addItem(buildObjectForSearchResult(frameId(frame), frame->document()->url(), matchesCount));
}
}
-
- results = searchResults;
}
void InspectorPageAgent::setDocumentContent(ErrorString& errorString, const String& frameId, const String& html)
Modified: trunk/Source/WebInspectorUI/ChangeLog (176357 => 176358)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-11-19 23:49:40 UTC (rev 176358)
@@ -1,5 +1,41 @@
2014-11-19 Joseph Pecoraro <[email protected]>
+ Web Inspector: JSContext inspection Resource search does not work
+ https://bugs.webkit.org/show_bug.cgi?id=131252
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype.performSearch.resourceCallback):
+ (WebInspector.ResourceSidebarPanel.prototype.performSearch.resourcesCallback):
+ Cleanup by reordering things a bit.
+
+ (WebInspector.ResourceSidebarPanel.prototype.performSearch.searchScripts.scriptCallback):
+ (WebInspector.ResourceSidebarPanel.prototype.performSearch.searchScripts):
+ (WebInspector.ResourceSidebarPanel.prototype.performSearch):
+ Search non-resource scripts individually.
+
+ (WebInspector.ResourceSidebarPanel.prototype._searchTreeElementForScript):
+ Lazily create a ScriptTreeElement for the search tree outline as needed.
+
+ (WebInspector.ResourceSidebarPanel.prototype._scriptsToSearch):
+ When searching scripts, just perform a shallow walk of the tree outline to find
+ Script resources that are not also Resources. Scripts are always guarenteed to
+ be in a folder when inspecting a web resource. For JSContext inspection, scripts
+ are promoted to the top level.
+
+ * UserInterface/Main.html:
+ * UserInterface/Models/SourceCodeSearchMatchObject.js: Renamed from Source/WebInspectorUI/UserInterface/Models/ResourceSearchMatchObject.js.
+ (WebInspector.SourceCodeSearchMatchObject):
+ * UserInterface/Views/SearchIcons.css:
+ (.source-code-match-icon .icon):
+ (.resource-match-icon .icon): Deleted.
+ * UserInterface/Views/SearchResultTreeElement.js:
+ (WebInspector.SearchResultTreeElement):
+ Rename ResourceSearchMatchObject to SourceCodeSearchMatchObject.
+
+2014-11-19 Joseph Pecoraro <[email protected]>
+
Web Inspector: Provide $exception in the console for the thrown exception value
https://bugs.webkit.org/show_bug.cgi?id=138726
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (176357 => 176358)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-11-19 23:49:40 UTC (rev 176358)
@@ -256,7 +256,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
@@ -266,6 +265,7 @@
<script src=""
<script src=""
<script src=""
+ <script src=""
<script src=""
<script src=""
<script src=""
Deleted: trunk/Source/WebInspectorUI/UserInterface/Models/ResourceSearchMatchObject.js (176357 => 176358)
--- trunk/Source/WebInspectorUI/UserInterface/Models/ResourceSearchMatchObject.js 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ResourceSearchMatchObject.js 2014-11-19 23:49:40 UTC (rev 176358)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.ResourceSearchMatchObject = function(resource, lineText, searchTerm, textRange)
-{
- console.assert(resource instanceof WebInspector.Resource);
-
- WebInspector.Object.call(this);
-
- this._resource = resource;
- this._lineText = lineText;
- this._searchTerm = searchTerm;
- this._sourceCodeTextRange = resource.createSourceCodeTextRange(textRange);
-};
-
-WebInspector.ResourceSearchMatchObject.ResourceMatchIconStyleClassName = "resource-match-icon";
-
-WebInspector.ResourceSearchMatchObject.prototype = {
- constructor: WebInspector.ResourceSearchMatchObject,
-
- get resource()
- {
- return this._resource;
- },
-
- get title()
- {
- return this._lineText;
- },
-
- get className()
- {
- return WebInspector.ResourceSearchMatchObject.ResourceMatchIconStyleClassName;
- },
-
- get searchTerm()
- {
- return this._searchTerm;
- },
-
- get sourceCodeTextRange()
- {
- return this._sourceCodeTextRange;
- }
-};
-
-WebInspector.ResourceSearchMatchObject.prototype.__proto__ = WebInspector.Object.prototype;
Copied: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js (from rev 176357, trunk/Source/WebInspectorUI/UserInterface/Models/ResourceSearchMatchObject.js) (0 => 176358)
--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js 2014-11-19 23:49:40 UTC (rev 176358)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.SourceCodeSearchMatchObject = function(sourceCode, lineText, searchTerm, textRange)
+{
+ console.assert(sourceCode instanceof WebInspector.SourceCode);
+
+ WebInspector.Object.call(this);
+
+ this._sourceCode = sourceCode;
+ this._lineText = lineText;
+ this._searchTerm = searchTerm;
+ this._sourceCodeTextRange = sourceCode.createSourceCodeTextRange(textRange);
+};
+
+WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName = "source-code-match-icon";
+
+WebInspector.SourceCodeSearchMatchObject.prototype = {
+ constructor: WebInspector.SourceCodeSearchMatchObject,
+
+ get sourceCode()
+ {
+ return this._sourceCode;
+ },
+
+ get title()
+ {
+ return this._lineText;
+ },
+
+ get className()
+ {
+ return WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName;
+ },
+
+ get searchTerm()
+ {
+ return this._searchTerm;
+ },
+
+ get sourceCodeTextRange()
+ {
+ return this._sourceCodeTextRange;
+ }
+};
+
+WebInspector.SourceCodeSearchMatchObject.prototype.__proto__ = WebInspector.Object.prototype;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (176357 => 176358)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2014-11-19 23:49:40 UTC (rev 176358)
@@ -323,6 +323,10 @@
this.filterBar.placeholder = WebInspector.UIString("Filter Search Results");
this.contentTreeOutline = this._searchContentTreeOutline;
+ // FIXME: Provide UI to toggle regex and case sensitive searches.
+ var isCaseSensitive = false;
+ var isRegex = false;
+
var updateEmptyContentPlaceholderTimeout = null;
function updateEmptyContentPlaceholderSoon()
@@ -342,6 +346,14 @@
this.updateEmptyContentPlaceholder(WebInspector.UIString("No Search Results"));
}
+ function forEachMatch(searchTerm, lineContent, callback)
+ {
+ var lineMatch;
+ var searchRegex = new RegExp(searchTerm.escapeForRegExp(), "gi");
+ while ((searchRegex.lastIndex < lineContent.length) && (lineMatch = searchRegex.exec(lineContent)))
+ callback(lineMatch, searchRegex.lastIndex);
+ }
+
function resourcesCallback(error, result)
{
updateEmptyContentPlaceholderSoon.call(this);
@@ -349,45 +361,74 @@
if (error)
return;
+ function resourceCallback(url, error, resourceMatches)
+ {
+ updateEmptyContentPlaceholderSoon.call(this);
+
+ if (error || !resourceMatches || !resourceMatches.length)
+ return;
+
+ var frame = WebInspector.frameResourceManager.frameForIdentifier(searchResult.frameId);
+ if (!frame)
+ return;
+
+ var resource = frame.url ="" url ? frame.mainResource : frame.resourceForURL(url);
+ if (!resource)
+ return;
+
+ var resourceTreeElement = this._searchTreeElementForResource(resource);
+
+ for (var i = 0; i < resourceMatches.length; ++i) {
+ var match = resourceMatches[i];
+ forEachMatch(searchTerm, match.lineContent, function(lineMatch, lastIndex) {
+ var matchObject = new WebInspector.SourceCodeSearchMatchObject(resource, match.lineContent, searchTerm, new WebInspector.TextRange(match.lineNumber, lineMatch.index, match.lineNumber, lastIndex));
+ var matchTreeElement = new WebInspector.SearchResultTreeElement(matchObject);
+ resourceTreeElement.appendChild(matchTreeElement);
+ });
+ }
+
+ updateEmptyContentPlaceholder.call(this);
+ }
+
for (var i = 0; i < result.length; ++i) {
var searchResult = result[i];
if (!searchResult.url || !searchResult.frameId)
continue;
- function resourceCallback(url, error, resourceMatches)
- {
- updateEmptyContentPlaceholderSoon.call(this);
+ PageAgent.searchInResource(searchResult.frameId, searchResult.url, searchTerm, isCaseSensitive, isRegex, resourceCallback.bind(this, searchResult.url));
+ }
+ }
- if (error || !resourceMatches || !resourceMatches.length)
- return;
+ function searchScripts(scriptsToSearch)
+ {
+ updateEmptyContentPlaceholderSoon.call(this);
- var frame = WebInspector.frameResourceManager.frameForIdentifier(searchResult.frameId);
- if (!frame)
- return;
+ if (!scriptsToSearch.length)
+ return;
- var resource = frame.url ="" url ? frame.mainResource : frame.resourceForURL(url);
- if (!resource)
- return;
+ function scriptCallback(script, error, scriptMatches)
+ {
+ updateEmptyContentPlaceholderSoon.call(this);
- var resourceTreeElement = this._searchTreeElementForResource(resource);
+ if (error || !scriptMatches || !scriptMatches.length)
+ return;
- for (var i = 0; i < resourceMatches.length; ++i) {
- var match = resourceMatches[i];
+ var scriptTreeElement = this._searchTreeElementForScript(script);
- var lineMatch;
- var searchRegex = new RegExp(searchTerm.escapeForRegExp(), "gi");
- while ((searchRegex.lastIndex < match.lineContent.length) && (lineMatch = searchRegex.exec(match.lineContent))) {
- var matchObject = new WebInspector.ResourceSearchMatchObject(resource, match.lineContent, searchTerm, new WebInspector.TextRange(match.lineNumber, lineMatch.index, match.lineNumber, searchRegex.lastIndex));
- var matchTreeElement = new WebInspector.SearchResultTreeElement(matchObject);
- resourceTreeElement.appendChild(matchTreeElement);
- }
- }
-
- updateEmptyContentPlaceholder.call(this);
+ for (var i = 0; i < scriptMatches.length; ++i) {
+ var match = scriptMatches[i];
+ forEachMatch(searchTerm, match.lineContent, function(lineMatch, lastIndex) {
+ var matchObject = new WebInspector.SourceCodeSearchMatchObject(script, match.lineContent, searchTerm, new WebInspector.TextRange(match.lineNumber, lineMatch.index, match.lineNumber, lastIndex));
+ var matchTreeElement = new WebInspector.SearchResultTreeElement(matchObject);
+ scriptTreeElement.appendChild(matchTreeElement);
+ });
}
- PageAgent.searchInResource(searchResult.frameId, searchResult.url, searchTerm, false, false, resourceCallback.bind(this, searchResult.url));
+ updateEmptyContentPlaceholder.call(this);
}
+
+ for (var script of scriptsToSearch)
+ DebuggerAgent.searchInContent(script.id, searchTerm, isCaseSensitive, isRegex, scriptCallback.bind(this, script));
}
function domCallback(error, searchId, resultsCount)
@@ -419,25 +460,22 @@
if (domNode.nodeType() === Node.DOCUMENT_NODE)
continue;
- // FIXME: Use this should use a frame to do resourceForURL, but DOMAgent does not provide a frameId.
+ // FIXME: This should use a frame to do resourceForURL, but DOMAgent does not provide a frameId.
var resource = WebInspector.frameResourceManager.resourceForURL(domNode.ownerDocument.documentURL);
if (!resource)
continue;
var resourceTreeElement = this._searchTreeElementForResource(resource);
-
var domNodeTitle = WebInspector.DOMSearchMatchObject.titleForDOMNode(domNode);
- var searchRegex = new RegExp(searchTerm.escapeForRegExp(), "gi");
// Textual matches.
- var lineMatch;
var didFindTextualMatch = false;
- while ((searchRegex.lastIndex < domNodeTitle.length) && (lineMatch = searchRegex.exec(domNodeTitle))) {
- var matchObject = new WebInspector.DOMSearchMatchObject(resource, domNode, domNodeTitle, searchTerm, new WebInspector.TextRange(0, lineMatch.index, 0, searchRegex.lastIndex));
+ forEachMatch(searchTerm, domNodeTitle, function(lineMatch, lastIndex) {
+ var matchObject = new WebInspector.DOMSearchMatchObject(resource, domNode, domNodeTitle, searchTerm, new WebInspector.TextRange(0, lineMatch.index, 0, lastIndex));
var matchTreeElement = new WebInspector.SearchResultTreeElement(matchObject);
resourceTreeElement.appendChild(matchTreeElement);
didFindTextualMatch = true;
- }
+ });
// Non-textual matches are CSS Selector or XPath matches. In such cases, display the node entirely highlighted.
if (!didFindTextualMatch) {
@@ -456,10 +494,11 @@
if (window.DOMAgent)
WebInspector.domTreeManager.requestDocument();
- // FIXME: Should we be searching for regexes or just plain text?
if (window.PageAgent)
- PageAgent.searchInResources(searchTerm, false, false, resourcesCallback.bind(this));
+ PageAgent.searchInResources(searchTerm, isCaseSensitive, isRegex, resourcesCallback.bind(this));
+ setTimeout(searchScripts.bind(this, this._scriptsToSearch()), 0);
+
if (window.DOMAgent) {
if ("_domSearchIdentifier" in this) {
DOMAgent.discardSearchResults(this._domSearchIdentifier);
@@ -491,9 +530,6 @@
_searchTreeElementForResource: function(resource)
{
- // FIXME: This should take a frame ID (if one is available) - so we can differentiate between multiple resources
- // with the same URL.
-
var resourceTreeElement = this._searchContentTreeOutline.getCachedTreeElement(resource);
if (!resourceTreeElement) {
resourceTreeElement = new WebInspector.ResourceTreeElement(resource);
@@ -506,6 +542,20 @@
return resourceTreeElement;
},
+ _searchTreeElementForScript: function(script)
+ {
+ var scriptTreeElement = this._searchContentTreeOutline.getCachedTreeElement(script);
+ if (!scriptTreeElement) {
+ scriptTreeElement = new WebInspector.ScriptTreeElement(script);
+ scriptTreeElement.hasChildren = true;
+ scriptTreeElement.expand();
+
+ this._searchContentTreeOutline.appendChild(scriptTreeElement);
+ }
+
+ return scriptTreeElement;
+ },
+
_focusSearchField: function(keyboardShortcut, event)
{
this.show();
@@ -670,6 +720,33 @@
}
},
+ _scriptsToSearch: function(event)
+ {
+ var nonResourceScripts = [];
+
+ function collectFromTreeElement(folderTreeElement)
+ {
+ if (!folderTreeElement)
+ return;
+
+ var children = folderTreeElement.children;
+ for (var treeElement of children) {
+ if (treeElement instanceof WebInspector.ScriptTreeElement)
+ nonResourceScripts.push(treeElement.script);
+ }
+ }
+
+ if (WebInspector.debuggableType === WebInspector.DebuggableType._javascript_ && !WebInspector.hasExtraDomains)
+ collectFromTreeElement(this._resourcesContentTreeOutline);
+ else {
+ collectFromTreeElement(this._extensionScriptsFolderTreeElement);
+ collectFromTreeElement(this._extraScriptsFolderTreeElement);
+ collectFromTreeElement(this._anonymousScriptsFolderTreeElement);
+ }
+
+ return nonResourceScripts;
+ },
+
_treeElementSelected: function(treeElement, selectedByUser)
{
if (treeElement instanceof WebInspector.FolderTreeElement || treeElement instanceof WebInspector.DatabaseHostTreeElement ||
@@ -691,7 +768,7 @@
if (treeElement.representedObject instanceof WebInspector.DOMSearchMatchObject)
this.showMainFrameDOMTree(treeElement.representedObject.domNode, true);
- else if (treeElement.representedObject instanceof WebInspector.ResourceSearchMatchObject)
+ else if (treeElement.representedObject instanceof WebInspector.SourceCodeSearchMatchObject)
this.showOriginalOrFormattedSourceCodeTextRange(treeElement.representedObject.sourceCodeTextRange);
},
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchIcons.css (176357 => 176358)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchIcons.css 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchIcons.css 2014-11-19 23:49:40 UTC (rev 176358)
@@ -47,6 +47,6 @@
content: url(../Images/DOMNode.svg);
}
-.resource-match-icon .icon {
+.source-code-match-icon .icon {
content: url(../Images/ResultLine.svg);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js (176357 => 176358)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js 2014-11-19 23:49:40 UTC (rev 176358)
@@ -25,7 +25,7 @@
WebInspector.SearchResultTreeElement = function(representedObject)
{
- console.assert(representedObject instanceof WebInspector.DOMSearchMatchObject || representedObject instanceof WebInspector.ResourceSearchMatchObject);
+ console.assert(representedObject instanceof WebInspector.DOMSearchMatchObject || representedObject instanceof WebInspector.SourceCodeSearchMatchObject);
var title = WebInspector.SearchResultTreeElement.truncateAndHighlightTitle(representedObject.title, representedObject.searchTerm, representedObject.sourceCodeTextRange);
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (176357 => 176358)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-11-19 23:49:40 UTC (rev 176358)
@@ -737,7 +737,6 @@
<None Include="..\UserInterface\ResourceContentView.js" />
<None Include="..\UserInterface\ResourceDetailsSidebarPanel.js" />
<None Include="..\UserInterface\ResourceIcons.css" />
- <None Include="..\UserInterface\ResourceSearchMatchObject.js" />
<None Include="..\UserInterface\ResourceSidebarPanel.css" />
<None Include="..\UserInterface\ResourceSidebarPanel.js" />
<None Include="..\UserInterface\ResourceTimelineDataGridNode.js" />
@@ -777,6 +776,7 @@
<None Include="..\UserInterface\SourceCodeLocation.js" />
<None Include="..\UserInterface\SourceCodePosition.js" />
<None Include="..\UserInterface\SourceCodeRevision.js" />
+ <None Include="..\UserInterface\SourceCodeSearchMatchObject.js" />
<None Include="..\UserInterface\SourceCodeTextEditor.css" />
<None Include="..\UserInterface\SourceCodeTextEditor.js" />
<None Include="..\UserInterface\SourceCodeTextRange.js" />
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters (176357 => 176358)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2014-11-19 23:49:36 UTC (rev 176357)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2014-11-19 23:49:40 UTC (rev 176358)
@@ -795,9 +795,6 @@
<None Include="..\UserInterface\ResourceIcons.css">
<Filter>UserInterface</Filter>
</None>
- <None Include="..\UserInterface\ResourceSearchMatchObject.js">
- <Filter>UserInterface</Filter>
- </None>
<None Include="..\UserInterface\ResourceSidebarPanel.css">
<Filter>UserInterface</Filter>
</None>
@@ -915,6 +912,9 @@
<None Include="..\UserInterface\SourceCodeRevision.js">
<Filter>UserInterface</Filter>
</None>
+ <None Include="..\UserInterface\SourceCodeSearchMatchObject.js">
+ <Filter>UserInterface</Filter>
+ </None>
<None Include="..\UserInterface\SourceCodeTextEditor.css">
<Filter>UserInterface</Filter>
</None>
