Support merged Dart-JS callstacks

Source/core/inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 958 matching lines @@
 
     /**
      * @param {!Object} topCallFrame
      * @param {!Object} parsedCallFrameId
      * @param {!Array.<!Object>} asyncCallStacks
      * @return {?Object}
      */
     _callFrameForParsedId: function(topCallFrame, parsedCallFrameId, asyncCallStacks)
     {
         var asyncOrdinal = parsedCallFrameId["asyncOrdinal"]; // 1-based index
-        if (asyncOrdinal)
+        // FIXMEDART: change this next line back to
+        // if (asyncOrdinal)
+        // once we can remove the hack of giving JavaScript callframes from
+        // mixed Dart-JavaScript call stacks ordinal -1 to trigger the
+        // safer code path used to simulate evaluating code on the call frame
+        // for async call frames.
+        if (asyncOrdinal >= 1)
             topCallFrame = asyncCallStacks[asyncOrdinal - 1];
         var ordinal = parsedCallFrameId["ordinal"];
         var callFrame = topCallFrame;
         while (--ordinal >= 0 && callFrame)
             callFrame = callFrame.caller;
         return callFrame;
     },
 
     /**
      * @param {!Object} objectId
@@ skipping 399 matching lines @@
  * @constructor
  * @param {number} ordinal
  * @param {!Object} callFrame
  * @param {number} asyncOrdinal
  */
 InjectedScript.CallFrameProxy = function(ordinal, callFrame, asyncOrdinal)
 {
     this.callFrameId = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + (asyncOrdinal ? ",\"asyncOrdinal\":" + asyncOrdinal : "") + "}";
     this.functionName = (callFrame.type === "function" ? callFrame.functionName : "");
     this.location = { scriptId: toString(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column, __proto__: null };
+    this.framePointer = callFrame.framePointer;
     this.scopeChain = this._wrapScopeChain(callFrame);
     this.this = injectedScript._wrapObject(callFrame.thisObject, "backtrace");
     if (callFrame.isAtReturn)
         this.returnValue = injectedScript._wrapObject(callFrame.returnValue, "backtrace");
 }
 
 InjectedScript.CallFrameProxy.prototype = {
     /**
      * @param {!Object} callFrame
      * @return {!Array.<!DebuggerAgent.Scope>}
@@ skipping 396 matching lines @@
      */
     _logEvent: function(event)
     {
         inspectedWindow.console.log(event.type, event);
     }
 }
 
 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
 return injectedScript;
 })