Changeset 96223 in webkit

Timestamp:

Sep 28, 2011 8:01:41 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Add support for search in single resource to page agent.
​https://bugs.webkit.org/show_bug.cgi?id=68998

Reviewed by Pavel Feldman.

Source/WebCore:

Test: http/tests/inspector/search/search-in-resource.html

• inspector/ContentSearchUtils.cpp:

(WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines):

• inspector/ContentSearchUtils.h:
• inspector/Inspector.json:
• inspector/InspectorPageAgent.cpp:

(WebCore::buildObjectForSearchMatch):
(WebCore::InspectorPageAgent::searchInResource):

• inspector/InspectorPageAgent.h:
• inspector/front-end/Resource.js:

(WebInspector.Resource.prototype.searchInContent):

• inspector/front-end/SourceFile.js:

(WebInspector.ResourceContentProvider.prototype.requestContent):
(WebInspector.ResourceContentProvider.prototype.searchInContent):

• inspector/front-end/UISourceCode.js:

(WebInspector.ContentProvider.prototype.requestContent):
(WebInspector.ContentProvider.prototype.searchInContent):

LayoutTests:

• http/tests/inspector/search/search-in-resource-expected.txt: Added.
• http/tests/inspector/search/search-in-resource.html: Added.
• http/tests/inspector/search/search-in-resources.html:
• http/tests/inspector/search/search-test.js:

(initialize_SearchTest.InspectorTest.dumpSearchResults):
(initialize_SearchTest.InspectorTest.dumpSearchMatches):
(initialize_SearchTest):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/search/search-in-resource-expected.txt (added)
• LayoutTests/http/tests/inspector/search/search-in-resource.html (added)
• LayoutTests/http/tests/inspector/search/search-in-resources.html (modified) (3 diffs)
• LayoutTests/http/tests/inspector/search/search-test.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/ContentSearchUtils.cpp (modified) (3 diffs)
• Source/WebCore/inspector/ContentSearchUtils.h (modified) (2 diffs)
• Source/WebCore/inspector/Inspector.json (modified) (2 diffs)
• Source/WebCore/inspector/InspectorPageAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorPageAgent.h (modified) (1 diff)
• Source/WebCore/inspector/front-end/Resource.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/SourceFile.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/UISourceCode.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-28  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Add support for search in single resource to page agent.
+        https://bugs.webkit.org/show_bug.cgi?id=68998
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/search/search-in-resource-expected.txt: Added.
+        * http/tests/inspector/search/search-in-resource.html: Added.
+        * http/tests/inspector/search/search-in-resources.html:
+        * http/tests/inspector/search/search-test.js:
+        (initialize_SearchTest.InspectorTest.dumpSearchResults):
+        (initialize_SearchTest.InspectorTest.dumpSearchMatches):
+        (initialize_SearchTest):
+
 2011-09-28  Oliver Varga  <voliver@inf.u-szeged.hu>
 

trunk/LayoutTests/http/tests/inspector/search/search-in-resources.html

@@ -9 +9 @@
     // This file should not match search query.
     var text = "searchTest" + "UniqueString";
-    InspectorTest.runAfterResourcesAreFinished(["search.js", "search.css", "search.html"], step2);
 
-    function step2()
+    InspectorTest.addResult("Case insensitive, non regex:");
+    PageAgent.searchInResources(text, false, false, step2);
+
+    function step2(error, searchResults)
     {
-        InspectorTest.addResult("Case insensitive, non regex:");
-        PageAgent.searchInResources(text, false, false, step3);
+        InspectorTest.dumpSearchResults(searchResults);
+        InspectorTest.addResult("Case sensitive, non regex:");
+        PageAgent.searchInResources(text, true, false, step3);
     }
 
@@ -20 +23 @@
     {
         InspectorTest.dumpSearchResults(searchResults);
-        InspectorTest.addResult("Case sensitive, non regex:");
-        PageAgent.searchInResources(text, true, false, step4);
+        InspectorTest.addResult("Case insensitive, regex:");
+        PageAgent.searchInResources(text, false, true, step4);
     }
 
@@ -27 +30 @@
     {
         InspectorTest.dumpSearchResults(searchResults);
-        InspectorTest.addResult("Case insensitive, regex:");
-        PageAgent.searchInResources(text, false, true, step5);
+        InspectorTest.addResult("Case sensitive, regex:");
+        PageAgent.searchInResources(text, true, true, step5);
     }
 
     function step5(error, searchResults)
