[DevTools] Cleanup DOMExtension.js.

third_party/WebKit/Source/devtools/front_end/sources/WatchExpressionsSidebarPane.js

 /*
  * Copyright (C) IBM Corp. 2009  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 166 matching lines @@
         var isEditing = false;
         for (var watchExpression of this._watchExpressions)
             isEditing |=  watchExpression.isEditing();
 
         if (!isEditing)
             contextMenu.appendItem(WebInspector.UIString.capitalize("Add ^watch ^expression"), this._addButtonClicked.bind(this));
 
         if (this._watchExpressions.length > 1)
             contextMenu.appendItem(WebInspector.UIString.capitalize("Delete ^all ^watch ^expressions"), this._deleteAllButtonClicked.bind(this));
 
+        var target = event.deepElementFromPoint();
+        if (!target)
+            return;
         for (var watchExpression of this._watchExpressions)
-            if (watchExpression.element().containsEventPoint(event))
+            if (watchExpression.element().isSelfOrAncestor(target))
                 watchExpression._populateContextMenu(contextMenu, event);
     },
 
     _deleteAllButtonClicked: function()
     {
         this._watchExpressions = [];
         this._saveExpressions();
         this.update();
     },
 
@@ skipping 240 matching lines @@
      * @param {!Event} event
      */
     _populateContextMenu: function(contextMenu, event)
     {
         if (!this.isEditing())
             contextMenu.appendItem(WebInspector.UIString.capitalize("Delete ^watch ^expression"), this._updateExpression.bind(this, null));
 
         if (!this.isEditing() && this._result && (this._result.type === "number" || this._result.type === "string"))
             contextMenu.appendItem(WebInspector.UIString.capitalize("Copy ^value"), this._copyValueButtonClicked.bind(this));
 
-        if (this._valueElement.containsEventPoint(event))
+        var target = event.deepElementFromPoint();
+        if (target && this._valueElement.isSelfOrAncestor(target))
             contextMenu.appendApplicableItems(this._result);
     },
 
     _copyValueButtonClicked: function()
     {
         InspectorFrontendHost.copyText(this._valueElement.textContent);
     },
 
     __proto__: WebInspector.Object.prototype
 }