Title: [184045] trunk/Source/WebInspectorUI
Revision
184045
Author
nvasil...@apple.com
Date
2015-05-10 05:23:07 -0700 (Sun, 10 May 2015)

Log Message

Web Inspector: In the console, show function name next to the source link
https://bugs.webkit.org/show_bug.cgi?id=144372

Introduce CallFrameView to display counsole message source links. It looks like this:

    [f] functionName - filename.js:42

Reviewed by Timothy Hatcher.

* UserInterface/Base/Main.js:
(WebInspector.createSourceCodeLocationLink):
(WebInspector.linkifyLocation):
(.showSourceCodeLocation):
(WebInspector.linkifyElement):
Abstract this out as it's used in WebInspector.CallFrameView and WebInspector.createSourceCodeLocationLink.

(WebInspector.sourceCodeForURL):
Move this code from Timeline to Main.js as it's used by Console too.

(WebInspector.linkifyURLAsNode):
Remove tooltipText argument as it is never used.

* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager.prototype._callFramesFromPayload):
* UserInterface/Main.html:
* UserInterface/Models/CallFrame.js:
(WebInspector.CallFrame.fromPayload):
Abstract this out as it's used in WebInspector.TimelineManager.prototype._callFramesFromPayload and
WebInspector.ConsoleMessageView._appendLocationLink.

(WebInspector.CallFrame):
* UserInterface/Views/CallFrameTreeElement.js:
(WebInspector.CallFrameTreeElement):
Move it to WebInspector.CallFrameView.iconForCallFrame.

* UserInterface/Views/CallFrameView.css: Added.
(.call-frame):
(.call-frame .icon):
(.call-frame .titles):
(.call-frame .title):
(.call-frame .source-link):
(.call-frame .title + .subtitle > .source-link):
(.call-frame .subtitle .source-link):
(.call-frame:focus .subtitle .source-link):
(.call-frame .subtitle:empty):
(.call-frame .subtitle):
(.call-frame .colon):
(.call-frame .title + .subtitle::before):
* UserInterface/Views/CallFrameView.js: Added.
(WebInspector.CallFrameView):
(WebInspector.CallFrameView.iconClassNameForCallFrame):
* UserInterface/Views/ConsoleMessageView.css:
(.console-message .console-message-location):
(.console-message .call-frame):
(.console-message .go-to-link):
(.console-message .go-to-link:focus):
(.console-message .console-message-url::before):
(.console-saved-variable): Deleted.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._appendLocationLink):
* UserInterface/Views/DebuggerDashboardView.js:
* UserInterface/Views/Main.css:
(.hidden): Deleted.
* UserInterface/Views/ProfileNodeTreeElement.js:
(WebInspector.ProfileNodeTreeElement):
* UserInterface/Views/TimelineDataGridNode.js:
(WebInspector.TimelineDataGridNode.prototype.createCellContent):

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (184044 => 184045)


