76618 2012-01-19 04:02:35 -0800 Web Inspector: Add isSelfOrAnsector and isSelfOrDescendant methods to utilities. 2012-01-19 05:56:33 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 538605 0 vsevik 2012-01-19 04:02:35 -0800 Add isSelfOrAnsector and isSelfOrDescendant methods to utilities. 538610 1 123100 vsevik 2012-01-19 04:08:02 -0800 Created attachment 123100 Patch 538663 2 vsevik 2012-01-19 05:56:33 -0800 Committed r105409: <http://trac.webkit.org/changeset/105409> 123100 2012-01-19 04:08:02 -0800 2012-01-19 05:33:48 -0800 Patch bug-76618-20120119160800.patch text/plain 10844 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc4MWQ5NDUzZDhiZjhi OWZmNWY0MmI1YWE1OGRjMTM3MzM0NmEwNS4uYzdkYjVhNTEzMjJmNzkzMDllNzlmMDUwZTU5YmI3 NTkxYjJmMjYwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTAxLTE5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBpc1NlbGZPckFuc2VjdG9yIGFuZCBpc1NlbGZPckRlc2NlbmRhbnQgbWV0aG9kcyB0 byB1dGlsaXRpZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NjYxOAorCisgICAgICAgIEFkZGVkIGlzU2VsZk9yQW5jZXN0b3IsIGlzU2VsZk9yRGVz Y2VuZGFudCBhbmQgV2ViSW5zcGVjdG9yLnJlc3RvcmVGb2N1c0Zyb21FbGVtZW50IG1ldGhvZHMu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0hlbHBTY3JlZW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5 cGUuX29uQmx1cik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJh clBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWV0cmljc1NpZGViYXJQYW5lLnByb3Rv dHlwZS5faGFuZGxlS2V5RG93bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3Bv dmVyLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anM6CisgICAgICAgICgpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21w dC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZS5kZXRhY2gp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlLmlzQ2FyZXRBdEVu ZE9mUHJvbXB0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX3Vw ZGF0ZVNlbGVjdGlvbk9uU3RhcnRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5faGFuZGxlRE9NVXBkYXRlcyk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnN0 YXJ0RWRpdGluZy5jbGVhblVwQWZ0ZXJFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5y ZXN0b3JlRm9jdXNGcm9tRWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC91 dGlsaXRpZXMuanM6CisgICAgICAgIChFbGVtZW50LnByb3RvdHlwZS5pc0luc2VydGlvbkNhcmV0 SW5zaWRlKToKKyAgICAgICAgKCk6CisKIDIwMTItMDEtMTkgIE1paG5lYSBPdmlkZW5pZSAgPG1p aG5lYUBhZG9iZS5jb20+CiAKICAgICAgICAgQ2FjaGUgUmVuZGVyU3R5bGUgcG9pbnRlciBhcyBh IG1ldGhvZCB0byBhdm9pZCBwZXJmb3JtYW5jZSByZWdyZXNzaW9uIGZvciByZWdpb24gc3R5bGlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EcmF3ZXIu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcwppbmRleCBl MDIyMjQyZmE2OGFkOGI2MTU2OTI3MmY5ZjU2MmUyZTJmOWVlMmIzLi45YmYzNzJhM2VhMjVkOWZl ZWJhZTc0M2M4MDM2NjY2ZTYyMWU5ZTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RyYXdlci5qcwpAQCAtMTQ0LDggKzE0NCw3IEBAIFdlYkluc3BlY3Rvci5EcmF3 ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3NhdmVkSGVpZ2h0ID0gdGhpcy5lbGVt ZW50Lm9mZnNldEhlaWdodDsKIAotICAgICAgICBpZiAodGhpcy5lbGVtZW50ID09PSBXZWJJbnNw ZWN0b3IuY3VycmVudEZvY3VzRWxlbWVudCgpIHx8IHRoaXMuZWxlbWVudC5pc0FuY2VzdG9yKFdl Ykluc3BlY3Rvci5jdXJyZW50Rm9jdXNFbGVtZW50KCkpKQotICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnNldEN1cnJlbnRGb2N1c0VsZW1lbnQoV2ViSW5zcGVjdG9yLnByZXZpb3VzRm9jdXNFbGVt ZW50KCkpOworICAgICAgICBXZWJJbnNwZWN0b3IucmVzdG9yZUZvY3VzRnJvbUVsZW1lbnQodGhp cy5lbGVtZW50KTsKIAogICAgICAgICB2YXIgYW5jaG9yZWRJdGVtcyA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJhbmNob3JlZC1zdGF0dXMtYmFyLWl0ZW1zIik7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5qcwppbmRleCBjMzQ5M2M4OTJi NzVlMjBiZTIwYTAzMmJmOWNkN2VhMmUwMWM0NTlkLi42YjYwZGE5NDAyMGJmNmIyOThiMWFkODc0 MjdkNzllNTE0MjM1YWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hlbHBTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9IZWxwU2NyZWVuLmpzCkBAIC05OSw3ICs5OSw3IEBAIFdlYkluc3BlY3Rvci5IZWxwU2Ny ZWVuLnByb3RvdHlwZSA9IHsKICAgICBfb25CbHVyOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAg ICAgICAgIC8vIFByZXRlbmQgd2UncmUgbW9kYWwsIGdyYWIgZm9jdXMgYmFjayBpZiB3ZSdyZSBz dGlsbCBzaG93bi4KLSAgICAgICAgaWYgKHRoaXMuX2lzU2hvd24gJiYgZXZlbnQudGFyZ2V0ICE9 PSB0aGlzLl9lbGVtZW50ICYmICF0aGlzLl9lbGVtZW50LmlzQW5jZXN0b3IoZXZlbnQudGFyZ2V0 KSkKKyAgICAgICAgaWYgKHRoaXMuX2lzU2hvd24gJiYgIXRoaXMuX2VsZW1lbnQuaXNTZWxmT3JB bmNlc3RvcihldmVudC50YXJnZXQpKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJl bnRGb2N1c0VsZW1lbnQodGhpcy5fZWxlbWVudCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJhclBhbmUuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcwpp bmRleCA5NTJhOTY4NDRkNjExMDM3ZmIyMWQ3YWNlNTdmZmRmYjgwY2RlMDUyLi42NDY3MDA0YzU1 YjMyYmMxYzNjYjhiYjY5YzY3MDI5NDlmY2NkYmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcwpAQCAtMzA5 LDcgKzMwOSw3IEBAIFdlYkluc3BlY3Rvci5NZXRyaWNzU2lkZWJhclBhbmUucHJvdG90eXBlID0g ewogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBzZWxlY3Rpb25SYW5nZSA9IHNl bGVjdGlvbi5nZXRSYW5nZUF0KDApOwotICAgICAgICBpZiAoc2VsZWN0aW9uUmFuZ2UuY29tbW9u QW5jZXN0b3JDb250YWluZXIgIT09IGVsZW1lbnQgJiYgIXNlbGVjdGlvblJhbmdlLmNvbW1vbkFu Y2VzdG9yQ29udGFpbmVyLmlzRGVzY2VuZGFudChlbGVtZW50KSkKKyAgICAgICAgaWYgKCFzZWxl Y3Rpb25SYW5nZS5jb21tb25BbmNlc3RvckNvbnRhaW5lci5pc1NlbGZPckRlc2NlbmRhbnQoZWxl bWVudCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIG9yaWdpbmFsVmFsdWUg PSBlbGVtZW50LnRleHRDb250ZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qb3BvdmVyLmpzCmluZGV4IDRiZmQ2YTM3YmFhMWY4ODhhNTIwZjBmYWRlYjEzMzg1YmQ2 YmZhNjcuLmZiYjU0ZjkyMTMwYWFkMmQwMTlhNGNhYTZkMGJlMDhiMTgzYjNmOWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMKQEAgLTIwNCw3ICsy MDQsNyBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAgICAgX21v dXNlTW92ZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICAvLyBQcmV0ZW5kIHRoYXQg bm90aGluZyBoYXMgaGFwcGVuZWQuCi0gICAgICAgIGlmICh0aGlzLl9ob3ZlckVsZW1lbnQgPT09 IGV2ZW50LnRhcmdldCB8fCAodGhpcy5faG92ZXJFbGVtZW50ICYmIHRoaXMuX2hvdmVyRWxlbWVu dC5pc0FuY2VzdG9yKGV2ZW50LnRhcmdldCkpKQorICAgICAgICBpZiAoZXZlbnQudGFyZ2V0Lmlz U2VsZk9yRGVzY2VuZGFudCh0aGlzLl9ob3ZlckVsZW1lbnQpKQogICAgICAgICAgICAgcmV0dXJu OwogCiAgICAgICAgIC8vIFVzZXIgaGFzIDUwMG1zICh0aGlzLl90aW1lb3V0IC8gMikgdG8gcmVh Y2ggdGhlIHBvcHVwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggYjRkMDcwODcxMjg2NTkxYTRiMDk5Y2Vh YTUzMTBmNGI1MmQxMGViMC4uZjIxZmNmYTEyODNlNjIyYzNhODc4Yjg2NzQwMTM3ZWViYzE2OWE4 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzCkBAIC0yMjkyLDcgKzIyOTIsNyBAQCBXZWJJbnNwZWN0b3IuU3R5 bGVzU2lkZWJhclBhbmUuQ1NTUHJvcGVydHlQcm9tcHQucHJvdG90eXBlID0gewogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIHZhciBzZWxlY3Rpb25SYW5nZSA9IHNlbGVjdGlv bi5nZXRSYW5nZUF0KDApOwotICAgICAgICBpZiAoc2VsZWN0aW9uUmFuZ2UuY29tbW9uQW5jZXN0 b3JDb250YWluZXIgIT09IHRoaXMuX3NpZGViYXJQYW5lLnZhbHVlRWxlbWVudCAmJiAhc2VsZWN0 aW9uUmFuZ2UuY29tbW9uQW5jZXN0b3JDb250YWluZXIuaXNEZXNjZW5kYW50KHRoaXMuX3NpZGVi YXJQYW5lLnZhbHVlRWxlbWVudCkpCisgICAgICAgIGlmICghc2VsZWN0aW9uUmFuZ2UuY29tbW9u QW5jZXN0b3JDb250YWluZXIuaXNTZWxmT3JEZXNjZW5kYW50KHRoaXMuX3NpZGViYXJQYW5lLnZh bHVlRWxlbWVudCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgdmFyIHdv cmRSYW5nZSA9IHNlbGVjdGlvblJhbmdlLnN0YXJ0Q29udGFpbmVyLnJhbmdlT2ZXb3JkKHNlbGVj dGlvblJhbmdlLnN0YXJ0T2Zmc2V0LCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUuU3R5 bGVWYWx1ZURlbGltaXRlcnMsIHRoaXMuX3NpZGViYXJQYW5lLnZhbHVlRWxlbWVudCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKaW5kZXgg ZDc1NWIyODZkM2M4ZDc2MjkzMmY3NmViOTUyODJhODZlNTZkMGI2Ni4uODljMGIwMzEwMTRjNTZl ZWY5ZWI3ZmYzNzgxNjkwM2IwMzg2MzMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qcwpAQCAtMTI2LDggKzEyNiw3IEBAIFdlYkluc3Bl Y3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5wcm94eUVsZW1lbnQu cGFyZW50RWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fZWxlbWVudCwgdGhpcy5wcm94eUVsZW1l bnQpOwogICAgICAgICB0aGlzLnByb3h5RWxlbWVudC5wYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxk KHRoaXMucHJveHlFbGVtZW50KTsKICAgICAgICAgZGVsZXRlIHRoaXMuX3Byb3h5RWxlbWVudDsK LSAgICAgICAgaWYgKHRoaXMuX2VsZW1lbnQgPT09IFdlYkluc3BlY3Rvci5jdXJyZW50Rm9jdXNF bGVtZW50KCkgfHwgdGhpcy5fZWxlbWVudC5pc0FuY2VzdG9yKFdlYkluc3BlY3Rvci5jdXJyZW50 Rm9jdXNFbGVtZW50KCkpKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1 c0VsZW1lbnQoV2ViSW5zcGVjdG9yLnByZXZpb3VzRm9jdXNFbGVtZW50KCkpOworICAgICAgICBX ZWJJbnNwZWN0b3IucmVzdG9yZUZvY3VzRnJvbUVsZW1lbnQodGhpcy5fZWxlbWVudCk7CiAgICAg fSwKIAogICAgIGdldCB0ZXh0KCkKQEAgLTU4NSw3ICs1ODQsNyBAQCBXZWJJbnNwZWN0b3IuVGV4 dFByb21wdC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHNlbGVjdGlvblJhbmdlID0gc2Vs ZWN0aW9uLmdldFJhbmdlQXQoMCk7CiAgICAgICAgIHZhciBub2RlID0gc2VsZWN0aW9uUmFuZ2Uu c3RhcnRDb250YWluZXI7Ci0gICAgICAgIGlmIChub2RlICE9PSB0aGlzLl9lbGVtZW50ICYmICFu b2RlLmlzRGVzY2VuZGFudCh0aGlzLl9lbGVtZW50KSkKKyAgICAgICAgaWYgKCFub2RlLmlzU2Vs Zk9yRGVzY2VuZGFudCh0aGlzLl9lbGVtZW50KSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICBpZiAobm9kZS5ub2RlVHlwZSA9PT0gTm9kZS5URVhUX05PREUgJiYgc2VsZWN0 aW9uUmFuZ2Uuc3RhcnRPZmZzZXQgPCBub2RlLm5vZGVWYWx1ZS5sZW5ndGgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKaW5kZXggZWI0NGE1 ZTE1YzI1OTE4NDc3MTJhMWEzM2VhOGEzYTIxYzdmMGQyYi4uMDU0NDE1ZGVmOGJjNzg3MTI0NDgw NDZlNGVmMjE0YTQ3ZTU4MzZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dFZpZXdlci5qcwpAQCAtOTMwLDcgKzkzMCw3IEBAIFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHNlbGVjdGlvbiA9 IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKICAgICAgICAgaWYgKHNlbGVjdGlvbi5yYW5nZUNvdW50 KSB7CiAgICAgICAgICAgICB2YXIgY29tbW9uQW5jZXN0b3JDb250YWluZXIgPSBzZWxlY3Rpb24u Z2V0UmFuZ2VBdCgwKS5jb21tb25BbmNlc3RvckNvbnRhaW5lcjsKLSAgICAgICAgICAgIGlmICh0 aGlzLl9jb250YWluZXIgPT09IGNvbW1vbkFuY2VzdG9yQ29udGFpbmVyIHx8IHRoaXMuX2NvbnRh aW5lci5pc0FuY2VzdG9yKGNvbW1vbkFuY2VzdG9yQ29udGFpbmVyKSkKKyAgICAgICAgICAgIGlm ICh0aGlzLl9jb250YWluZXIuaXNTZWxmT3JBbmNlc3Rvcihjb21tb25BbmNlc3RvckNvbnRhaW5l cikpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTE2NTIsNyArMTY1 Miw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgaWYgKCFsaW5lUm93KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChs aW5lUm93LmRlY29yYXRpb25zRWxlbWVudCAmJiAobGluZVJvdy5kZWNvcmF0aW9uc0VsZW1lbnQg PT09IHRhcmdldCB8fCBsaW5lUm93LmRlY29yYXRpb25zRWxlbWVudC5pc0FuY2VzdG9yKHRhcmdl dCkpKSB7CisgICAgICAgIGlmIChsaW5lUm93LmRlY29yYXRpb25zRWxlbWVudCAmJiBsaW5lUm93 LmRlY29yYXRpb25zRWxlbWVudC5pc1NlbGZPckFuY2VzdG9yKHRhcmdldCkpIHsKICAgICAgICAg ICAgIGlmICh0aGlzLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIpCiAgICAgICAgICAg ICAgICAgdGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyKGxpbmVSb3cubGluZU51 bWJlcik7CiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1VJVXRpbHMuanMKaW5kZXggODk3ODkyYjkzZjg0ZjM0NjY0ZGNjZWU5M2E1Y2Ez ZTI4YTgxYWU5Ni4uMzFhYzAwNDdiNjYzYTE2ZmY3NGU0YjIxOGZkZWY2ZGUzMDk4M2IwNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5qcwpAQCAtMzA0 LDggKzMwNCw3IEBAIFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50 LCBjb25maWcpCiAgICAgICAgIGlmIChwYXN0ZUNhbGxiYWNrKQogICAgICAgICAgICAgZWxlbWVu dC5yZW1vdmVFdmVudExpc3RlbmVyKCJwYXN0ZSIsIHBhc3RlRXZlbnRMaXN0ZW5lciwgdHJ1ZSk7 CiAKLSAgICAgICAgaWYgKGVsZW1lbnQgPT09IFdlYkluc3BlY3Rvci5jdXJyZW50Rm9jdXNFbGVt ZW50KCkgfHwgZWxlbWVudC5pc0FuY2VzdG9yKFdlYkluc3BlY3Rvci5jdXJyZW50Rm9jdXNFbGVt ZW50KCkpKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1c0VsZW1lbnQo V2ViSW5zcGVjdG9yLnByZXZpb3VzRm9jdXNFbGVtZW50KCkpOworICAgICAgICBXZWJJbnNwZWN0 b3IucmVzdG9yZUZvY3VzRnJvbUVsZW1lbnQoZWxlbWVudCk7CiAgICAgfQogCiAgICAgLyoqIEB0 aGlzIHtFbGVtZW50fSAqLwpAQCAtNjI0LDYgKzYyMywxMiBAQCBXZWJJbnNwZWN0b3Iuc2V0Q3Vy cmVudEZvY3VzRWxlbWVudCA9IGZ1bmN0aW9uKHgpCiAgICAgICAgIFdlYkluc3BlY3Rvci5fcHJl dmlvdXNGb2N1c0VsZW1lbnQuYmx1cigpOwogfQogCitXZWJJbnNwZWN0b3IucmVzdG9yZUZvY3Vz RnJvbUVsZW1lbnQgPSBmdW5jdGlvbihlbGVtZW50KQoreworICAgIGlmIChlbGVtZW50ICYmIGVs ZW1lbnQuaXNTZWxmT3JBbmNlc3RvcihXZWJJbnNwZWN0b3IuY3VycmVudEZvY3VzRWxlbWVudCgp KSkKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1c0VsZW1lbnQoV2ViSW5zcGVj dG9yLnByZXZpb3VzRm9jdXNFbGVtZW50KCkpOworfQorCiBXZWJJbnNwZWN0b3Iuc2V0VG9vbGJh ckNvbG9ycyA9IGZ1bmN0aW9uKGJhY2tncm91bmRDb2xvciwgY29sb3IpCiB7CiAgICAgaWYgKCFX ZWJJbnNwZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCmluZGV4IDYxYmM5MjRhNDA4NmNhOWM4M2Mz NzcwYjFjODU2ODdlMTI3N2IyMjAuLjM2ZWIyYjdmNTllM2EwYmRmM2RjZjU5MDJhMTVmZjllMDIx MTMwNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRp bGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0 aWVzLmpzCkBAIC0yMzQsNyArMjM0LDcgQEAgRWxlbWVudC5wcm90b3R5cGUuaXNJbnNlcnRpb25D YXJldEluc2lkZSA9IGZ1bmN0aW9uKCkKICAgICBpZiAoIXNlbGVjdGlvbi5yYW5nZUNvdW50IHx8 ICFzZWxlY3Rpb24uaXNDb2xsYXBzZWQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB2YXIg c2VsZWN0aW9uUmFuZ2UgPSBzZWxlY3Rpb24uZ2V0UmFuZ2VBdCgwKTsKLSAgICByZXR1cm4gc2Vs ZWN0aW9uUmFuZ2Uuc3RhcnRDb250YWluZXIgPT09IHRoaXMgfHwgc2VsZWN0aW9uUmFuZ2Uuc3Rh cnRDb250YWluZXIuaXNEZXNjZW5kYW50KHRoaXMpOworICAgIHJldHVybiBzZWxlY3Rpb25SYW5n ZS5zdGFydENvbnRhaW5lci5pc1NlbGZPckRlc2NlbmRhbnQodGhpcyk7CiB9CiAKIC8qKgpAQCAt NTUyLDYgKzU1MiwxNiBAQCBOb2RlLnByb3RvdHlwZS5pc0Rlc2NlbmRhbnQgPSBmdW5jdGlvbihk ZXNjZW5kYW50KQogICAgIHJldHVybiAhIWRlc2NlbmRhbnQgJiYgZGVzY2VuZGFudC5pc0FuY2Vz dG9yKHRoaXMpOwogfQogCitOb2RlLnByb3RvdHlwZS5pc1NlbGZPckFuY2VzdG9yID0gZnVuY3Rp b24obm9kZSkKK3sKKyAgICByZXR1cm4gISFub2RlICYmIChub2RlID09PSB0aGlzIHx8IHRoaXMu aXNBbmNlc3Rvcihub2RlKSk7Cit9CisKK05vZGUucHJvdG90eXBlLmlzU2VsZk9yRGVzY2VuZGFu dCA9IGZ1bmN0aW9uKG5vZGUpCit7CisgICAgcmV0dXJuICEhbm9kZSAmJiAobm9kZSA9PT0gdGhp cyB8fCB0aGlzLmlzRGVzY2VuZGFudChub2RlKSk7Cit9CisKIE5vZGUucHJvdG90eXBlLnRyYXZl cnNlTmV4dE5vZGUgPSBmdW5jdGlvbihzdGF5V2l0aGluKQogewogICAgIHZhciBub2RlID0gdGhp cy5maXJzdENoaWxkOwo=