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 585 matching lines @@
     isDescendant: function(descendant)
     {
         return descendant !== null && descendant.isAncestor(this);
     },
 
     /**
      * @return {?PageAgent.FrameId}
      */
     frameId: function()
     {
-        var node = this;
+        var node = this.parentNode || this;

[dgozman, 2016/08/03 16:53:13]

Does this work for immediate children of iframe now? Let's add such a testcase.

[lushnikov, 2016/08/03 18:00:08]

Yes; added test.

         while (!node._frameId && node.parentNode)
             node = node.parentNode;
         return node._frameId;

[dgozman, 2016/08/03 16:53:13]

Should we change _frameId instead?

[lushnikov, 2016/08/03 18:00:08]

Renamed into frameOwnerFrameId to avoid confusion

     },
 
     /**
      * @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));
 }