--- trunk/Source/WebInspectorUI/ChangeLog	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-05-10 12:23:07 UTC (rev 184045)
@@ -1,3 +1,73 @@
+2015-05-10  Nikita Vasilyev  <nvasil...@apple.com>
+
+        Web Inspector: In the console, show function name next to the source link
+        https://bugs.webkit.org/show_bug.cgi?id=144372
+
+        Introduce CallFrameView to display counsole message source links. It looks like this:
+
+            [f] functionName - filename.js:42
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.createSourceCodeLocationLink):
+        (WebInspector.linkifyLocation):
+        (.showSourceCodeLocation):
+        (WebInspector.linkifyElement):
+        Abstract this out as it's used in WebInspector.CallFrameView and WebInspector.createSourceCodeLocationLink.
+
+        (WebInspector.sourceCodeForURL):
+        Move this code from Timeline to Main.js as it's used by Console too.
+
+        (WebInspector.linkifyURLAsNode):
+        Remove tooltipText argument as it is never used.
+
+        * UserInterface/Controllers/TimelineManager.js:
+        (WebInspector.TimelineManager.prototype._callFramesFromPayload):
+        * UserInterface/Main.html:
+        * UserInterface/Models/CallFrame.js:
+        (WebInspector.CallFrame.fromPayload):
+        Abstract this out as it's used in WebInspector.TimelineManager.prototype._callFramesFromPayload and
+        WebInspector.ConsoleMessageView._appendLocationLink.
+
+        (WebInspector.CallFrame):
+        * UserInterface/Views/CallFrameTreeElement.js:
+        (WebInspector.CallFrameTreeElement):
+        Move it to WebInspector.CallFrameView.iconForCallFrame.
+
+        * UserInterface/Views/CallFrameView.css: Added.
+        (.call-frame):
+        (.call-frame .icon):
+        (.call-frame .titles):
+        (.call-frame .title):
+        (.call-frame .source-link):
+        (.call-frame .title + .subtitle > .source-link):
+        (.call-frame .subtitle .source-link):
+        (.call-frame:focus .subtitle .source-link):
+        (.call-frame .subtitle:empty):
+        (.call-frame .subtitle):
+        (.call-frame .colon):
+        (.call-frame .title + .subtitle::before):
+        * UserInterface/Views/CallFrameView.js: Added.
+        (WebInspector.CallFrameView):
+        (WebInspector.CallFrameView.iconClassNameForCallFrame):
+        * UserInterface/Views/ConsoleMessageView.css:
+        (.console-message .console-message-location):
+        (.console-message .call-frame):
+        (.console-message .go-to-link):
+        (.console-message .go-to-link:focus):
+        (.console-message .console-message-url::before):
+        (.console-saved-variable): Deleted.
+        * UserInterface/Views/ConsoleMessageView.js:
+        (WebInspector.ConsoleMessageView.prototype._appendLocationLink):
+        * UserInterface/Views/DebuggerDashboardView.js:
+        * UserInterface/Views/Main.css:
+        (.hidden): Deleted.
+        * UserInterface/Views/ProfileNodeTreeElement.js:
+        (WebInspector.ProfileNodeTreeElement):
+        * UserInterface/Views/TimelineDataGridNode.js:
+        (WebInspector.TimelineDataGridNode.prototype.createCellContent):
+
 2015-05-08  Tobias Reiss  <tobi+web...@basecode.de>
 
         Web Inspector: Styles sidebar editing with incomplete property looks poor in UI

Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -1739,20 +1739,9 @@
     if (!sourceCodeLocation)
         return null;
 
-    function showSourceCodeLocation(event)
-    {
-        event.stopPropagation();
-        event.preventDefault();
-
-        if (event.metaKey)
-            this.showOriginalUnformattedSourceCodeLocation(sourceCodeLocation);
-        else
-            this.showSourceCodeLocation(sourceCodeLocation);
-    }
-
     var linkElement = document.createElement("a");
     linkElement.className = "go-to-link";
-    linkElement.addEventListener("click", showSourceCodeLocation.bind(this));
+    WebInspector.linkifyElement(linkElement, sourceCodeLocation);
     sourceCodeLocation.populateLiveDisplayLocationTooltip(linkElement);
 
     if (useGoToArrowButton)
@@ -1768,12 +1757,7 @@
 
 WebInspector.linkifyLocation = function(url, lineNumber, columnNumber, className)
 {
-    var sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
-    if (!sourceCode) {
-        sourceCode = WebInspector.debuggerManager.scriptsForURL(url)[0];
-        if (sourceCode)
-            sourceCode = sourceCode.resource || sourceCode;
-    }
+    var sourceCode = WebInspector.sourceCodeForURL(url);
 
     if (!sourceCode) {
         var anchor = document.createElement("a");
@@ -1792,7 +1776,34 @@
     return linkElement;
 };
 
-WebInspector.linkifyURLAsNode = function(url, linkText, classes, tooltipText)
+WebInspector.linkifyElement = function(linkElement, sourceCodeLocation) {
+    console.assert(sourceCodeLocation);
+
+    function showSourceCodeLocation(event)
+    {
+        event.stopPropagation();
+        event.preventDefault();
+
+        if (event.metaKey)
+            this.showOriginalUnformattedSourceCodeLocation(sourceCodeLocation);
+        else
+            this.showSourceCodeLocation(sourceCodeLocation);
+    }
+
+    linkElement.addEventListener("click", showSourceCodeLocation.bind(this));
+};
+
+WebInspector.sourceCodeForURL = function(url) {
+    var sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
+    if (!sourceCode) {
+        sourceCode = WebInspector.debuggerManager.scriptsForURL(url)[0];
+        if (sourceCode)
+            sourceCode = sourceCode.resource || sourceCode;
+    }
+    return sourceCode || null;
+};
+
+WebInspector.linkifyURLAsNode = function(url, linkText, classes)
 {
     if (!linkText)
         linkText = url;
@@ -1803,11 +1814,6 @@
     a.href = ""
     a.className = classes;
 
-    if (tooltipText === undefined)
-        a.title = url;
-    else if (typeof tooltipText !== "string" || tooltipText.length)
-        a.title = tooltipText;
-
     a.textContent = linkText;
     a.style.maxWidth = "100%";
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -451,30 +451,7 @@
         if (!payload)
             return null;
 
-        function createCallFrame(payload)
-        {
-            var url = ""
-            var nativeCode = false;
-
-            if (url ="" "[native code]") {
-                nativeCode = true;
-                url = ""
-            }
-
-            var sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
-            if (!sourceCode)
-                sourceCode = WebInspector.debuggerManager.scriptsForURL(url)[0];
-
-            // The lineNumber is 1-based, but we expect 0-based.
-            var lineNumber = payload.lineNumber - 1;
-
-            var sourceCodeLocation = sourceCode ? sourceCode.createLazySourceCodeLocation(lineNumber, payload.columnNumber) : null;
-            var functionName = payload.functionName !== "global code" ? payload.functionName : null;
-
-            return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode);
-        }
-
-        return payload.map(createCallFrame);
+        return payload.map(WebInspector.CallFrame.fromPayload);
     }
 
     _addRecord(record)

Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Main.html	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html	2015-05-10 12:23:07 UTC (rev 184045)
@@ -42,6 +42,7 @@
     <link rel="stylesheet" href=""
     <link rel="stylesheet" href=""
     <link rel="stylesheet" href=""
