[DevTools] Small cleanup after device mode v2.

third_party/WebKit/Source/devtools/front_end/emulation/MediaQueryInspector.js

 // Copyright 2014 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.
 
 /**
  * @constructor
  * @extends {WebInspector.Widget}
  * @implements {WebInspector.TargetManager.Observer}
  * @param {function():number} getWidthCallback
  * @param {function(number)} setWidthCallback
  */
 WebInspector.MediaQueryInspector = function(getWidthCallback, setWidthCallback)
 {
     WebInspector.Widget.call(this, true);
     this.registerRequiredCSS("emulation/mediaQueryInspector.css");
-    this.contentElement.classList.add("media-inspector-view", "media-inspector-view-empty");
+    this.contentElement.classList.add("media-inspector-view");
     this.contentElement.addEventListener("click", this._onMediaQueryClicked.bind(this), false);
     this.contentElement.addEventListener("contextmenu", this._onContextMenu.bind(this), false);
     this._mediaThrottler = new WebInspector.Throttler(0);
 
     this._getWidthCallback = getWidthCallback;
     this._setWidthCallback = setWidthCallback;
     this._offset = 0;
     this._scale = 1;
-    this._lastReportedCount = 0;
 
     WebInspector.targetManager.observeTargets(this);
-
     WebInspector.zoomManager.addEventListener(WebInspector.ZoomManager.Events.ZoomChanged, this._renderMediaQueries.bind(this), this);
 }
 
 /**
  * @enum {number}
  */
 WebInspector.MediaQueryInspector.Section = {
     Max: 0,
     MinMax: 1,
     Min: 2
 }
 
-WebInspector.MediaQueryInspector.Events = {
-    CountUpdated: "CountUpdated"
-}
-
 WebInspector.MediaQueryInspector.prototype = {
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         // FIXME: adapt this to multiple targets.
         if (this._cssModel)
             return;
@@ skipping 28 matching lines @@
     setAxisTransform: function(offset, scale)
     {
         if (this._offset === offset && Math.abs(this._scale - scale) < 1e-8)
             return;
         this._offset = offset;
         this._scale = scale;
         this._renderMediaQueries();
     },
 
     /**
-     * @param {boolean} enabled
-     */
-    setEnabled: function(enabled)
-    {
-        this._enabled = enabled;
-        this._scheduleMediaQueriesUpdate();
-    },
-
-    /**
      * @param {!Event} event
      */
     _onMediaQueryClicked: function(event)
     {
         var mediaQueryMarker = event.target.enclosingNodeOrSelfWithClass("media-inspector-marker");
         if (!mediaQueryMarker)
             return;
 
         var model = mediaQueryMarker._model;
         if (model.section() === WebInspector.MediaQueryInspector.Section.Max) {
@@ skipping 46 matching lines @@
     /**
      * @param {!WebInspector.UILocation} location
      */
     _revealSourceLocation: function(location)
     {
         WebInspector.Revealer.reveal(location);
     },
 
     _scheduleMediaQueriesUpdate: function()
     {
-        if (!this._enabled)
+        if (!this.isShowing())
             return;
         this._mediaThrottler.schedule(this._refetchMediaQueries.bind(this));
     },
 
     _refetchMediaQueries: function()
     {
-        if (!this._enabled || !this._cssModel)
+        if (!this.isShowing() || !this._cssModel)
             return Promise.resolve();
 
         return this._cssModel.mediaQueriesPromise()
             .then(this._rebuildMediaQueries.bind(this))
     },
 
     /**
      * @param {!Array.<!WebInspector.MediaQueryInspector.MediaQueryUIModel>} models
      * @return {!Array.<!WebInspector.MediaQueryInspector.MediaQueryUIModel>}
      */
@@ skipping 42 matching lines @@
          * @return {number}
          */
         function compareModels(model1, model2)
         {
             return model1.compareTo(model2);
         }
     },
 
     _renderMediaQueries: function()
     {
-        if (!this._cachedQueryModels)
+        if (!this._cachedQueryModels || !this.isShowing())
             return;
 
         var markers = [];
         var lastMarker = null;
         for (var i = 0; i < this._cachedQueryModels.length; ++i) {
             var model = this._cachedQueryModels[i];
             if (lastMarker && lastMarker.model.dimensionsEqual(model)) {
                 lastMarker.locations.push(model.rawLocation());
                 lastMarker.active = lastMarker.active || model.active();
             } else {
                 lastMarker = {
                     active: model.active(),
                     model: model,
                     locations: [ model.rawLocation() ]
                 };
                 markers.push(lastMarker);
             }
         }
 
-        if (markers.length !== this._lastReportedCount) {
-            this._lastReportedCount = markers.length;
-            this.dispatchEventToListeners(WebInspector.MediaQueryInspector.Events.CountUpdated, markers.length);
-        }
-
-        if (!this.isShowing())
-            return;
-
-        var oldChildrenCount = this.contentElement.children.length;
         this.contentElement.removeChildren();
 
         var container = null;
         for (var i = 0; i < markers.length; ++i) {
             if (!i || markers[i].model.section() !== markers[i - 1].model.section())
                 container = this.contentElement.createChild("div", "media-inspector-marker-container");
             var marker = markers[i];
             var bar = this._createElementFromMediaQueryModel(marker.model);
             bar._model = marker.model;
             bar._locations = marker.locations;
             bar.classList.toggle("media-inspector-marker-inactive", !marker.active);
             container.appendChild(bar);
         }
     },
 
     /**
      * @return {number}
      */
     _zoomFactor: function()
     {
         return WebInspector.zoomManager.zoomFactor() / this._scale;
     },
 
     wasShown: function()
     {
-        this._renderMediaQueries();
+        this._scheduleMediaQueriesUpdate();
     },
 
     /**
      * @param {!WebInspector.MediaQueryInspector.MediaQueryUIModel} model
      * @return {!Element}
      */
     _createElementFromMediaQueryModel: function(model)
     {
         var zoomFactor = this._zoomFactor();
         var minWidthValue = model.minWidthExpression() ? model.minWidthExpression().computedLength() : 0;
@@ skipping 181 matching lines @@
     },
 
     /**
      * @return {boolean}
      */
     active: function()
     {
         return this._active;
     }
 }