Changeset 52253 in webkit

Timestamp:

Dec 17, 2009 7:34:33 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-17 Mikhail Naganov <​mnaganov@chromium.org>

Reviewed by Pavel Feldman.

Advice links to source code in CPU profiler to open in debugger,
not in resources tab.

Also work around the case when resources are disabled, but scripts are present.

​https://bugs.webkit.org/show_bug.cgi?id=32610

• inspector/front-end/Panel.js: (WebInspector.Panel.prototype.updateMainViewWidth): (WebInspector.Panel.prototype.canShowSourceLineForURL): (WebInspector.Panel.prototype.showSourceLineForURL):
• inspector/front-end/ProfileDataGridTree.js: (WebInspector.ProfileDataGridNode.prototype.createCell):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.canShowSourceLineForURL): (WebInspector.ResourcesPanel.prototype.showSourceLineForURL):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.scriptForURL): (WebInspector.ScriptsPanel.prototype.canShowSourceLineForURL): (WebInspector.ScriptsPanel.prototype.showSourceLineForURL): (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
• inspector/front-end/inspector.js: (WebInspector.documentClick.followLink): (WebInspector.documentClick): (WebInspector._choosePanelToShowSourceLineForURL): (WebInspector.canShowSourceLineForURL): (WebInspector.showSourceLineForURL):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/Panel.js (modified) (1 diff)
• inspector/front-end/ProfileDataGridTree.js (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (1 diff)
• inspector/front-end/ScriptsPanel.js (modified) (3 diffs)
• inspector/front-end/inspector.js (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-17  Mikhail Naganov  <mnaganov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Advice links to source code in CPU profiler to open in debugger,
+        not in resources tab.
+
+        Also work around the case when resources are disabled, but scripts are present.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32610
+
+        * inspector/front-end/Panel.js:
+        (WebInspector.Panel.prototype.updateMainViewWidth):
+        (WebInspector.Panel.prototype.canShowSourceLineForURL):
+        (WebInspector.Panel.prototype.showSourceLineForURL):
+        * inspector/front-end/ProfileDataGridTree.js:
+        (WebInspector.ProfileDataGridNode.prototype.createCell):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.canShowSourceLineForURL):
+        (WebInspector.ResourcesPanel.prototype.showSourceLineForURL):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.scriptForURL):
+        (WebInspector.ScriptsPanel.prototype.canShowSourceLineForURL):
+        (WebInspector.ScriptsPanel.prototype.showSourceLineForURL):
+        (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
+        * inspector/front-end/inspector.js:
+        (WebInspector.documentClick.followLink):
+        (WebInspector.documentClick):
+        (WebInspector._choosePanelToShowSourceLineForURL):
+        (WebInspector.canShowSourceLineForURL):
+        (WebInspector.showSourceLineForURL):
+
 2009-12-15  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/inspector/front-end/Panel.js

@@ -364 +364 @@
     {
         // Should be implemented by ancestors.
+    },
+
+    canShowSourceLineForURL: function(url)
+    {
+        return false;
+    },
+
+    showSourceLineForURL: function(url, line)
+    {
+        return false;
     }
 }

trunk/WebCore/inspector/front-end/ProfileDataGridTree.js

@@ -103 +103 @@
             urlElement.href = this.profileNode.url;
             urlElement.lineNumber = this.profileNode.lineNumber;
+            urlElement.preferredPanel = "scripts";
 
             if (this.profileNode.lineNumber > 0)

trunk/WebCore/inspector/front-end/ResourcesPanel.js

@@ -457 +457 @@
     },
 
+    canShowSourceLineForURL: function(url)
+    {
+        return !!WebInspector.resourceForURL(url);
+    },
+
+    showSourceLineForURL: function(url, line)
+    {
+        this.showResource(WebInspector.resourceForURL(url), line);
+    },
+
     showResource: function(resource, line)
     {

trunk/WebCore/inspector/front-end/ScriptsPanel.js

@@ -311 +311 @@
     },
 
+    scriptForURL: function(url)
+    {
+        return this._scriptsForURLsInFilesSelect[url];
+    },
+
     addBreakpoint: function(breakpoint)
     {
@@ -498 +503 @@
     },
 
-    canShowResource: function(resource)
-    {
-        return resource && resource.scripts.length && InspectorBackend.debuggerEnabled();
+    canShowSourceLineForURL: function(url)
+    {
+        return InspectorBackend.debuggerEnabled() &&
+            !!(WebInspector.resourceForURL(url) || this.scriptForURL(url));
+    },
+
+    showSourceLineForURL: function(url, line)
+    {
+        var resource = WebInspector.resourceForURL(url);
+        if (resource)
+            this.showResource(resource, line);
+        else
+            this.showScript(this.scriptForURL(url), line);
     },
 
@@ -652 +667 @@
             console.assert(option);
         } else {
-            var script = this._scriptsForURLsInFilesSelect[url];
+            var script = this.scriptForURL(url);
             if (script)
                option = script.filesSelectOption;

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

@@ -601 +601 @@
     {
         // FIXME: support webkit-html-external-link links here.
-        if (anchor.href in WebInspector.resourceURLMap) {
+        if (WebInspector.canShowSourceLineForURL(anchor.href, anchor.preferredPanel)) {
             if (anchor.hasStyleClass("webkit-html-external-link")) {
                 anchor.removeStyleClass("webkit-html-external-link");
@@ -607 +607 @@
             }
 
-            WebInspector.showResourceForURL(anchor.href, anchor.lineNumber, anchor.preferredPanel);
+            WebInspector.showSourceLineForURL(anchor.href, anchor.lineNumber, anchor.preferredPanel);
         } else {
             var profileString = WebInspector.ProfileType.URLRegExp.exec(anchor.href);
@@ -1410 +1410 @@
 }
 
-WebInspector.showResourceForURL = function(url, line, preferredPanel)
-{
-    var resource = this.resourceForURL(url);
-    if (!resource)
-        return false;
-
-    if (preferredPanel && preferredPanel in WebInspector.panels) {
-        var panel = this.panels[preferredPanel];
-        if (!("showResource" in panel))
-            panel = null;
-        else if ("canShowResource" in panel && !panel.canShowResource(resource))
-            panel = null;
-    }
-
-    this.currentPanel = panel || this.panels.resources;
+WebInspector._choosePanelToShowSourceLineForURL = function(url, preferredPanel)
+{
+    preferredPanel = preferredPanel || "resources";
+    var panel = this.panels[preferredPanel];
+    if (panel && panel.canShowSourceLineForURL(url))
+        return panel;
+    panel = this.panels.resources;
+    return panel.canShowSourceLineForURL(url) ? panel : null;
+}
+
+WebInspector.canShowSourceLineForURL = function(url, preferredPanel)
+{
+    return !!this._choosePanelToShowSourceLineForURL(url, preferredPanel);
+}
+
+WebInspector.showSourceLineForURL = function(url, line, preferredPanel)
+{
+    this.currentPanel = this._choosePanelToShowSourceLineForURL(url, preferredPanel);
     if (!this.currentPanel)
         return false;
-    this.currentPanel.showResource(resource, line);
+    this.currentPanel.showSourceLineForURL(url, line);
     return true;
 }