+    <link rel="stylesheet" href=""
     <link rel="stylesheet" href=""
     <link rel="stylesheet" href=""
     <link rel="stylesheet" href=""
@@ -377,6 +378,7 @@
     <script src=""
     <script src=""
     <script src=""
+    <script src=""
     <script src=""
     <script src=""
     <script src=""

Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -99,4 +99,31 @@
         for (var i = 0; i < this._scopeChain.length; ++i)
             this._scopeChain[i].object.deprecatedGetAllProperties(propertiesCollected);
     }
+
+    // Static
+
+    static fromPayload(payload)
+    {
+        console.assert(payload);
+
+        var url = ""
+        var nativeCode = false;
+
+        if (url ="" "[native code]") {
+            nativeCode = true;
+            url = ""
+        }
+
+        var sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
+        if (!sourceCode)
+            sourceCode = WebInspector.debuggerManager.scriptsForURL(url)[0];
+
+        // The lineNumber is 1-based, but we expect 0-based.
+        var lineNumber = payload.lineNumber - 1;
+
+        var sourceCodeLocation = sourceCode ? sourceCode.createLazySourceCodeLocation(lineNumber, payload.columnNumber) : null;
+        var functionName = payload.functionName !== "global code" ? payload.functionName : null;
+
+        return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode);
+    }
 };

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -29,15 +29,7 @@
     {
         console.assert(callFrame instanceof WebInspector.CallFrame);
 
-        var className = WebInspector.CallFrameTreeElement.FunctionIconStyleClassName;
-        if (callFrame.nativeCode)
-            className = WebInspector.CallFrameTreeElement.NativeIconStyleClassName;
-
-        // This is more than likely an event listener function with an "on" prefix and it is
-        // as long or longer than the shortest event listener name -- "oncut".
-        if (callFrame.functionName && callFrame.functionName.startsWith("on") && callFrame.functionName.length >= 5)
-            className = WebInspector.CallFrameTreeElement.EventListenerIconStyleClassName;
-
+        var className = WebInspector.CallFrameView.iconClassNameForCallFrame(callFrame);
         var title = callFrame.functionName || WebInspector.UIString("(anonymous function)");
 
         super(className, title, null, callFrame, false);
@@ -78,7 +70,3 @@
         }
     }
 };
-
-WebInspector.CallFrameTreeElement.FunctionIconStyleClassName = "function-icon";
-WebInspector.CallFrameTreeElement.EventListenerIconStyleClassName = "event-listener-icon";
-WebInspector.CallFrameTreeElement.NativeIconStyleClassName = "native-icon";

