Changeset 88931 in webkit

Timestamp:

Jun 15, 2011 7:57:39 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-06-15 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r88916.
​http://trac.webkit.org/changeset/88916
​https://bugs.webkit.org/show_bug.cgi?id=62728

Broke a bunch of layout tests on chromium (Requested by
podivilov on #webkit).

• inspector/debugger/scripts-panel-expected.txt:
• inspector/debugger/scripts-panel.html:

2011-06-15 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r88916.
​http://trac.webkit.org/changeset/88916
​https://bugs.webkit.org/show_bug.cgi?id=62728

Broke a bunch of layout tests on chromium (Requested by
podivilov on #webkit).

• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._createSourceFrame): (WebInspector.SourceFrameDelegateForScriptsPanel): (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.suggestedFileName):
• inspector/front-end/SourceFile.js: (WebInspector.SourceFile.prototype.get displayName):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/scripts-panel-expected.txt (modified) (1 diff)
• LayoutTests/inspector/debugger/scripts-panel.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (6 diffs)
• Source/WebCore/inspector/front-end/SourceFile.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r88916.
+        http://trac.webkit.org/changeset/88916
+        https://bugs.webkit.org/show_bug.cgi?id=62728
+
+        Broke a bunch of layout tests on chromium (Requested by
+        podivilov on #webkit).
+
+        * inspector/debugger/scripts-panel-expected.txt:
+        * inspector/debugger/scripts-panel.html:
+
 2011-06-15  Stephen White  <senorblanco@chromium.org>
 

trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt

@@ -11 +11 @@
 
 Running: testFilesSelect
-text: ?a=b, tooltip: ?a=b
-text: example.com/, tooltip: http://example.com/?a=b
-text: script.js, tooltip: <root>/foo/bar/script.js
-text: script.js, tooltip: <root>/foo/bar/script.js?a=1
-text: script.js, tooltip: <root>/foo/bar/script.js?a=2
-text: script.js, tooltip: <root>/foo/baz/script.js
-text: very_loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo..., tooltip: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url
-text: Content scripts, tooltip: 
-text: contentScript.js, tooltip: <root>/foo/bar/contentScript.js?a=1
-text: contentScript.js, tooltip: <root>/foo/bar/contentScript.js?a=2
-text: contentScript2.js, tooltip: <root>/foo/bar/contentScript2.js?a=1
+text: script.js, tooltip: ...foo/bar/script.js
+text: script.js, tooltip: ...foo/bar/script.js?a=1
+text: script.js, tooltip: ...foo/bar/script.js?a=2
+text: script.js, tooltip: ...foo/baz/script.js
+text: Content scripts, tooltip: ...
+text: contentScript.js, tooltip: ...foo/bar/contentScript.js?a=1
+text: contentScript.js, tooltip: ...foo/bar/contentScript.js?a=2
+text: contentScript2.js, tooltip: ...foo/bar/contentScript2.js?a=1
 Debugger was disabled.
 

trunk/LayoutTests/inspector/debugger/scripts-panel.html

@@ -130 +130 @@
             var rootURL = WebInspector.mainResource.url.substring(0, WebInspector.mainResource.url.lastIndexOf("/") + 1);
             var nextId = 0;
+
             function addOption(url, isContentScript)
             {
-                panel._addOptionToFilesSelect({ id: nextId++, url: url, isContentScript: isContentScript });
+                var displayName = url;
+                var indexOfQuery = displayName.indexOf("?");
+                if (indexOfQuery !== -1)
+                    displayName = displayName.substring(0, indexOfQuery);
+                var lastSlashIndex = displayName.lastIndexOf("/");
+                if (lastSlashIndex !== -1)
+                    displayName = displayName.substring(lastSlashIndex + 1);
+                panel._addOptionToFilesSelect({ id: nextId++, url: rootURL + url, displayName: displayName, isContentScript: isContentScript });
             }
-            addOption(rootURL + "foo/bar/script.js", false);
-            addOption(rootURL + "foo/bar/contentScript2.js?a=1", true);
-            addOption(rootURL + "foo/bar/script.js?a=2", false);
-            addOption(rootURL + "foo/bar/contentScript.js?a=2", true);
-            addOption(rootURL + "foo/bar/script.js?a=1", false);
-            addOption(rootURL + "foo/baz/script.js", false);
-            addOption(rootURL + "foo/bar/contentScript.js?a=1", true);
-            addOption("http://example.com/?a=b", false);
-            addOption("?a=b", false);
-            addOption("very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url", false);
-
+            addOption("foo/bar/script.js", false);
+            addOption("foo/bar/contentScript2.js?a=1", true);
+            addOption("foo/bar/script.js?a=2", false);
+            addOption("foo/bar/contentScript.js?a=2", true);
+            addOption("foo/bar/script.js?a=1", false);
+            addOption("foo/baz/script.js", false);
+            addOption("foo/bar/contentScript.js?a=1", true);
             var select = panel._filesSelectElement;
             for (var i = 0; i < select.length; ++i) {
                 var option = select[i];
-                var tooltip = option.title.replace(rootURL, "<root>/");
+                var tooltip = "..." + option.title.substring(rootURL.length);
                 InspectorTest.addResult("text: " + option.text + ", tooltip: " + tooltip);
             }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r88916.
+        http://trac.webkit.org/changeset/88916
+        https://bugs.webkit.org/show_bug.cgi?id=62728
+
+        Broke a bunch of layout tests on chromium (Requested by
+        podivilov on #webkit).
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._createSourceFrame):
+        (WebInspector.SourceFrameDelegateForScriptsPanel):
+        (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.suggestedFileName):
+        * inspector/front-end/SourceFile.js:
+        (WebInspector.SourceFile.prototype.get displayName):
+
 2011-06-15  Pavel Podivilov  <podivilov@chromium.org>
 

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

@@ -253 +253 @@
         var select = this._filesSelectElement;
         var option = document.createElement("option");
-        option.text = this._displayNameForScriptURL(sourceFile.url) || WebInspector.UIString("(program)");
+        option.text = sourceFile.displayName;
         option.title = sourceFile.url;
         option.isContentScript = sourceFile.isContentScript;
@@ -291 +291 @@
         option._sourceFileId = sourceFile.id;
         this._sourceFileIdToFilesSelectOption[sourceFile.id] = option;
-    },
-
-    _displayNameForScriptURL: function(url)
-    {
-        var displayName = url;
-        var indexOfQuery = displayName.indexOf("?");
-        if (indexOfQuery > 0)
-            displayName = displayName.substring(0, indexOfQuery);
-        var fromIndex = displayName.lastIndexOf("/", displayName.length - 2);
-        if (fromIndex !== -1)
-            displayName = displayName.substring(fromIndex + 1);
-        WebInspector.log(displayName.length);
-        if (displayName.length > 100)
-            displayName = displayName.substring(0, 80) + "...";
-        return displayName;
     },
 
@@ -606 +591 @@
     {
         var sourceFile = this._presentationModel.sourceFile(sourceFileId);
-        var delegate = new WebInspector.SourceFrameDelegateForScriptsPanel(this._presentationModel, sourceFileId);
+        var delegate = new WebInspector.SourceFrameDelegateForScriptsPanel(this._presentationModel, sourceFileId, sourceFile.displayName);
         var sourceFrame = new WebInspector.SourceFrame(delegate, sourceFile.url);
         sourceFrame._sourceFileId = sourceFileId;
@@ -1071 +1056 @@
 
 
-WebInspector.SourceFrameDelegateForScriptsPanel = function(model, sourceFileId)
+WebInspector.SourceFrameDelegateForScriptsPanel = function(model, sourceFileId, scriptName)
 {
     WebInspector.SourceFrameDelegate.call(this);
@@ -1077 +1062 @@
     this._sourceFileId = sourceFileId;
     this._popoverObjectGroup = "popover";
+    this._scriptName = scriptName;
 }
 
@@ -1150 +1136 @@
     suggestedFileName: function()
     {
-        var sourceFile = this._model.sourceFile(this._sourceFileId);
-        return WebInspector.panels.scripts._displayNameForScriptURL(sourceFile.url) || "untitled.js";
+        return this._scriptName;
     }
 }

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

@@ -64 +64 @@
     },
 
+    get displayName()
+    {
+        return this.url ? WebInspector.displayNameForURL(this.url) : WebInspector.UIString("(program)");
+    },
+
     get content()
     {