DevTools: Simplify DOMBreakpointsSidebarPane inspected URL

third_party/WebKit/Source/devtools/front_end/components/DOMBreakpointsSidebarPane.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 39 matching lines @@
     this._breakpointTypeLabels[this._breakpointTypes.SubtreeModified] = WebInspector.UIString("Subtree Modified");
     this._breakpointTypeLabels[this._breakpointTypes.AttributeModified] = WebInspector.UIString("Attribute Modified");
     this._breakpointTypeLabels[this._breakpointTypes.NodeRemoved] = WebInspector.UIString("Node Removed");
 
     this._contextMenuLabels = {};
     this._contextMenuLabels[this._breakpointTypes.SubtreeModified] = WebInspector.UIString.capitalize("Subtree ^modifications");
     this._contextMenuLabels[this._breakpointTypes.AttributeModified] = WebInspector.UIString.capitalize("Attributes ^modifications");
     this._contextMenuLabels[this._breakpointTypes.NodeRemoved] = WebInspector.UIString.capitalize("Node ^removal");
 
     WebInspector.targetManager.addModelListener(WebInspector.DOMModel, WebInspector.DOMModel.Events.NodeRemoved, this._nodeRemoved, this);
-    WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.InspectedURLChanged, this._inspectedURLChanged, this);
-    this._inspectedURL = WebInspector.targetManager.inspectedURL();
     this._update();
 }
 
 WebInspector.DOMBreakpointsSidebarPane.Marker = "breakpoint-marker";
 
 WebInspector.DOMBreakpointsSidebarPane.prototype = {
-    _inspectedURLChanged: function()
-    {
-        this._breakpointElements = {};
-        this.reset();
-        this._inspectedURL = WebInspector.targetManager.inspectedURL();
-    },
-
     /**
      * @param {!WebInspector.DOMNode} node
      * @param {!WebInspector.ContextMenu} contextMenu
      * @param {boolean} createSubMenu
      */
     populateNodeContextMenu: function(node, contextMenu, createSubMenu)
     {
         if (node.pseudoType())
             return;
 
@@ skipping 284 matching lines @@
         }
         for (var id in this._breakpointElements) {
             var element = this._breakpointElements[id];
             breakpoints.push({ url: this._inspectedURL, path: element._node.path(), type: element._type, enabled: element._checkboxElement.checked });
         }
         this._domBreakpointsSetting.set(breakpoints);
     },
 
     /**
      * @param {!WebInspector.DOMModel} domModel
+     * @param {!WebInspector.DOMDocument} domDocument
      */
-    restoreBreakpoints: function(domModel)
+    restoreBreakpoints: function(domModel, domDocument)

[lushnikov, 2016/08/23 23:26:07]

no need to pass domModel in here; you can get it from domDOcument

[chenwilliam, 2016/08/24 00:18:52]

Done.

     {
+        this._breakpointElements = {};
+        this.reset();
+        this._inspectedURL = domDocument.documentURL;
         var pathToBreakpoints = {};
 
         /**
          * @param {string} path
          * @param {?DOMAgent.NodeId} nodeId
          * @this {WebInspector.DOMBreakpointsSidebarPane}
          */
         function didPushNodeByPathToFrontend(path, nodeId)
         {
             var node = nodeId ? domModel.nodeForId(nodeId) : null;
@@ skipping 41 matching lines @@
             pane.show(this.element);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @type {!WebInspector.DOMBreakpointsSidebarPane}
  */
 WebInspector.domBreakpointsSidebarPane;