Added: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css (0 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css	                        (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.css	2015-05-10 12:23:07 UTC (rev 184045)
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+.call-frame {
+    white-space: nowrap;
+    cursor: pointer;
+}
+
+.call-frame .icon {
+    display: inline-block;
+    vertical-align: top;
+    width: 16px;
+    height: 16px;
+    margin-right: 3px;
+}
+
+.call-frame .titles {
+    display: inline-block;
+}
+
+.call-frame .title {
+    max-width: 20vw;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: inline-block;
+}
+
+.call-frame .source-link {
+    max-width: 50vw;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: inline-block;
+}
+
+.call-frame .title + .subtitle > .source-link {
+    max-width: 30vw;
+}
+
+.call-frame .subtitle,
+.call-frame .subtitle .source-link {
+    color: hsla(0, 0%, 0%, 0.6);
+    text-decoration: none;
+}
+
+.call-frame:hover .subtitle .source-link,
+.call-frame:focus .subtitle .source-link {
+    color: hsl(210, 0%, 0%);
+}
+
+.call-frame .subtitle:empty {
+    display: none;
+}
+
+.call-frame .subtitle {
+    font-size: inherit;
+}
+
+.call-frame .colon {
+    background-color: red;
+}
+
+.call-frame .title + .subtitle::before {
+    content: " — ";
+    color: hsla(0, 0%, 0%, 0.4);
+}

Added: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js (0 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js	                        (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 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.CallFrameView = class CallFrameView extends WebInspector.Object
+{
+    constructor(callFrame)
+    {
+        console.assert(callFrame.sourceCodeLocation && callFrame.sourceCodeLocation.sourceCode);
+
+        var callFrameElement = document.createElement("div");
+        callFrameElement.classList.add("call-frame", WebInspector.CallFrameView.iconClassNameForCallFrame(callFrame));
+
+        var sourceCodeLocation = callFrame.sourceCodeLocation;
+        WebInspector.linkifyElement(callFrameElement, sourceCodeLocation);
+
+        var linkElement = document.createElement("a");
+        linkElement.className = "source-link";
+        linkElement.href = ""
+        sourceCodeLocation.populateLiveDisplayLocationTooltip(linkElement);
+        sourceCodeLocation.populateLiveDisplayLocationString(linkElement, "textContent");
+
+        var subtitleElement = document.createElement("span");
+        subtitleElement.classList.add("subtitle");
+        subtitleElement.appendChild(linkElement);
+
+        if (callFrame.functionName) {
+            var imgElement = document.createElement("img");
+            imgElement.className = "icon";
+            callFrameElement.appendChild(imgElement);
+
+            var titlesElement = document.createElement("div");
+            titlesElement.className = "titles";
+            callFrameElement.appendChild(titlesElement);
+
+            var titleElement = document.createElement("span");
+            titleElement.className = "title";
+            titleElement.textContent = callFrame.functionName;
+            titlesElement.appendChild(titleElement);
+
+            titlesElement.appendChild(subtitleElement);
+        } else
+            callFrameElement.appendChild(subtitleElement);
+
+        return callFrameElement;
+    }
+
+    static iconClassNameForCallFrame(callFrame)
+    {
+        // This is more than likely an event listener function with an "on" prefix and it is
+        // as long or longer than the shortest event listener name -- "oncut".
+        if (callFrame.functionName && callFrame.functionName.startsWith("on") && callFrame.functionName.length >= 5)
+            return WebInspector.CallFrameView.EventListenerIconStyleClassName;
+
+        if (callFrame.nativeCode)
+            return WebInspector.CallFrameView.NativeIconStyleClassName;
+
+        return WebInspector.CallFrameView.FunctionIconStyleClassName;
+    }
+};
+
+WebInspector.CallFrameView.FunctionIconStyleClassName = "function-icon";
+WebInspector.CallFrameView.EventListenerIconStyleClassName = "event-listener-icon";
+WebInspector.CallFrameView.NativeIconStyleClassName = "native-icon";

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css	2015-05-10 12:23:07 UTC (rev 184045)
@@ -201,12 +201,6 @@
     color: rgb(0, 128, 255);
 }
 
-.console-message-url {
-    float: right;
-    margin-left: 4px;
-    font-weight: normal;
-}
-
 .console-saved-variable {
     font-style: normal;
     color: rgba(0, 0, 0, 0.33);
@@ -222,3 +216,27 @@
     content: url(../Images/UserInputResult.svg);
     margin-left: 1px;
 }
+
+.console-message .console-message-location {
+    float: right;
+    font-weight: normal;
+}
+
+.console-message .call-frame {
+    -webkit-user-select: text;
+    height: 1.2em;
+}
+
+.console-message .go-to-link {
+    color: hsla(0, 0%, 0%, 0.6);
+    text-decoration: none;
+}
+
+.console-message .go-to-link:hover,
+.console-message .go-to-link:focus {
+    color: hsl(210, 100%, 40%);
+}
+
+.console-message .console-message-url::before {
+    content: ' ';
+}

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -287,13 +287,26 @@
             return;
 
         var firstNonNativeCallFrame = this._firstNonNativeCallFrame();
+
+        var callFrame;
         if (firstNonNativeCallFrame) {
-            var urlElement = this._linkifyCallFrame(firstNonNativeCallFrame);
-            this._element.appendChild(urlElement);
+            // _javascript_ errors and console.* methods.
+            callFrame = WebInspector.CallFrame.fromPayload(firstNonNativeCallFrame);
         } else if (this._message.url && !this._shouldHideURL(this._message.url)) {
-            var urlElement = this._linkifyLocation(this._message.url, this._message.line, this._message.column);
-            this._element.appendChild(urlElement);
+            // CSS warnings have no stack traces.
+            callFrame = WebInspector.CallFrame.fromPayload({
+                url: this._message.url,
+                lineNumber: this._message.line,
+                columnNumber: this._message.column
+            });
         }
+
+        if (!callFrame)
+            return;
+
+        var locationElement = new WebInspector.CallFrameView(callFrame);
+        locationElement.classList.add("console-message-location");
+        this._element.appendChild(locationElement);
     }
 
     _appendExtraParameters()

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -100,8 +100,8 @@
     }
 };
 
