DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

Source/devtools/front_end/ObjectPopoverHelper.js

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
         this._remoteObjectFormatter = formatter;
     },
 
     /**
      * @param {!Element} element
      * @param {!WebInspector.Popover} popover
      */
     _showObjectPopover: function(element, popover)
     {
         /**
+         * @param {!WebInspector.Target} target
          * @param {!Element} anchorElement
          * @param {!Element} popoverContentElement
-         * @param {?Protocol.Error} error
-         * @param {!DebuggerAgent.FunctionDetails} response
+         * @param {?DebuggerAgent.FunctionDetails} response
          * @this {WebInspector.ObjectPopoverHelper}
          */
-        function didGetDetails(anchorElement, popoverContentElement, error, response)
+        function didGetDetails(target, anchorElement, popoverContentElement, response)
         {
-            if (error) {
-                console.error(error);
+            if (!response)
                 return;
-            }
+
             var container = document.createElement("div");
             container.className = "inline-block";
 
             var title = container.createChild("div", "function-popover-title source-code");
             var functionName = title.createChild("span", "function-name");
             functionName.textContent = response.functionName || WebInspector.UIString("(anonymous function)");
 
             this._linkifier = new WebInspector.Linkifier();
-            var rawLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (response.location);
+            var rawLocation = WebInspector.DebuggerModel.Location.fromPayload(target, response.location);
             var link = this._linkifier.linkifyRawLocation(rawLocation, "function-location-link");
             if (link)
                 title.appendChild(link);
 
             container.appendChild(popoverContentElement);
 
             popover.show(container, anchorElement);
         }
 
         /**
@@ skipping 14 matching lines @@
             var anchorElement = anchorOverride || element;
             var description = (this._remoteObjectFormatter && this._remoteObjectFormatter(result)) || result.description;
 
             var popoverContentElement = null;
             if (result.type !== "object") {
                 popoverContentElement = document.createElement("span");
                 popoverContentElement.className = "monospace console-formatted-" + result.type;
                 popoverContentElement.style.whiteSpace = "pre";
                 popoverContentElement.textContent = description;
                 if (result.type === "function") {
-                    DebuggerAgent.getFunctionDetails(result.objectId, didGetDetails.bind(this, anchorElement, popoverContentElement));
+                    result.functionDetails(didGetDetails.bind(this, result.target(), anchorElement, popoverContentElement));
                     return;
                 }
                 if (result.type === "string")
                     popoverContentElement.textContent = "\"" + popoverContentElement.textContent + "\"";
                 popover.show(popoverContentElement, anchorElement);
             } else {
                 if (result.subtype === "node")
                     result.highlightAsDOMNode();
                 popoverContentElement = document.createElement("div");
                 this._titleElement = document.createElement("div");
@@ skipping 39 matching lines @@
                 if (properties[i].value.description)
                     this._titleElement.textContent += "#" + properties[i].value.description;
                 break;
             }
         }
         this._sectionUpdateProperties(properties, rootTreeElementConstructor, rootPropertyComparer);
     },
 
     __proto__: WebInspector.PopoverHelper.prototype
 }