-    {
-        InspectorTest.dumpSearchResults(searchResults);
-        InspectorTest.addResult("Case sensitive, regex:");
-        PageAgent.searchInResources(text, true, true, step6);
-    }
-
-    function step6(error, searchResults)
     {
         InspectorTest.dumpSearchResults(searchResults);

trunk/LayoutTests/http/tests/inspector/search/search-test.js

@@ -7 +7 @@
         InspectorTest.addResult("url: " + searchResults[i].url + ", matchesCount: " + searchResults[i].matchesCount);
     InspectorTest.addResult("");
-}
+};
+
+InspectorTest.dumpSearchMatches = function(searchMatches)
+{
+    InspectorTest.addResult("Search matches: ");
+    for (var i = 0; i < searchMatches.length; i++)
+        InspectorTest.addResult("lineNumber: " + searchMatches[i].lineNumber + ", line: '" + searchMatches[i].lineContent + "'");
+    InspectorTest.addResult("");
+};
 
 };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-28  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Add support for search in single resource to page agent.
+        https://bugs.webkit.org/show_bug.cgi?id=68998
+
+        Reviewed by Pavel Feldman.
+
+        Test: http/tests/inspector/search/search-in-resource.html
+
+        * inspector/ContentSearchUtils.cpp:
+        (WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines):
+        * inspector/ContentSearchUtils.h:
+        * inspector/Inspector.json:
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::buildObjectForSearchMatch):
+        (WebCore::InspectorPageAgent::searchInResource):
+        * inspector/InspectorPageAgent.h:
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.searchInContent):
+        * inspector/front-end/SourceFile.js:
+        (WebInspector.ResourceContentProvider.prototype.requestContent):
+        (WebInspector.ResourceContentProvider.prototype.searchInContent):
+        * inspector/front-end/UISourceCode.js:
+        (WebInspector.ContentProvider.prototype.requestContent):
+        (WebInspector.ContentProvider.prototype.searchInContent):
+
 2011-09-28  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/inspector/ContentSearchUtils.cpp

@@ -32 +32 @@
 #if ENABLE(INSPECTOR)
 
+#include "InspectorValues.h"
 #include "RegularExpression.h"
+
+using namespace std;
 
 namespace WebCore {
@@ -53 +56 @@
         result.append(characters[i]);
     }
+
+    return result;
+}
+
+static Vector<pair<int, String> > getRegularExpressionMatchesByLines(const RegularExpression& regex, const String& text)
+{
+    Vector<pair<int, String> > result;
+
+    int lineNumber = 0;
+    unsigned start = 0;
+    while (start < text.length()) {
+        size_t lineEnd = text.find('\n', start);
+        if (lineEnd == notFound)
+            lineEnd = text.length();
+        else
+            lineEnd++;
+
+        String line = text.substring(start, lineEnd - start);
+        if (line.endsWith("\r\n"))
+            line = line.left(line.length() - 2);
+        if (line.endsWith("\n"))
+            line = line.left(line.length() - 1);
+
+        int matchLength;
+        if (regex.match(line, 0, &matchLength) != -1)
+            result.append(pair<int, String>(lineNumber, line));
+
+        start = lineEnd;
+        lineNumber++;
+    }
+    return result;
+}
+
+static PassRefPtr<InspectorObject> buildObjectForSearchMatch(int lineNumber, String lineContent)
+{
+    RefPtr<InspectorObject> result = InspectorObject::create();
+    result->setNumber("lineNumber", lineNumber);
+    result->setString("lineContent", lineContent);
 
     return result;
@@ -79 +120 @@
 }
 
+PassRefPtr<InspectorArray> searchInTextByLines(const String& query, const String& text)
+{
+    RefPtr<InspectorArray> result = InspectorArray::create();
+
+    RegularExpression regex = ContentSearchUtils::createSearchRegex(query, false, false);
+    Vector<pair<int, String> > matches = getRegularExpressionMatchesByLines(regex, text);
+
+    for (Vector<pair<int, String> >::const_iterator it = matches.begin(); it != matches.end(); ++it)
+        result->pushValue(buildObjectForSearchMatch(it->first, it->second));
+
+    return result;
+}
+
 } // namespace ContentSearchUtils
 } // namespace WebCore