-WebInspector.DebuggerDashboardView.FunctionIconStyleClassName = WebInspector.CallFrameTreeElement.FunctionIconStyleClassName;
-WebInspector.DebuggerDashboardView.EventListenerIconStyleClassName = WebInspector.CallFrameTreeElement.EventListenerIconStyleClassName;
+WebInspector.DebuggerDashboardView.FunctionIconStyleClassName = WebInspector.CallFrameView.FunctionIconStyleClassName;
+WebInspector.DebuggerDashboardView.EventListenerIconStyleClassName = WebInspector.CallFrameView.EventListenerIconStyleClassName;
 
 WebInspector.DebuggerDashboardView.IconStyleClassName = "icon";
 WebInspector.DebuggerDashboardView.MessageStyleClassName = "message";

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css	2015-05-10 12:23:07 UTC (rev 184045)
@@ -269,10 +269,6 @@
     background-image: -webkit-canvas(go-to-arrow-selected-active);
 }
 
-.display-location {
-    font-style: italic !important;
-}
-
 .hidden {
     display: none !important;
 }

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeTreeElement.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -56,9 +56,9 @@
 
         switch (profileNode.type) {
         case WebInspector.ProfileNode.Type.Function:
-            className = WebInspector.CallFrameTreeElement.FunctionIconStyleClassName;
+            className = WebInspector.CallFrameView.FunctionIconStyleClassName;
             if (!sourceCodeLocation)
-                className = WebInspector.CallFrameTreeElement.NativeIconStyleClassName;
+                className = WebInspector.CallFrameView.NativeIconStyleClassName;
             break;
         case WebInspector.ProfileNode.Type.Program:
             className = WebInspector.TimelineRecordTreeElement.EvaluatedRecordIconStyleClass;
@@ -70,7 +70,7 @@
         // This is more than likely an event listener function with an "on" prefix and it is
         // as long or longer than the shortest event listener name -- "oncut".
         if (profileNode.functionName && profileNode.functionName.startsWith("on") && profileNode.functionName.length >= 5)
-            className = WebInspector.CallFrameTreeElement.EventListenerIconStyleClassName;
+            className = WebInspector.CallFrameView.EventListenerIconStyleClassName;
 
         var hasChildren = !!profileNode.childNodes.length;
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js (184044 => 184045)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js	2015-05-10 06:46:33 UTC (rev 184044)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js	2015-05-10 12:23:07 UTC (rev 184045)
@@ -150,7 +150,7 @@
                 isAnonymousFunction = true;
             }
 
-            cell.classList.add(WebInspector.CallFrameTreeElement.FunctionIconStyleClassName);
+            cell.classList.add(WebInspector.CallFrameView.FunctionIconStyleClassName);
 
             var fragment = document.createDocumentFragment();
 
@@ -185,7 +185,7 @@
                     fragment.appendChild(titleElement);
                 } else {
                     // Show the function name and icon.
-                    cell.classList.add(WebInspector.CallFrameTreeElement.FunctionIconStyleClassName);
+                    cell.classList.add(WebInspector.CallFrameView.FunctionIconStyleClassName);
 
                     fragment.appendChild(document.createTextNode(functionName));
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to