17815 2008-03-12 20:14:49 -0700 Inspector's DOM tree should descend into subframes 2008-03-12 23:14:24 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 17773 1 aroben aroben oldest_to_newest 73537 0 aroben 2008-03-12 20:14:49 -0700 The Inspector's DOM tree should descend into subframes. We'll need this for our UI refresh, in which there is only one DOM tree for the page instead of one per document. 73545 1 19721 aroben 2008-03-12 22:47:27 -0700 Created attachment 19721 Patch + ChangeLog 73548 2 aroben 2008-03-12 23:14:24 -0700 Committed in r31025 19721 2008-03-12 22:47:27 -0700 2008-03-12 23:06:17 -0700 Patch + ChangeLog 0001-Fix-Bug-17815-Inspector-s-DOM-tree-should-de.patch text/plain 10641 aroben RnJvbSA0Yjc5ZDY3MmIzNmQ1YTNkYjU1NGI2MjAyN2JjMGEyOTJmYjVkYTgzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDEzIE1hciAyMDA4IDAxOjMzOjE0IC0wNDAwClN1YmplY3Q6IFtQRlJdICAgICAgICAgRml4 IEJ1ZyAxNzgxNSBJbnNwZWN0b3IncyBET00gdHJlZSBzaG91bGQgZGVzY2VuZCBpbnRvIHN1YmZy YW1lcwoKICAgICAgICA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4 MTU+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIHBhZ2Uv aW5zcGVjdG9yL0RvY3VtZW50UGFuZWwuanM6CiAgICAgICAgKFdlYkluc3BlY3Rvci5Eb2N1bWVu dFBhbmVsLnJldmVhbE5vZGUpOiBDaGFuZ2VkIHRvIHByb3ZpZGUKICAgICAgICBfaXNBbmNlc3Rv ckluY2x1ZGluZ1BhcmVudEZyYW1lc1dpdGhpblBhbmVsIGFuZAogICAgICAgIF9wYXJlbnROb2Rl T3JGcmFtZUVsZW1lbnRXaXRoaW5QYW5lbCBmb3IgdGhlIGlzQW5jZXN0b3IgYW5kIGdldFBhcmVu dAogICAgICAgIHBhcmFtZXRlcnMgdG8gZmluZFRyZWVFbGVtZW50IHNvIHRoYXQgcGFyZW50IGZy YW1lcyB3aWxsIGJlIHNlYXJjaGVkLgogICAgICAgIChXZWJJbnNwZWN0b3IuRG9jdW1lbnRQYW5l bC51cGRhdGVCcmVhZGNydW1iKToKICAgICAgICAgIC0gQ2hhbmdlZCB3aGlsZSBsb29wIHRvIGZv ciBsb29wCiAgICAgICAgICAtIFVzZSBfcGFyZW50Tm9kZU9yRnJhbWVFbGVtZW50V2l0aGluUGFu ZWwgaW5zdGVhZCBvZgogICAgICAgICAgICBOb2RlLnBhcmVudE5vZGUgdG8gbW92ZSB0byB0aGUg bmV4dCBub2RlCiAgICAgICAgICAtIFRoZSBsb29wIG5vdyBlbmRzIHdoZW4gd2UgcmVhY2ggdGhl IERvY3VtZW50UGFuZWwncyBkb2N1bWVudCBub2RlCiAgICAgICAgICAtIFRyYXZlcnNhbCBwYXN0 IG90aGVyIERvY3VtZW50IG5vZGVzIGlzIG5vdyBhbGxvd2VkCiAgICAgICAgICAtIFdlIGFkZCB0 aGUgInN0YXJ0IiBjbGFzcyB0byB0aGUgZmluYWwgY3J1bWIgYWZ0ZXIgdGhlIGxvb3AgZXhpdHMK ICAgICAgICAoV2ViSW5zcGVjdG9yLkRvY3VtZW50UGFuZWwuX2dldERvY3VtZW50Rm9yTm9kZSk6 IEFkZGVkLiBTaW1wbGUgaGVscGVyCiAgICAgICAgdGhhdCByZXR1cm5zIHRoZSBub2RlIGl0c2Vs ZiBpZiB0aGUgbm9kZSBpcyBhIERvY3VtZW50IG5vZGUsIG9yIHRoZQogICAgICAgIG5vZGUncyBv d25lckRvY3VtZW50IG90aGVyd2lzZS4KICAgICAgICAoV2ViSW5zcGVjdG9yLkRvY3VtZW50UGFu ZWwuX3BhcmVudE5vZGVPckZyYW1lRWxlbWVudFdpdGhpblBhbmVsKToKICAgICAgICBBZGRlZC4g UmV0dXJucyB0aGUgbm9kZSdzIHBhcmVudCBub2RlIG9yLCBpbiB0aGUgY2FzZSBvZiBhIERvY3Vt ZW50CiAgICAgICAgbm9kZSwgdGhlIG5vZGUncyB3aW5kb3cncyBvd25pbmcgZnJhbWUgZWxlbWVu dCwgYnV0IHdpbGwgbm90IHJldHVybiBhCiAgICAgICAgbm9kZSB0aGF0IGlzIGluIGEgcGFyZW50 IGZyYW1lIG9mIHRoZSBEb2N1bWVudFBhbmVsJ3MgRG9jdW1lbnQuCiAgICAgICAgKFdlYkluc3Bl Y3Rvci5Eb2N1bWVudFBhbmVsLl9pc0FuY2VzdG9ySW5jbHVkaW5nUGFyZW50RnJhbWVzV2l0aGlu UGFuZWwpOgogICAgICAgIEFkZGVkLiBSZXR1cm5zIHRydWUgaWYgYSBpcyBhbiBhbmNlc3RvciBv ZiBiIGlmIGEgaXMgYW4gYW5jZXN0b3Igb2YgYQogICAgICAgIGZyYW1lIGVsZW1lbnQgd2hvc2Ug c3ViZnJhbWUocykgY29udGFpbiBiLgogICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVF bGVtZW50KTogV2Ugbm93IGNvbnNpZGVyIG91cnNlbHZlcyB0byBoYXZlCiAgICAgICAgY2hpbGRy ZW4gaWYgd2UgaGF2ZSBhIGNvbnRlbnREb2N1bWVudC4KICAgICAgICAoV2ViSW5zcGVjdG9yLkRP TU5vZGVUcmVlRWxlbWVudC5vbnBvcHVsYXRlKTogTW92ZWQgdGhlIGFwcGVuZENoaWxkCiAgICAg ICAgbG9vcCBpbnRvIGEgZnVuY3Rpb24gc28gdGhhdCB3ZSBjYW4gYWRkIGJvdGggY2hpbGRyZW4g b2Ygb3VyCiAgICAgICAgY29udGVudERvY3VtZW50IGFuZCBjaGlsZHJlbiBvZiBvdXIgbm9kZSB0 byB0aGUgdHJlZS4KICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5vbmRi bGNsaWNrKTogQ2hhbmdlZCBzbyB0aGF0IHdlIGdldAogICAgICAgIHRoZSByb290RE9NTm9kZSBi eSB0cmF2ZXJzaW5nIHRoZSB0cmVlIG91dGxpbmUgaGllcmFyY2h5IGluc3RlYWQgb2YKICAgICAg ICB0aGUgRE9NIGhpZXJhcmNoeSBzbyB0aGF0IHdlIGNhbiBlYXNpbHkganVtcCB1cCB0byBhIHBh cmVudCBmcmFtZS4KLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg fCAgIDQwICsrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0RvY3VtZW50 UGFuZWwuanMgfCAgIDc0ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMTAwIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjYWQ2YS4uMGRm MzM5YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsNSArMSw0NSBAQAogMjAwOC0wMy0xMiAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBs ZS5jb20+CiAKKyAgICAgICAgRml4IEJ1ZyAxNzgxNSBJbnNwZWN0b3IncyBET00gdHJlZSBzaG91 bGQgZGVzY2VuZCBpbnRvIHN1YmZyYW1lcworCisgICAgICAgIDxodHRwOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL0RvY3VtZW50UGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRG9jdW1lbnRQYW5lbC5yZXZlYWxOb2RlKTogQ2hhbmdlZCB0 byBwcm92aWRlCisgICAgICAgIF9pc0FuY2VzdG9ySW5jbHVkaW5nUGFyZW50RnJhbWVzV2l0aGlu UGFuZWwgYW5kCisgICAgICAgIF9wYXJlbnROb2RlT3JGcmFtZUVsZW1lbnRXaXRoaW5QYW5lbCBm b3IgdGhlIGlzQW5jZXN0b3IgYW5kIGdldFBhcmVudAorICAgICAgICBwYXJhbWV0ZXJzIHRvIGZp bmRUcmVlRWxlbWVudCBzbyB0aGF0IHBhcmVudCBmcmFtZXMgd2lsbCBiZSBzZWFyY2hlZC4KKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Eb2N1bWVudFBhbmVsLnVwZGF0ZUJyZWFkY3J1bWIpOgorICAg ICAgICAgIC0gQ2hhbmdlZCB3aGlsZSBsb29wIHRvIGZvciBsb29wCisgICAgICAgICAgLSBVc2Ug X3BhcmVudE5vZGVPckZyYW1lRWxlbWVudFdpdGhpblBhbmVsIGluc3RlYWQgb2YKKyAgICAgICAg ICAgIE5vZGUucGFyZW50Tm9kZSB0byBtb3ZlIHRvIHRoZSBuZXh0IG5vZGUKKyAgICAgICAgICAt IFRoZSBsb29wIG5vdyBlbmRzIHdoZW4gd2UgcmVhY2ggdGhlIERvY3VtZW50UGFuZWwncyBkb2N1 bWVudCBub2RlCisgICAgICAgICAgLSBUcmF2ZXJzYWwgcGFzdCBvdGhlciBEb2N1bWVudCBub2Rl cyBpcyBub3cgYWxsb3dlZAorICAgICAgICAgIC0gV2UgYWRkIHRoZSAic3RhcnQiIGNsYXNzIHRv IHRoZSBmaW5hbCBjcnVtYiBhZnRlciB0aGUgbG9vcCBleGl0cworICAgICAgICAoV2ViSW5zcGVj dG9yLkRvY3VtZW50UGFuZWwuX2dldERvY3VtZW50Rm9yTm9kZSk6IEFkZGVkLiBTaW1wbGUgaGVs cGVyCisgICAgICAgIHRoYXQgcmV0dXJucyB0aGUgbm9kZSBpdHNlbGYgaWYgdGhlIG5vZGUgaXMg YSBEb2N1bWVudCBub2RlLCBvciB0aGUKKyAgICAgICAgbm9kZSdzIG93bmVyRG9jdW1lbnQgb3Ro ZXJ3aXNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRvY3VtZW50UGFuZWwuX3BhcmVudE5vZGVP ckZyYW1lRWxlbWVudFdpdGhpblBhbmVsKToKKyAgICAgICAgQWRkZWQuIFJldHVybnMgdGhlIG5v ZGUncyBwYXJlbnQgbm9kZSBvciwgaW4gdGhlIGNhc2Ugb2YgYSBEb2N1bWVudAorICAgICAgICBu b2RlLCB0aGUgbm9kZSdzIHdpbmRvdydzIG93bmluZyBmcmFtZSBlbGVtZW50LCBidXQgd2lsbCBu b3QgcmV0dXJuIGEKKyAgICAgICAgbm9kZSB0aGF0IGlzIGluIGEgcGFyZW50IGZyYW1lIG9mIHRo ZSBEb2N1bWVudFBhbmVsJ3MgRG9jdW1lbnQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRG9jdW1l bnRQYW5lbC5faXNBbmNlc3RvckluY2x1ZGluZ1BhcmVudEZyYW1lc1dpdGhpblBhbmVsKToKKyAg ICAgICAgQWRkZWQuIFJldHVybnMgdHJ1ZSBpZiBhIGlzIGFuIGFuY2VzdG9yIG9mIGIgaWYgYSBp cyBhbiBhbmNlc3RvciBvZiBhCisgICAgICAgIGZyYW1lIGVsZW1lbnQgd2hvc2Ugc3ViZnJhbWUo cykgY29udGFpbiBiLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudCk6 IFdlIG5vdyBjb25zaWRlciBvdXJzZWx2ZXMgdG8gaGF2ZQorICAgICAgICBjaGlsZHJlbiBpZiB3 ZSBoYXZlIGEgY29udGVudERvY3VtZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVU cmVlRWxlbWVudC5vbnBvcHVsYXRlKTogTW92ZWQgdGhlIGFwcGVuZENoaWxkCisgICAgICAgIGxv b3AgaW50byBhIGZ1bmN0aW9uIHNvIHRoYXQgd2UgY2FuIGFkZCBib3RoIGNoaWxkcmVuIG9mIG91 cgorICAgICAgICBjb250ZW50RG9jdW1lbnQgYW5kIGNoaWxkcmVuIG9mIG91ciBub2RlIHRvIHRo ZSB0cmVlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5vbmRibGNs aWNrKTogQ2hhbmdlZCBzbyB0aGF0IHdlIGdldAorICAgICAgICB0aGUgcm9vdERPTU5vZGUgYnkg dHJhdmVyc2luZyB0aGUgdHJlZSBvdXRsaW5lIGhpZXJhcmNoeSBpbnN0ZWFkIG9mCisgICAgICAg IHRoZSBET00gaGllcmFyY2h5IHNvIHRoYXQgd2UgY2FuIGVhc2lseSBqdW1wIHVwIHRvIGEgcGFy ZW50IGZyYW1lLgorCisKKzIwMDgtMDMtMTIgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29t PgorCiAgICAgICAgIFVwZGF0ZSB0aGUgc3R5bGVzL21ldHJpY3MgcGFuZXMgYW5kIGJyZWFkY3J1 bWIgYWZ0ZXIgZWRpdGluZyBET00KICAgICAgICAgYXR0cmlidXRlcwogCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0RvY3VtZW50UGFuZWwuanMgYi9XZWJDb3JlL3BhZ2UvaW5z cGVjdG9yL0RvY3VtZW50UGFuZWwuanMKaW5kZXggYTk0MGFiNi4uOTNkZDU0MiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Eb2N1bWVudFBhbmVsLmpzCisrKyBiL1dlYkNvcmUv cGFnZS9pbnNwZWN0b3IvRG9jdW1lbnRQYW5lbC5qcwpAQCAtMTYyLDcgKzE2Miw3IEBAIFdlYklu c3BlY3Rvci5Eb2N1bWVudFBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIHJldmVhbE5vZGU6IGZ1 bmN0aW9uKG5vZGUpCiAgICAgewotICAgICAgICB2YXIgbm9kZUl0ZW0gPSB0aGlzLnZpZXdzLmRv bS50cmVlT3V0bGluZS5maW5kVHJlZUVsZW1lbnQobm9kZSwgZnVuY3Rpb24oYSwgYikgeyByZXR1 cm4gaXNBbmNlc3Rvck5vZGUuY2FsbChhLCBiKTsgfSwgZnVuY3Rpb24oYSkgeyByZXR1cm4gYS5w YXJlbnROb2RlOyB9KTsKKyAgICAgICAgdmFyIG5vZGVJdGVtID0gdGhpcy52aWV3cy5kb20udHJl ZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KG5vZGUsIHRoaXMuX2lzQW5jZXN0b3JJbmNsdWRpbmdQ YXJlbnRGcmFtZXNXaXRoaW5QYW5lbC5iaW5kKHRoaXMpLCB0aGlzLl9wYXJlbnROb2RlT3JGcmFt ZUVsZW1lbnRXaXRoaW5QYW5lbC5iaW5kKHRoaXMpKTsKICAgICAgICAgaWYgKCFub2RlSXRlbSkK ICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMjgyLDExICsyODIsMTMgQEAgV2ViSW5zcGVjdG9y LkRvY3VtZW50UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9OwogCiAgICAgICAgIGZvdW5k Um9vdCA9IGZhbHNlOwotICAgICAgICB2YXIgY3VycmVudCA9IHRoaXMuZm9jdXNlZERPTU5vZGU7 Ci0gICAgICAgIHdoaWxlIChjdXJyZW50KSB7Ci0gICAgICAgICAgICBpZiAoY3VycmVudC5ub2Rl VHlwZSA9PT0gTm9kZS5ET0NVTUVOVF9OT0RFKQorICAgICAgICBmb3IgKHZhciBjdXJyZW50ID0g dGhpcy5mb2N1c2VkRE9NTm9kZTsgY3VycmVudDsgY3VycmVudCA9IHRoaXMuX3BhcmVudE5vZGVP ckZyYW1lRWxlbWVudFdpdGhpblBhbmVsKGN1cnJlbnQpKSB7CisgICAgICAgICAgICBpZiAoY3Vy cmVudCA9PT0gdGhpcy5yZXNvdXJjZS5kb2N1bWVudE5vZGUpCiAgICAgICAgICAgICAgICAgYnJl YWs7CiAKKyAgICAgICAgICAgIGlmIChjdXJyZW50Lm5vZGVUeXBlID09PSBOb2RlLkRPQ1VNRU5U X05PREUpCisgICAgICAgICAgICAgICAgY29udGludWU7CisKICAgICAgICAgICAgIGlmIChjdXJy ZW50ID09PSB0aGlzLnJvb3RET01Ob2RlKQogICAgICAgICAgICAgICAgIGZvdW5kUm9vdCA9IHRy dWU7CiAKQEAgLTM3MiwxMyArMzc0LDEzIEBAIFdlYkluc3BlY3Rvci5Eb2N1bWVudFBhbmVsLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjcnVtYi5hZGRTdHlsZUNsYXNzKCJzZWxlY3Rl ZCIpOwogICAgICAgICAgICAgaWYgKCFjcnVtYnMuY2hpbGROb2Rlcy5sZW5ndGgpCiAgICAgICAg ICAgICAgICAgY3J1bWIuYWRkU3R5bGVDbGFzcygiZW5kIik7Ci0gICAgICAgICAgICBpZiAoY3Vy cmVudC5wYXJlbnROb2RlLm5vZGVUeXBlID09PSBOb2RlLkRPQ1VNRU5UX05PREUpCi0gICAgICAg ICAgICAgICAgY3J1bWIuYWRkU3R5bGVDbGFzcygic3RhcnQiKTsKIAogICAgICAgICAgICAgY3J1 bWJzLmFwcGVuZENoaWxkKGNydW1iKTsKLSAgICAgICAgICAgIGN1cnJlbnQgPSBjdXJyZW50LnBh cmVudE5vZGU7CiAgICAgICAgIH0KIAorICAgICAgICBpZiAoY3J1bWJzLmhhc0NoaWxkTm9kZXMo KSkKKyAgICAgICAgICAgIGNydW1icy5sYXN0Q2hpbGQuYWRkU3R5bGVDbGFzcygic3RhcnQiKTsK KwogICAgICAgICB0aGlzLnVwZGF0ZUJyZWFkY3J1bWJTaXplcygpOwogICAgIH0sCiAKQEAgLTcz MywxNCArNzM1LDQ5IEBAIFdlYkluc3BlY3Rvci5Eb2N1bWVudFBhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy51cGRhdGVCcmVhZGNydW1iU2l6ZXMoKTsKIAogICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOwotICAgIH0KKyAgICB9LAorCisgICAgX2dldERvY3VtZW50Rm9yTm9k ZTogZnVuY3Rpb24obm9kZSkKKyAgICB7CisgICAgICAgIHJldHVybiBub2RlLm5vZGVUeXBlID09 IE5vZGUuRE9DVU1FTlRfTk9ERSA/IG5vZGUgOiBub2RlLm93bmVyRG9jdW1lbnQ7CisgICAgfSwK KworICAgIF9wYXJlbnROb2RlT3JGcmFtZUVsZW1lbnRXaXRoaW5QYW5lbDogZnVuY3Rpb24obm9k ZSkKKyAgICB7CisgICAgICAgIHZhciBwYXJlbnQgPSBub2RlLnBhcmVudE5vZGU7CisgICAgICAg IGlmIChwYXJlbnQpCisgICAgICAgICAgICByZXR1cm4gcGFyZW50OworCisgICAgICAgIHZhciBk b2N1bWVudCA9IHRoaXMuX2dldERvY3VtZW50Rm9yTm9kZShub2RlKTsKKworICAgICAgICBpZiAo ZG9jdW1lbnQgPT09IHRoaXMucmVzb3VyY2UuZG9jdW1lbnROb2RlKQorICAgICAgICAgICAgcmV0 dXJuIHVuZGVmaW5lZDsKKworICAgICAgICByZXR1cm4gZG9jdW1lbnQuZGVmYXVsdFZpZXcuZnJh bWVFbGVtZW50OworICAgIH0sCisKKyAgICBfaXNBbmNlc3RvckluY2x1ZGluZ1BhcmVudEZyYW1l c1dpdGhpblBhbmVsOiBmdW5jdGlvbihhLCBiKQorICAgIHsKKyAgICAgICAgZm9yICh2YXIgbm9k ZSA9IGI7IG5vZGU7IG5vZGUgPSB0aGlzLl9nZXREb2N1bWVudEZvck5vZGUobm9kZSkuZGVmYXVs dFZpZXcuZnJhbWVFbGVtZW50KSB7CisgICAgICAgICAgICBpZiAoaXNBbmNlc3Rvck5vZGUuY2Fs bChhLCBub2RlKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAgICAg aWYgKHRoaXMuX2dldERvY3VtZW50Rm9yTm9kZShub2RlKSA9PT0gdGhpcy5yZXNvdXJjZS5kb2N1 bWVudE5vZGUpIHsKKyAgICAgICAgICAgICAgICAvLyBXZSd2ZSBnb25lIGFzIGhpZ2ggaW4gdGhl IGZyYW1lIGhpZXJhcmNoeSBhcyB3ZSBjYW4gd2l0aG91dAorICAgICAgICAgICAgICAgIC8vIG1v dmluZyBvdXQgb2YgdGhpcyBEb2N1bWVudFBhbmVsLgorICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9LAogfQogCiBXZWJJbnNwZWN0b3IuRG9jdW1lbnRQYW5lbC5wcm90b3R5cGUuX19wcm90 b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZVBhbmVsLnByb3RvdHlwZTsKIAogV2ViSW5zcGVjdG9y LkRPTU5vZGVUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKG5vZGUpCiB7Ci0gICAgdmFyIGhhc0NoaWxk cmVuID0gKFByZWZlcmVuY2VzLmlnbm9yZVdoaXRlc3BhY2UgPyAoZmlyc3RDaGlsZFNraXBwaW5n V2hpdGVzcGFjZS5jYWxsKG5vZGUpID8gdHJ1ZSA6IGZhbHNlKSA6IG5vZGUuaGFzQ2hpbGROb2Rl cygpKTsKKyAgICB2YXIgaGFzQ2hpbGRyZW4gPSBub2RlLmNvbnRlbnREb2N1bWVudCB8fCAoUHJl ZmVyZW5jZXMuaWdub3JlV2hpdGVzcGFjZSA/IChmaXJzdENoaWxkU2tpcHBpbmdXaGl0ZXNwYWNl LmNhbGwobm9kZSkgPyB0cnVlIDogZmFsc2UpIDogbm9kZS5oYXNDaGlsZE5vZGVzKCkpOwogICAg IHZhciB0aXRsZUluZm8gPSBub2RlVGl0bGVJbmZvLmNhbGwobm9kZSwgaGFzQ2hpbGRyZW4sIFdl Ykluc3BlY3Rvci5saW5raWZ5VVJMKTsKIAogICAgIGlmICh0aXRsZUluZm8uaGFzQ2hpbGRyZW4p IApAQCAtODE1LDEyICs4NTIsMjEgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhp cy53aGl0ZXNwYWNlSWdub3JlZCA9IFByZWZlcmVuY2VzLmlnbm9yZVdoaXRlc3BhY2U7CiAKLSAg ICAgICAgdmFyIG5vZGUgPSAoUHJlZmVyZW5jZXMuaWdub3JlV2hpdGVzcGFjZSA/IGZpcnN0Q2hp bGRTa2lwcGluZ1doaXRlc3BhY2UuY2FsbCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0KSA6IHRoaXMu cmVwcmVzZW50ZWRPYmplY3QuZmlyc3RDaGlsZCk7Ci0gICAgICAgIHdoaWxlIChub2RlKSB7Ci0g ICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVF bGVtZW50KG5vZGUpKTsKLSAgICAgICAgICAgIG5vZGUgPSBQcmVmZXJlbmNlcy5pZ25vcmVXaGl0 ZXNwYWNlID8gbmV4dFNpYmxpbmdTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChub2RlKSA6IG5vZGUu bmV4dFNpYmxpbmc7CisgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXM7CisgICAgICAgIGZ1 bmN0aW9uIGFwcGVuZENoaWxkcmVuT2ZOb2RlKG5vZGUpCisgICAgICAgIHsKKyAgICAgICAgICAg IHZhciBjaGlsZCA9IChQcmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlID8gZmlyc3RDaGlsZFNr aXBwaW5nV2hpdGVzcGFjZS5jYWxsKG5vZGUpIDogbm9kZS5maXJzdENoaWxkKTsKKyAgICAgICAg ICAgIHdoaWxlIChjaGlsZCkgeworICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LmFwcGVuZENo aWxkKG5ldyBXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50KGNoaWxkKSk7CisgICAgICAg ICAgICAgICAgY2hpbGQgPSBQcmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlID8gbmV4dFNpYmxp bmdTa2lwcGluZ1doaXRlc3BhY2UuY2FsbChjaGlsZCkgOiBjaGlsZC5uZXh0U2libGluZzsKKyAg ICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAgICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0LmNvbnRlbnREb2N1bWVudCkKKyAgICAgICAgICAgIGFwcGVuZENoaWxkcmVuT2ZOb2RlKHRo aXMucmVwcmVzZW50ZWRPYmplY3QuY29udGVudERvY3VtZW50KTsKKworICAgICAgICBhcHBlbmRD aGlsZHJlbk9mTm9kZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0KTsKKwogICAgICAgICBpZiAodGhp cy5yZXByZXNlbnRlZE9iamVjdC5ub2RlVHlwZSA9PSBOb2RlLkVMRU1FTlRfTk9ERSkgewogICAg ICAgICAgICAgdmFyIHRpdGxlID0gIjxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtdGFnIGNsb3Nl XCI+Jmx0Oy8iICsgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2RlTmFtZS50b0xvd2VyQ2FzZSgp LmVzY2FwZUhUTUwoKSArICImZ3Q7PC9zcGFuPiI7CiAgICAgICAgICAgICB2YXIgaXRlbSA9IG5l dyBUcmVlRWxlbWVudCh0aXRsZSwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgZmFsc2UpOwpAQCAt ODc1LDcgKzkyMSw3IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBwYW5lbCA9IHRoaXMudHJl ZU91dGxpbmUucGFuZWw7Ci0gICAgICAgIHBhbmVsLnJvb3RET01Ob2RlID0gdGhpcy5yZXByZXNl bnRlZE9iamVjdC5wYXJlbnROb2RlOworICAgICAgICBwYW5lbC5yb290RE9NTm9kZSA9IHRoaXMu cGFyZW50LnJlcHJlc2VudGVkT2JqZWN0OwogICAgICAgICBwYW5lbC5mb2N1c2VkRE9NTm9kZSA9 IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7CiAKICAgICAgICAgaWYgKHRoaXMuaGFzQ2hpbGRyZW4g JiYgIXRoaXMuZXhwYW5kZWQpCi0tIAoxLjUuNC4xOC5nZDBiOAoK