Use profiling lock in ScreencastView to detect if Timeline or Profiler is started

Source/devtools/front_end/screencast/ScreencastView.js

 /*
  * 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:
  *
  *     * 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 77 matching lines @@
         this._isCasting = false;
         this._context = this._canvasElement.getContext("2d");
         this._checkerboardPattern = this._createCheckerboardPattern(this._context);
 
         this._shortcuts = /** !Object.<number, function(Event=):boolean> */ ({});
         this._shortcuts[WebInspector.KeyboardShortcut.makeKey("l", WebInspector.KeyboardShortcut.Modifiers.Ctrl)] = this._focusNavigationBar.bind(this);
 
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ScreencastFrame, this._screencastFrame, this);
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ScreencastVisibilityChanged, this._screencastVisibilityChanged, this);
 
-        WebInspector.targetManager.addModelListener(WebInspector.TimelineManager, WebInspector.TimelineManager.EventTypes.TimelineStarted, this._onTimeline.bind(this), this);
-        WebInspector.targetManager.addModelListener(WebInspector.TimelineManager, WebInspector.TimelineManager.EventTypes.TimelineStopped, this._onTimeline.bind(this), this);
-        this._timelineActive = this._isTimelineActive();
-
-        WebInspector.targetManager.addModelListener(WebInspector.CPUProfilerModel, WebInspector.CPUProfilerModel.EventTypes.ProfileStarted, this._onProfiler.bind(this), this);
-        WebInspector.targetManager.addModelListener(WebInspector.CPUProfilerModel, WebInspector.CPUProfilerModel.EventTypes.ProfileStopped, this._onProfiler.bind(this), this);
-        this._profilerActive = this._isProfilerActive();
-
+        this._target.profilingLock.addEventListener(WebInspector.Lock.Events.StateChanged, this._onProfilingStateChange, this);

[sergeyv, 2014/08/14 15:01:34]

Lets make profiling lock global (not per target

[yurys, 2014/08/14 15:29:09]

Done. Please take a look: https://codereview.chromium.org/475803002/

         this._updateGlasspane();
     },
 
     wasShown: function()
     {
         this._startCasting();
     },
 
     willHide: function()
     {
         this._stopCasting();
     },
 
     _startCasting: function()
     {
-        if (this._timelineActive || this._profilerActive)
+        if (this._isProfiling())
             return;
         if (this._isCasting)
             return;
         this._isCasting = true;
 
         const maxImageDimension = 2048;
         var dimensions = this._viewportDimensions();
         if (dimensions.width < 0 || dimensions.height < 0) {
             this._isCasting = false;
             return;
@@ skipping 50 matching lines @@
 
     /**
      * @param {!WebInspector.Event} event
      */
     _screencastVisibilityChanged: function(event)
     {
         this._targetInactive = !event.data.visible;
         this._updateGlasspane();
     },
 
-    _onTimeline: function()
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _onProfilingStateChange: function(event)
     {
-        this._timelineActive = this._isTimelineActive();
-        if (this._timelineActive)
+        if (this._isProfiling())
             this._stopCasting();
         else
             this._startCasting();
         this._updateGlasspane();
     },
 
-    /**
-     * @param {!WebInspector.Event} event
-     */
-    _onProfiler: function(event)
+    _isProfiling: function()
     {
-        this._profilerActive = this._isProfilerActive();
-        if (this._profilerActive)
-            this._stopCasting();
-        else
-            this._startCasting();
-        this._updateGlasspane();
+        return this._target.profilingLock.isAcquired();
     },
 
     _updateGlasspane: function()
     {
         if (this._targetInactive) {
             this._glassPaneElement.textContent = WebInspector.UIString("The tab is inactive");
             this._glassPaneElement.classList.remove("hidden");
-        } else if (this._timelineActive) {
-            this._glassPaneElement.textContent = WebInspector.UIString("Timeline is active");
-            this._glassPaneElement.classList.remove("hidden");
-        } else if (this._profilerActive) {
-            this._glassPaneElement.textContent = WebInspector.UIString("CPU profiler is active");
+        } else if (this._isProfiling()) {
+            this._glassPaneElement.textContent = WebInspector.UIString("Profiling in progress");
             this._glassPaneElement.classList.remove("hidden");
         } else {
             this._glassPaneElement.classList.add("hidden");
         }
     },
 
     /**
      * @param {!Event} event
      */
     _handleMouseEvent: function(event)
@@ skipping 560 matching lines @@
         this._navigationUrl.value = url;
     },
 
     _focusNavigationBar: function()
     {
         this._navigationUrl.focus();
         this._navigationUrl.select();
         return true;
     },
 
-    _isTimelineActive: function()
-    {
-        return WebInspector.targetManager.targets().some(function(target){ return target.timelineManager.isStarted();});
-    },
-
-    _isProfilerActive: function()
-    {
-        return WebInspector.targetManager.targets().some(function(target){ return target.cpuProfilerModel.isRecordingProfile();});
-    },
-
   __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @param {!Element} element
  * @constructor
  */
 WebInspector.ScreencastView.ProgressTracker = function(element)
 {
     this._element = element;
@@ skipping 62 matching lines @@
           return;
         this._maxDisplayedProgress = progress;
         this._displayProgress(progress);
     },
 
     _displayProgress: function(progress)
     {
         this._element.style.width = (100 * progress) + "%";
     }
 };