DevTools: Tweak v8 code objects name parsing.

Source/devtools/front_end/timeline/TimelineJSProfile.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 WebInspector.TimelineJSProfileProcessor = { };
 
 /**
  * @param {!ProfilerAgent.CPUProfile} jsProfile
  * @param {!WebInspector.TracingModel.Thread} thread
@@ skipping 289 matching lines @@
             var entryEndAddress = entry.address + entry.size;
             if (entryEndAddress <= newEntry.address)
                 break;
         }
         ++index;
         this._entries.splice(index, lastIndex - index, newEntry);
     }
 }
 
 /**
+ * @param {string} functionName
+ * @param {string=} url
+ * @param {string=} scriptId
+ * @param {number=} line
+ * @param {number=} column
+ * @return {!ConsoleAgent.CallFrame}
+ */
+WebInspector.TimelineJSProfileProcessor._createFrame = function(functionName, url, scriptId, line, column)
+{
+    return /** @type {!ConsoleAgent.CallFrame} */ ({
+        "functionName": functionName,
+        "url": url || "",
+        "scriptId": scriptId || "0",
+        "lineNumber": line || 0,
+        "columnNumber": column || 0
+    });
+}
+
+/**
+ * @param {string} name
+ * @param {number} scriptId
+ * @return {!ConsoleAgent.CallFrame}
+ */
+WebInspector.TimelineJSProfileProcessor._buildCallFrame = function(name, scriptId)
+{
+    // Code states:
+    // (empty) -> compiled
+    //    ~    -> optimizable
+    //    *    -> optimized
+    var rePrefix = /^(\w*:)?[*~]?(.*)$/m;
+
+    var tokens = rePrefix.exec(name);
+    var prefix = tokens[1];
+    var body = tokens[2];
+    var rawName;
+    var rawUrl;
+    if (prefix === "Script:") {
+        rawName = "";
+        rawUrl = body;
+    } else {
+        var spacePos = body.lastIndexOf(" ");
+        rawName = spacePos !== -1 ? body.substr(0, spacePos) : body;
+        rawUrl = spacePos !== -1 ? body.substr(spacePos + 1) : "";
+    }
+    var functionName = rawName;
+    var urlData = WebInspector.ParsedURL.splitLineAndColumn(rawUrl);
+    var url = urlData.url || "";
+    var line = urlData.lineNumber || 0;
+    var column = urlData.columnNumber || 0;
+    return WebInspector.TimelineJSProfileProcessor._createFrame(functionName, url, String(scriptId), line, column);
+}
+
+/**
  * @param {!Array<!WebInspector.TracingModel.Event>} events
  * @return {!Array<!WebInspector.TracingModel.Event>}
  */
 WebInspector.TimelineJSProfileProcessor.processRawV8Samples = function(events)
 {
-    var unknownFrame = {
-        functionName: "(unknown)",
-        url: "",
-        scriptId: "0",
-        lineNumber: 0,
-        columnNumber: 0
-    };
+    var missingAddesses = new Set();
+
     /**
      * @param {string} address
      * @return {!ConsoleAgent.CallFrame}
      */
     function convertRawFrame(address)
     {
-        return codeMap.lookupEntry(address) || unknownFrame;
-    }
-
-    // Code states:
-    // (empty) -> compiled
-    //    ~    -> optimizable
-    //    *    -> optimized
-    var reName = /^(\S*:)?[*~]?(\S*)(?: (\S*))?$/;
-
-    /**
-     * @param {string} name
-     * @param {number} scriptId
-     * @return {!ConsoleAgent.CallFrame}
-     */
-    function buildCallFrame(name, scriptId)
-    {
-        var parsed = reName.exec(name);
-        if (!parsed)
-            return unknownFrame;
-        var functionName = parsed[2] || "";
-        var urlData = WebInspector.ParsedURL.splitLineAndColumn(parsed[3] || "");
-        var url = urlData && urlData.url || "";
-        var line = urlData && urlData.lineNumber || 0;
-        var column = urlData && urlData.columnNumber || 0;
-        var frame = {
-            "functionName": functionName,
-            "url": url,
-            "scriptId": String(scriptId),
-            "lineNumber": line,
-            "columnNumber": column
-        };
-        return frame;
+        var entry = codeMap.lookupEntry(address);
+        if (entry)
+            return entry;
+        if (!missingAddesses.has(address)) {
+            missingAddesses.add(address);
+            console.error("Address " + address + " has missing code entry");
+        }
+        return WebInspector.TimelineJSProfileProcessor._createFrame(address);
     }
 
     var recordTypes = WebInspector.TimelineModel.RecordType;
     var samples = [];
     var codeMap = new WebInspector.TimelineJSProfileProcessor.CodeMap();
     for (var i = 0; i < events.length; ++i) {
         var e = events[i];
         var data = e.args["data"];
         switch (e.name) {
         case recordTypes.JitCodeAdded:
-            codeMap.addEntry(data["code_start"], data["code_len"], buildCallFrame(data["name"], data["script_id"]));
+            var frame = WebInspector.TimelineJSProfileProcessor._buildCallFrame(data["name"], data["script_id"]);
+            codeMap.addEntry(data["code_start"], data["code_len"], frame);
             break;
         case recordTypes.JitCodeMoved:
             codeMap.moveEntry(data["code_start"], data["new_code_start"], data["code_len"]);
             break;
         case recordTypes.V8Sample:
             var rawStack = data["stack"];
             // Sometimes backend fails to collect a stack and returns an empty stack.
             // Skip these bogus samples.
             if (data["vm_state"] === "js" && !rawStack.length)
                 break;
             var stack = rawStack.map(convertRawFrame);
             var sampleEvent = new WebInspector.TracingModel.Event(
                 WebInspector.TracingModel.DevToolsTimelineEventCategory,
                 WebInspector.TimelineModel.RecordType.JSSample,
                 WebInspector.TracingModel.Phase.Instant, e.startTime, e.thread);
             sampleEvent.ordinal = e.ordinal;
             sampleEvent.args = {"data": {"stackTrace": stack }};
             samples.push(sampleEvent);
             break;
         }
     }
 
     return samples;
 }