More about:gpu tracing improvements.

chrome/browser/resources/gpu_internals/tracing_controller.js

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 
 /**
  * @fileoverview State and UI for trace data collection.
  */
 cr.define('gpu', function() {
 
   function TracingController() {
@@ skipping 11 matching lines @@
     var statusDiv = document.createElement('div');
     statusDiv.textContent = 'Tracing active.';
     this.overlay_.appendChild(statusDiv);
 
     var stopButton = document.createElement('button');
     stopButton.onclick = this.endTracing.bind(this);
     stopButton.innerText = 'Stop tracing';
     this.overlay_.appendChild(stopButton);
 
     this.traceEvents_ = [];
+
+    this.onKeydownBoundToThis_ = this.onKeydown_.bind(this);
+    this.onKeypressBoundToThis_ = this.onKeypress_.bind(this);
   }
 
   TracingController.prototype = {
     __proto__: cr.EventTarget.prototype,
 
     tracingEnabled_: false,
 
     /**
      * Called by info_view to empty the trace buffer
      */
@@ skipping 13 matching lines @@
       this.tracingEnabled_ = true;
 
       var e = new cr.Event('traceBegun');
       e.events = this.traceEvents_;
       this.dispatchEvent(e);
 
       e = new cr.Event('traceEventsChanged');
       e.numEvents = this.traceEvents_.length;
       this.dispatchEvent(e);
 
-      var self = this;
-      window.addEventListener('keypress', function f(e) {
-        if (e.keyIdentifier == 'Enter') {
-          window.removeEventListener('keypress', f);
-          self.endTracing();
-        }
-      });
+      window.addEventListener('keypress', this.onKeypressBoundToThis_);
+      window.addEventListener('keydown', this.onKeydownBoundToThis_);
     },
 
+    onKeydown_: function(e) {
+      if (e.keyCode == 27) {
+        this.endTracing();
+      }
+    },
+
+    onKeypress_: function(e) {
+      if (e.keyIdentifier == 'Enter') {
+        this.endTracing();
+      }
+    },
     /**
      * Checks whether tracing is enabled
      */
     get isTracingEnabled() {
       return this.tracingEnabled_;
     },
 
     /**
      * Gets the currently traced events. If tracing is active, then
      * this can change on the fly.
      */
     get traceEvents() {
       return this.traceEvents_;
     },
 
     /**
      * Callbed by gpu c++ code when new GPU trace data arrives.
      */
     onTraceDataCollected: function(events) {
       this.traceEvents_.push.apply(this.traceEvents_, events);
     },
 
     /**
      * Called by info_view to finish tracing and update all views.
      */
     endTracing: function() {
       if (!this.tracingEnabled_) throw new Error('Tracing not begun.');
 
+      window.removeEventListener('keydown', this.onKeydownBoundToThis_);
+      window.removeEventListener('keypress', this.onKeypressBoundToThis_);
+
       console.log('Finishing trace');
       if (!browserBridge.debugMode) {
         chrome.send('endTracingAsync');
       } else {
         var events = window.getTimelineTestData1 ?
-          getTimelineTestData1() : [];
+            getTimelineTestData1() : [];
         this.onTraceDataCollected(events);
         window.setTimeout(this.onEndTracingComplete.bind(this), 250);
       }
     },
 
 
     /**
      * Called by the browser when all processes complete tracing.
      */
     onEndTracingComplete: function() {
       this.overlay_.visible = false;
       this.tracingEnabled_ = false;
       console.log('onEndTracingComplete p1 with ' +
                   this.traceEvents_.length + ' events.');
       var e = new cr.Event('traceEnded');
       e.events = this.traceEvents_;
       this.dispatchEvent(e);
     },
 
     selfTest: function() {
       this.beginTracing();
       window.setTimeout(this.endTracing.bind(This), 500);
     }
   };
   return {
     TracingController: TracingController
   };
 });