2011-10-04 Pavel Feldman <pfeldman@google.com>
authorpfeldman@chromium.org <pfeldman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Oct 2011 09:51:47 +0000 (09:51 +0000)
committerpfeldman@chromium.org <pfeldman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Oct 2011 09:51:47 +0000 (09:51 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@96579 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/inspector/front-end/ContentProviders.js
Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

index d223d75..6819d29 100644 (file)
@@ -1,5 +1,15 @@
 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.
         https://bugs.webkit.org/show_bug.cgi?id=69327
 
index cfb9ae4..d8048fe 100644 (file)
@@ -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 = "";
index 91f665b..5530883 100644 (file)
@@ -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)];