DevTools: remove continue to location from behind experiment.

third_party/WebKit/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 37 matching lines @@
     this._popoverHelper.setDisableOnClick(true);
     this._popoverHelper.setTimeout(250, 250);
     this._popoverHelper.setHasPadding(true);
     this._scriptsPanel.element.addEventListener(
         'scroll', this._popoverHelper.hidePopover.bind(this._popoverHelper), true);
 
     this.textEditor.element.addEventListener('keydown', this._onKeyDown.bind(this), true);
     this.textEditor.element.addEventListener('keyup', this._onKeyUp.bind(this), true);
     this.textEditor.element.addEventListener('mousemove', this._onMouseMove.bind(this), false);
     this.textEditor.element.addEventListener('mousedown', this._onMouseDown.bind(this), true);
+    this.textEditor.element.addEventListener('focusout', this._onBlur.bind(this), false);
     if (Runtime.experiments.isEnabled('continueToLocationMarkers')) {
       this.textEditor.element.addEventListener('wheel', event => {
         if (UI.KeyboardShortcut.eventHasCtrlOrMeta(event))
           event.preventDefault();
       }, true);
     }
 
     this.textEditor.addEventListener(
         SourceFrame.SourcesTextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this);
 
@@ skipping 410 matching lines @@
         debuggerModel.runtimeModel().releaseObjectGroup('popover');
         this.textEditor.removeHighlight(highlightDescriptor);
       }
     };
   }
 
   /**
    * @param {!KeyboardEvent} event
    */
   _onKeyDown(event) {
+    this._clearControlDown();
+
     if (event.key === 'Escape') {
       if (this._popoverHelper.isPopoverVisible()) {
         this._popoverHelper.hidePopover();
         event.consume();
       }
       return;
     }
+
     if (UI.KeyboardShortcut.eventHasCtrlOrMeta(event) && this._executionLocation) {
-      if (!this._continueToLocationDecorations)
-        this._showContinueToLocations();
+      this._controlDown = true;
+      if (event.key === UI.KeyboardShortcut.Keys.CtrlOrMeta.name) {
+        this._controlTimeout = setTimeout(() => {
+          if (this._executionLocation && this._controlDown)
+            this._showContinueToLocations();
+        }, 150);
+      }
     }
   }
 
   /**
    * @param {!MouseEvent} event
    */
   _onMouseMove(event) {
-    if (this._executionLocation && UI.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
+    if (this._executionLocation && this._controlDown && UI.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
       if (!this._continueToLocationDecorations)
         this._showContinueToLocations();
     }
   }
 
   /**
    * @param {!MouseEvent} event
    */
   _onMouseDown(event) {
     if (!this._executionLocation || !UI.KeyboardShortcut.eventHasCtrlOrMeta(event))
       return;
     if (!this._continueToLocationDecorations)
       return;
     event.consume();
     var textPosition = this.textEditor.coordinatesToCursorPosition(event.x, event.y);
     if (!textPosition)
       return;
     for (var decoration of this._continueToLocationDecorations.keys()) {
       var range = decoration.find();
       if (range.from.line !== textPosition.startLine || range.to.line !== textPosition.startLine)
         continue;
       if (range.from.ch <= textPosition.startColumn && textPosition.startColumn <= range.to.ch) {
         this._continueToLocationDecorations.get(decoration)();
         break;
       }
     }
   }
 
   /**
+   * @param {!Event} event
+   */
+  _onBlur(event) {
+    if (this.textEditor.element.isAncestor(event.target))
+      return;
+    this._clearControlDown();
+  }
+
+  /**
    * @param {!KeyboardEvent} event
    */
   _onKeyUp(event) {
-    if (UI.KeyboardShortcut.eventHasCtrlOrMeta(event))
-      return;
+    this._clearControlDown();
+  }
+
+  _clearControlDown() {
+    this._controlDown = false;
     this._clearContinueToLocations();
+    clearTimeout(this._controlTimeout);
   }
 
   /**
    * @param {number} lineNumber
    * @param {?Bindings.BreakpointManager.Breakpoint} breakpoint
    * @param {?{lineNumber: number, columnNumber: number}} location
    */
   _editBreakpointCondition(lineNumber, breakpoint, location) {
     this._conditionElement = this._createConditionElement(lineNumber);
     this.textEditor.addDecoration(this._conditionElement, lineNumber);
@@ skipping 43 matching lines @@
    */
   setExecutionLocation(uiLocation) {
     this._executionLocation = uiLocation;
     if (!this.loaded)
       return;
 
     this.textEditor.setExecutionLocation(uiLocation.lineNumber, uiLocation.columnNumber);
     if (this.isShowing()) {
       // We need SourcesTextEditor to be initialized prior to this call. @see crbug.com/506566
       setImmediate(() => {
-        this._generateValuesInSource();
-        if (Runtime.experiments.isEnabled('continueToLocationMarkers')) {
-          if (this._continueToLocationDecorations)
+        if (this._controlDown) {
+          if (Runtime.experiments.isEnabled('continueToLocationMarkers'))
             this._showContinueToLocations();
+        } else {
+          this._generateValuesInSource();
         }
       });
     }
   }
 
   _generateValuesInSource() {
     if (!Common.moduleSetting('inlineVariableValues').get())
       return;
     var executionContext = UI.context.flavor(SDK.ExecutionContext);
     if (!executionContext)
@@ skipping 20 matching lines @@
       return;
     this._popoverHelper.hidePopover();
     var executionContext = UI.context.flavor(SDK.ExecutionContext);
     if (!executionContext)
       return;
     var callFrame = UI.context.flavor(SDK.DebuggerModel.CallFrame);
     if (!callFrame)
       return;
     var localScope = callFrame.localScope();
     if (!localScope) {
-      this._clearContinueToLocations();
+      this._clearContinueToLocationsNoRestore();
       return;
     }
     var start = localScope.startLocation();
     var end = localScope.endLocation();
     var debuggerModel = callFrame.debuggerModel;
     debuggerModel.getPossibleBreakpoints(start, end, true)
         .then(locations => this.textEditor.operation(renderLocations.bind(this, locations)));
 
     /**
      * @param {!Array<!SDK.DebuggerModel.BreakLocation>} locations
      * @this {Sources.JavaScriptSourceFrame}
      */
     function renderLocations(locations) {
-      this._clearContinueToLocations();
+      this._clearContinueToLocationsNoRestore();
+      this.textEditor.hideExecutionLineBackground();
+      this._clearValueWidgets();
       this._continueToLocationDecorations = new Map();
       for (var location of locations) {
         var lineNumber = location.lineNumber;
         var token = this.textEditor.tokenAtTextPosition(lineNumber, location.columnNumber);
         if (!token || !token.type)
           continue;
         var line = this.textEditor.line(lineNumber);
         var tokenContent = line.substring(token.startColumn, token.endColumn);
         if (!this._isIdentifier(token.type) && (token.type !== 'js-keyword' || tokenContent !== 'this'))
           continue;
@@ skipping 147 matching lines @@
       }
     }
   }
 
   clearExecutionLine() {
     this.textEditor.operation(() => {
       if (this.loaded && this._executionLocation)
         this.textEditor.clearExecutionLine();
       delete this._executionLocation;
       this._clearValueWidgetsTimer = setTimeout(this._clearValueWidgets.bind(this), 1000);
-      this._clearContinueToLocations();
+      this._clearContinueToLocationsNoRestore();
     });
   }
 
   _clearValueWidgets() {
+    clearTimeout(this._clearValueWidgetsTimer);
     delete this._clearValueWidgetsTimer;
     this.textEditor.operation(() => {
       for (var line of this._valueWidgets.keys())
         this.textEditor.removeDecoration(this._valueWidgets.get(line), line);
       this._valueWidgets.clear();
     });
   }
 
+  _clearContinueToLocationsNoRestore() {
+    if (!this._continueToLocationDecorations)
+      return;
+    this.textEditor.operation(() => {
+      for (var decoration of this._continueToLocationDecorations.keys())
+        this.textEditor.removeHighlight(decoration);
+      this._continueToLocationDecorations = null;
+    });
+  }
+
   _clearContinueToLocations() {
     if (!this._continueToLocationDecorations)
       return;
     this.textEditor.operation(() => {
-      for (var decoration of this._continueToLocationDecorations.keys())
-        this.textEditor.removeHighlight(decoration);
-      delete this._continueToLocationDecorations;
+      this.textEditor.showExecutionLineBackground();
+      this._generateValuesInSource();
+      this._clearContinueToLocationsNoRestore();
     });
   }
 
   /**
    * @param {number} lineNumber
    * @return {!Array<!Sources.JavaScriptSourceFrame.BreakpointDecoration>}
    */
   _lineBreakpointDecorations(lineNumber) {
     return Array.from(this._breakpointDecorations)
         .filter(decoration => (decoration.handle.resolve() || {}).lineNumber === lineNumber);
@@ skipping 620 matching lines @@
       return;
     this.bookmark.clear();
     this.bookmark = null;
   }
 };
 
 Sources.JavaScriptSourceFrame.BreakpointDecoration.bookmarkSymbol = Symbol('bookmark');
 Sources.JavaScriptSourceFrame.BreakpointDecoration._elementSymbolForTest = Symbol('element');
 
 Sources.JavaScriptSourceFrame.continueToLocationDecorationSymbol = Symbol('bookmark');