DevTools: make iframe nodes report correct frame they belong to

third_party/WebKit/Source/devtools/front_end/sdk/DOMModel.js

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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.
@@ skipping 35 matching lines @@
     this._isInShadowTree = isInShadowTree;
 
     this.id = payload.nodeId;
     domModel._idToDOMNode[this.id] = this;
     this._nodeType = payload.nodeType;
     this._nodeName = payload.nodeName;
     this._localName = payload.localName;
     this._nodeValue = payload.nodeValue;
     this._pseudoType = payload.pseudoType;
     this._shadowRootType = payload.shadowRootType;
-    this._frameId = payload.frameId || null;
+    this._frameOwnerFrameId = payload.frameId || null;
     this._xmlVersion = payload.xmlVersion;
 
     this._shadowRoots = [];
 
     this._attributes = [];
     this._attributesMap = {};
     if (payload.attributes)
         this._setAttributesPayload(payload.attributes);
 
     /** @type {!Map<string, ?>} */
@@ skipping 529 matching lines @@
     isDescendant: function(descendant)
     {
         return descendant !== null && descendant.isAncestor(this);
     },
 
     /**
      * @return {?PageAgent.FrameId}
      */
     frameId: function()
     {
-        var node = this;
-        while (!node._frameId && node.parentNode)
+        var node = this.parentNode || this;
+        while (!node._frameOwnerFrameId && node.parentNode)
             node = node.parentNode;
-        return node._frameId;
+        return node._frameOwnerFrameId;
     },
 
     /**
      * @param {!Array.<string>} attrs
      * @return {boolean}
      */
     _setAttributesPayload: function(attrs)
     {
         var attributesChanged = !this._attributes || attrs.length !== this._attributes.length * 2;
         var oldAttributesMap = this._attributesMap || {};
@@ skipping 1660 matching lines @@
 }
 
 /**
  * @param {!WebInspector.Target} target
  * @return {?WebInspector.DOMModel}
  */
 WebInspector.DOMModel.fromTarget = function(target)
 {
     return /** @type {?WebInspector.DOMModel} */ (target.model(WebInspector.DOMModel));
 }