trunk/Source/WebCore/inspector/ContentSearchUtils.h

@@ -32 +32 @@
 #include "PlatformString.h"
 
+#include <wtf/Vector.h>
+
 namespace WebCore {
 
+class InspectorArray;
 class RegularExpression;
 
@@ -40 +43 @@
 RegularExpression createSearchRegex(const String& text, bool caseSensitive, bool isRegex);
 int countRegularExpressionMatches(const RegularExpression&, const String&);
+PassRefPtr<InspectorArray> searchInTextByLines(const String& query, const String& text);
 
 } // namespace ContentSearchUtils

trunk/Source/WebCore/inspector/Inspector.json

@@ -103 +103 @@
             },
             {
+                "id": "SearchMatch",
+                "type": "object",
+                "description": "Search match for resource.",
+                "properties": [
+                    { "name": "lineNumber", "type": "number", "description": "Line number in resource content." },
+                    { "name": "lineContent", "type": "string", "description": "Line with match content." }
+                ],
+                "hidden": true
+            },
+            {
                 "id": "SearchResult",
                 "type": "object",
@@ -186 +196 @@
                     { "name": "content", "type": "string", "description": "Resource content." },
                     { "name": "base64Encoded", "type": "boolean", "description": "True, if content was served as base64." }
+                ],
+                "hidden": true
+            },
+            {
+                "name": "searchInResource",
+                "description": "Searches for given string in resource content.",
+                "parameters": [
+                    { "name": "frameId", "type": "string", "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."  }
+                ],
+                "returns": [
+                    { "name": "result", "type": "array", "items": { "$ref": "SearchMatch" }, "description": "List of search matches." }
                 ],
                 "hidden": true

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -68 +68 @@
 #include <wtf/Vector.h>
 
+using namespace std;
+
 namespace WebCore {
 
@@ -483 +485 @@
 }
 
+void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, RefPtr<InspectorArray>* object)
+{
+    RefPtr<InspectorArray> result = InspectorArray::create();
+
+    Frame* frame = frameForId(frameId);
+    KURL kurl(ParsedURLString, url);
+
+    FrameLoader* frameLoader = frame ? frame->loader() : 0;
+    DocumentLoader* loader = frameLoader ? frameLoader->documentLoader() : 0;
+    if (!loader) {
+        *object = result;
+        return;
+    }
+
+    String content;
+    bool success = false;
+    if (equalIgnoringFragmentIdentifier(kurl, loader->url()))
+        success = mainResourceContent(frame, false, &content);
+
+    if (!success) {
+        CachedResource* resource = cachedResource(frame, kurl);
+        success = textContentForCachedResource(resource, &content);
+    }
+
+    if (!success) {
+        *object = result;
+        return;
+    }
+
+    result = ContentSearchUtils::searchInTextByLines(query, content);
+    *object = result;
+}
+
 static PassRefPtr<InspectorObject> buildObjectForSearchResult(const String& frameId, const String& url, int matchesCount)
 {

trunk/Source/WebCore/inspector/InspectorPageAgent.h

@@ -98 +98 @@
     void getResourceTree(ErrorString*, RefPtr<InspectorObject>*);
     void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded);
+    void searchInResource(ErrorString*, const String& frameId, const String& url, const String&, RefPtr<InspectorArray>*);
     void searchInResources(ErrorString*, const String&, const bool* const caseSensitive, const bool* const isRegex, RefPtr<InspectorArray>*);
 

trunk/Source/WebCore/inspector/front-end/Resource.js

@@ -868 +868 @@
     },
 
+    searchInContent: function(query, callback)
+    {
+        PageAgent.searchInResource(query, callback);
+    },
+
     populateImageSource: function(image)
     {

trunk/Source/WebCore/inspector/front-end/SourceFile.js

@@ -359 +359 @@
         }
         this._resource.requestContent(didRequestContent.bind(this));
-    }
+    },
+    
+    searchInContent: function(query, callback)
+    {
+        this._resource.searchInContent(query, callback);
+    }    
 }
 

trunk/Source/WebCore/inspector/front-end/UISourceCode.js

@@ -91 +91 @@
 WebInspector.ContentProvider = function() { }
 WebInspector.ContentProvider.prototype = {
-    requestContent: function(callback) { }
+    requestContent: function(callback) { },
+    searchInContent: function(query, callback) { }
 }