DevTools: Use in JavaScriptSourceFrame current target's debuggerModel instead of WebInspector.debug

Source/devtools/front_end/sources/JavaScriptSourceFrame.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 404 matching lines @@
 
     _removeAllBreakpoints: function()
     {
         var breakpoints = this._breakpointManager.breakpointsForUISourceCode(this._uiSourceCode);
         for (var i = 0; i < breakpoints.length; ++i)
             breakpoints[i].remove();
     },
 
     _getPopoverAnchor: function(element, event)
     {
-        if (!WebInspector.debuggerModel.isPaused())
+        var target = WebInspector.context.flavor(WebInspector.Target);
+        if (!target || !target.debuggerModel.isPaused())
             return null;
 
         var textPosition = this.textEditor.coordinatesToCursorPosition(event.x, event.y);
         if (!textPosition)
             return null;
         var mouseLine = textPosition.startLine;
         var mouseColumn = textPosition.startColumn;
         var textSelection = this.textEditor.selection().normalize();
         if (textSelection && !textSelection.isEmpty()) {
             if (textSelection.startLine !== textSelection.endLine || textSelection.startLine !== mouseLine || mouseColumn < textSelection.startColumn || mouseColumn > textSelection.endColumn)
@@ skipping 30 matching lines @@
             lineNumber: lineNumber,
             startColumn: token.startColumn,
             endColumn: token.endColumn
         };
 
         return anchorBox;
     },
 
     _resolveObjectForPopover: function(anchorBox, showCallback, objectGroupName)
     {
-        if (!WebInspector.debuggerModel.isPaused()) {
+        var target = WebInspector.context.flavor(WebInspector.Target);
+        if (!target || !target.debuggerModel.isPaused()) {
             this._popoverHelper.hidePopover();
             return;
         }
         var lineNumber = anchorBox.highlight.lineNumber;
         var startHighlight = anchorBox.highlight.startColumn;
         var endHighlight = anchorBox.highlight.endColumn;
         var line = this.textEditor.line(lineNumber);
         if (!anchorBox.forSelection) {
             while (startHighlight > 1 && line.charAt(startHighlight - 1) === '.') {
                 var token = this.textEditor.tokenAtTextPosition(lineNumber, startHighlight - 2);
                 if (!token) {
                     this._popoverHelper.hidePopover();
                     return;
                 }
                 startHighlight = token.startColumn;
             }
         }
         var evaluationText = line.substring(startHighlight, endHighlight + 1);
-        var selectedCallFrame = WebInspector.debuggerModel.selectedCallFrame();
+        var selectedCallFrame = target.debuggerModel.selectedCallFrame();
         selectedCallFrame.evaluate(evaluationText, objectGroupName, false, true, false, false, showObjectPopover.bind(this));
 
         /**
          * @param {?RuntimeAgent.RemoteObject} result
          * @param {boolean=} wasThrown
          * @this {WebInspector.JavaScriptSourceFrame}
          */
         function showObjectPopover(result, wasThrown)
         {
-            if (!WebInspector.debuggerModel.isPaused() || !result) {
+            var target = selectedCallFrame.target();

[vsevik, 2014/06/26 07:50:32]

The target might have changed, so I suggest doing
var target = WebInspector.context.flavor(WebInspector.Target); 
var selectedCallFrame = target.debuggerModel.selectedCallFrame();
again

[sergeyv, 2014/06/26 09:21:09]

Done.
But I check that target hasn't changed since start of the evaluation

+            if (!target.debuggerModel.isPaused() || !result) {
                 this._popoverHelper.hidePopover();
                 return;
             }
             this._popoverAnchorBox = anchorBox;
-            showCallback(selectedCallFrame.target().runtimeModel.createRemoteObject(result), wasThrown, this._popoverAnchorBox);
+            showCallback(target.runtimeModel.createRemoteObject(result), wasThrown, this._popoverAnchorBox);
             // Popover may have been removed by showCallback().
             if (this._popoverAnchorBox) {
                 var highlightRange = new WebInspector.TextRange(lineNumber, startHighlight, lineNumber, endHighlight);
                 this._popoverAnchorBox._highlightDescriptor = this.textEditor.highlightRange(highlightRange, "source-frame-eval-expression");
             }
         }
     },
 
     _onHidePopover: function()
     {
@@ skipping 315 matching lines @@
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessageRemoved, this._consoleMessageRemoved, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessagesCleared, this._consoleMessagesCleared, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }