62537 2011-06-13 04:57:22 -0700 Web Inspector: no way to distinguish between two scripts with the same name. 2011-06-14 09:26:11 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 419497 0 podivilov 2011-06-13 04:57:22 -0700 Web Inspector: no way to distinguish between two scripts with the same name. We currently display only the "last path component" of script url in scripts file select. There is no way to see the full url. 419499 1 96946 podivilov 2011-06-13 04:59:05 -0700 Created attachment 96946 Patch. Web Inspector: add tooltip to file select options in scripts panel. 419501 2 webkit.review.bot 2011-06-13 05:03:22 -0700 Attachment 96946 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 419521 3 96950 podivilov 2011-06-13 06:07:48 -0700 Created attachment 96950 Fix style. 419882 4 96950 eric 2011-06-13 14:39:18 -0700 Comment on attachment 96950 Fix style. Looks reasonable to me. How do we test this? 420295 5 97091 podivilov 2011-06-14 02:37:49 -0700 Created attachment 97091 Added test. 420488 6 podivilov 2011-06-14 09:26:11 -0700 Committed r88808: <http://trac.webkit.org/changeset/88808> 96946 2011-06-13 04:59:05 -0700 2011-06-13 06:07:48 -0700 Patch. patch text/plain 2718 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMmNlNTFmLi4xNzRiMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDYtMTMgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYWRkIHRvb2x0aXAgdG8gZmlsZSBzZWxlY3Qgb3B0aW9ucyBpbiBzY3JpcHRzIHBh bmVsLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0LmNvbXBhcmUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2FkZE9wdGlv blRvRmlsZXNTZWxlY3QpOgorCiAyMDExLTA2LTEyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDU5Yjk3 NzAuLjYwOGFlZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xMTgsOSArMTE4LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuc2lkZWJhclBhbmVzLnNjb3BlY2hhaW4u ZXhwYW5kZWQgPSB0cnVlOwogICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMuZXhw YW5kZWQgPSB0cnVlOwotICAgIAorCiAgICAgdmFyIGhlbHBTZWN0aW9uID0gV2ViSW5zcGVjdG9y LnNob3J0Y3V0c0hlbHAuc2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdHMgUGFu ZWwiKSk7Ci0gICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnJlZ2lzdGVyU2hvcnRjdXRz KGhlbHBTZWN0aW9uLCB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQuYmluZCh0aGlzKSk7ICAgCisgICAg dGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnJlZ2lzdGVyU2hvcnRjdXRzKGhlbHBTZWN0aW9u LCB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQuYmluZCh0aGlzKSk7CiAKICAgICB2YXIgcGFuZWxFbmFi bGVySGVhZGluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiWW91IG5lZWQgdG8gZW5hYmxlIGRl YnVnZ2luZyBiZWZvcmUgeW91IGNhbiB1c2UgdGhlIFNjcmlwdHMgcGFuZWwuIik7CiAgICAgdmFy IHBhbmVsRW5hYmxlckRpc2NsYWltZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVuYWJsaW5n IGRlYnVnZ2luZyB3aWxsIG1ha2Ugc2NyaXB0cyBydW4gc2xvd2VyLiIpOwpAQCAtMjU0LDkgKzI1 NCwxNCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIHNlbGVjdCA9IHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudDsKICAgICAgICAgdmFyIG9wdGlv biA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOwogICAgICAgICBvcHRpb24udGV4 dCA9IHNvdXJjZUZpbGUuZGlzcGxheU5hbWU7CisgICAgICAgIG9wdGlvbi50aXRsZSA9IHNvdXJj ZUZpbGUudXJsOwogICAgICAgICBvcHRpb24uaXNDb250ZW50U2NyaXB0ID0gc291cmNlRmlsZS5p c0NvbnRlbnRTY3JpcHQ7CiAgICAgICAgIGlmIChzb3VyY2VGaWxlLmlzQ29udGVudFNjcmlwdCkK ICAgICAgICAgICAgIG9wdGlvbi5hZGRTdHlsZUNsYXNzKCJleHRlbnNpb24tc2NyaXB0Iik7Cisg ICAgICAgIGZ1bmN0aW9uIGNvbXBhcmUoYSwgYikKKyAgICAgICAgeworICAgICAgICAgICAgcmV0 dXJuIGEgPCBiID8gLTEgOiAoYSA+IGIgPyAxIDogMCk7CisgICAgICAgIH0KICAgICAgICAgZnVu Y3Rpb24gb3B0aW9uQ29tcGFyZShhLCBiKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoYSA9 PT0gc2VsZWN0LmNvbnRlbnRTY3JpcHRTZWN0aW9uKQpAQCAtMjY5LDkgKzI3NCw3IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKCFhLmlz Q29udGVudFNjcmlwdCAmJiBiLmlzQ29udGVudFNjcmlwdCkKICAgICAgICAgICAgICAgICByZXR1 cm4gLTE7CiAKLSAgICAgICAgICAgIGlmIChhLnRleHQgPT09IGIudGV4dCkKLSAgICAgICAgICAg ICAgICByZXR1cm4gMDsKLSAgICAgICAgICAgIHJldHVybiBhLnRleHQgPCBiLnRleHQgPyAtMSA6 IDE7CisgICAgICAgICAgICByZXR1cm4gY29tcGFyZShhLnRleHQsIGIudGV4dCkgfHwgY29tcGFy ZShhLnRpdGxlLCBiLnRpdGxlKTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBpbnNlcnRpb25J bmRleCA9IGluc2VydGlvbkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlGdW5jdGlvbihvcHRp b24sIHNlbGVjdC5jaGlsZE5vZGVzLCBvcHRpb25Db21wYXJlKTsK 96950 2011-06-13 06:07:48 -0700 2011-06-14 02:37:49 -0700 Fix style. patch text/plain 2773 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMmNlNTFmLi42ODBkYzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDYtMTMgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYWRkIHRvb2x0aXAgdG8gZmlsZSBzZWxlY3Qgb3B0aW9ucyBpbiBzY3JpcHRzIHBh bmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI1 MzcKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdC5jb21wYXJlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9hZGRPcHRpb25U b0ZpbGVzU2VsZWN0KToKKwogMjAxMS0wNi0xMiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA1OWI5Nzcw Li42MDhhZWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcwpAQCAtMTE4LDkgKzExOCw5IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwgPSBmdW5jdGlvbigpCiAKICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29wZWNoYWluLmV4 cGFuZGVkID0gdHJ1ZTsKICAgICB0aGlzLnNpZGViYXJQYW5lcy5qc0JyZWFrcG9pbnRzLmV4cGFu ZGVkID0gdHJ1ZTsKLSAgICAKKwogICAgIHZhciBoZWxwU2VjdGlvbiA9IFdlYkluc3BlY3Rvci5z aG9ydGN1dHNIZWxwLnNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHRzIFBhbmVs IikpOwotICAgIHRoaXMuc2lkZWJhclBhbmVzLmNhbGxzdGFjay5yZWdpc3RlclNob3J0Y3V0cyho ZWxwU2VjdGlvbiwgdGhpcy5yZWdpc3RlclNob3J0Y3V0LmJpbmQodGhpcykpOyAgIAorICAgIHRo aXMuc2lkZWJhclBhbmVzLmNhbGxzdGFjay5yZWdpc3RlclNob3J0Y3V0cyhoZWxwU2VjdGlvbiwg dGhpcy5yZWdpc3RlclNob3J0Y3V0LmJpbmQodGhpcykpOwogCiAgICAgdmFyIHBhbmVsRW5hYmxl ckhlYWRpbmcgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIllvdSBuZWVkIHRvIGVuYWJsZSBkZWJ1 Z2dpbmcgYmVmb3JlIHlvdSBjYW4gdXNlIHRoZSBTY3JpcHRzIHBhbmVsLiIpOwogICAgIHZhciBw YW5lbEVuYWJsZXJEaXNjbGFpbWVyID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbmFibGluZyBk ZWJ1Z2dpbmcgd2lsbCBtYWtlIHNjcmlwdHMgcnVuIHNsb3dlci4iKTsKQEAgLTI1NCw5ICsyNTQs MTQgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZh ciBzZWxlY3QgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQ7CiAgICAgICAgIHZhciBvcHRpb24g PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKICAgICAgICAgb3B0aW9uLnRleHQg PSBzb3VyY2VGaWxlLmRpc3BsYXlOYW1lOworICAgICAgICBvcHRpb24udGl0bGUgPSBzb3VyY2VG aWxlLnVybDsKICAgICAgICAgb3B0aW9uLmlzQ29udGVudFNjcmlwdCA9IHNvdXJjZUZpbGUuaXND b250ZW50U2NyaXB0OwogICAgICAgICBpZiAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3JpcHQpCiAg ICAgICAgICAgICBvcHRpb24uYWRkU3R5bGVDbGFzcygiZXh0ZW5zaW9uLXNjcmlwdCIpOworICAg ICAgICBmdW5jdGlvbiBjb21wYXJlKGEsIGIpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVy biBhIDwgYiA/IC0xIDogKGEgPiBiID8gMSA6IDApOworICAgICAgICB9CiAgICAgICAgIGZ1bmN0 aW9uIG9wdGlvbkNvbXBhcmUoYSwgYikKICAgICAgICAgewogICAgICAgICAgICAgaWYgKGEgPT09 IHNlbGVjdC5jb250ZW50U2NyaXB0U2VjdGlvbikKQEAgLTI2OSw5ICsyNzQsNyBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghYS5pc0Nv bnRlbnRTY3JpcHQgJiYgYi5pc0NvbnRlbnRTY3JpcHQpCiAgICAgICAgICAgICAgICAgcmV0dXJu IC0xOwogCi0gICAgICAgICAgICBpZiAoYS50ZXh0ID09PSBiLnRleHQpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIDA7Ci0gICAgICAgICAgICByZXR1cm4gYS50ZXh0IDwgYi50ZXh0ID8gLTEgOiAx OworICAgICAgICAgICAgcmV0dXJuIGNvbXBhcmUoYS50ZXh0LCBiLnRleHQpIHx8IGNvbXBhcmUo YS50aXRsZSwgYi50aXRsZSk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgaW5zZXJ0aW9uSW5k ZXggPSBpbnNlcnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24ob3B0aW9u LCBzZWxlY3QuY2hpbGROb2Rlcywgb3B0aW9uQ29tcGFyZSk7Cg== 97091 2011-06-14 02:37:49 -0700 2011-06-14 05:52:27 -0700 Added test. patch text/plain 8431 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZDQ4MjNkLi43YTg5N2M2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MTQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRk IHRvb2x0aXAgdG8gZmlsZSBzZWxlY3Qgb3B0aW9ucyBpbiBzY3JpcHRzIHBhbmVsLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI1MzcKKworICAgICAg ICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sOgorCiAyMDExLTA2LTEw ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKaW5kZXggZWZkZDM5Ni4uNzk3NzBh ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFu ZWwtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3Jp cHRzLXBhbmVsLWV4cGVjdGVkLnR4dApAQCAtOCw1ICs4LDE1IEBAIFJ1bm5pbmc6IHRlc3RIaXN0 b3J5CiAKIFJ1bm5pbmc6IHRlc3RTb3VyY2VGcmFtZXNDb3VudAogUGFnZSByZWxvYWRlZC4KKwor UnVubmluZzogdGVzdEZpbGVzU2VsZWN0Cit0ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZv by9iYXIvc2NyaXB0LmpzCit0ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIvc2Ny aXB0LmpzP2E9MQordGV4dDogc2NyaXB0LmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL3NjcmlwdC5q cz9hPTIKK3RleHQ6IHNjcmlwdC5qcywgdG9vbHRpcDogLi4uZm9vL2Jhei9zY3JpcHQuanMKK3Rl eHQ6IENvbnRlbnQgc2NyaXB0cywgdG9vbHRpcDogLi4uCit0ZXh0OiBjb250ZW50U2NyaXB0Lmpz LCB0b29sdGlwOiAuLi5mb28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0xCit0ZXh0OiBjb250ZW50 U2NyaXB0LmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0yCit0ZXh0 OiBjb250ZW50U2NyaXB0Mi5qcywgdG9vbHRpcDogLi4uZm9vL2Jhci9jb250ZW50U2NyaXB0Mi5q cz9hPTEKIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5kZXggNjU0YzFmNS4uZWQ2ZGU4NCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5o dG1sCkBAIC0xMjIsNiArMTIyLDM5IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHRydWUsIHNvdXJjZUZyYW1lQ291bnQgPD0gMiwg InRvbyBtYW55IHNvdXJjZSBmcmFtZXMgY3JlYXRlZCBhZnRlciBwYWdlIHJlbG9hZCIpOwogICAg ICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSwKKworICAgICAg ICBmdW5jdGlvbiB0ZXN0RmlsZXNTZWxlY3QobmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAg dmFyIHBhbmVsID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwoKTsKKyAgICAgICAgICAg IHZhciByb290VVJMID0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwuc3Vic3RyaW5nKDAs IFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UudXJsLmxhc3RJbmRleE9mKCIvIikgKyAxKTsKKyAg ICAgICAgICAgIHZhciBuZXh0SWQgPSAwOworCisgICAgICAgICAgICBmdW5jdGlvbiBhZGRPcHRp b24odXJsLCBpc0NvbnRlbnRTY3JpcHQpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg dmFyIGRpc3BsYXlOYW1lID0gdXJsOworICAgICAgICAgICAgICAgIHZhciBpbmRleE9mUXVlcnkg PSBkaXNwbGF5TmFtZS5pbmRleE9mKCI/Iik7CisgICAgICAgICAgICAgICAgaWYgKGluZGV4T2ZR dWVyeSAhPT0gLTEpCisgICAgICAgICAgICAgICAgICAgIGRpc3BsYXlOYW1lID0gZGlzcGxheU5h bWUuc3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVyeSk7CisgICAgICAgICAgICAgICAgdmFyIGxhc3RT bGFzaEluZGV4ID0gZGlzcGxheU5hbWUubGFzdEluZGV4T2YoIi8iKTsKKyAgICAgICAgICAgICAg ICBpZiAobGFzdFNsYXNoSW5kZXggIT09IC0xKQorICAgICAgICAgICAgICAgICAgICBkaXNwbGF5 TmFtZSA9IGRpc3BsYXlOYW1lLnN1YnN0cmluZyhsYXN0U2xhc2hJbmRleCArIDEpOworICAgICAg ICAgICAgICAgIHBhbmVsLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0KHsgaWQ6IG5leHRJZCsrLCB1 cmw6IHJvb3RVUkwgKyB1cmwsIGRpc3BsYXlOYW1lOiBkaXNwbGF5TmFtZSwgaXNDb250ZW50U2Ny aXB0OiBpc0NvbnRlbnRTY3JpcHQgfSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBhZGRP cHRpb24oImZvby9iYXIvc2NyaXB0LmpzIiwgZmFsc2UpOworICAgICAgICAgICAgYWRkT3B0aW9u KCJmb28vYmFyL2NvbnRlbnRTY3JpcHQyLmpzP2E9MSIsIHRydWUpOworICAgICAgICAgICAgYWRk T3B0aW9uKCJmb28vYmFyL3NjcmlwdC5qcz9hPTIiLCBmYWxzZSk7CisgICAgICAgICAgICBhZGRP cHRpb24oImZvby9iYXIvY29udGVudFNjcmlwdC5qcz9hPTIiLCB0cnVlKTsKKyAgICAgICAgICAg IGFkZE9wdGlvbigiZm9vL2Jhci9zY3JpcHQuanM/YT0xIiwgZmFsc2UpOworICAgICAgICAgICAg YWRkT3B0aW9uKCJmb28vYmF6L3NjcmlwdC5qcyIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9w dGlvbigiZm9vL2Jhci9jb250ZW50U2NyaXB0LmpzP2E9MSIsIHRydWUpOworICAgICAgICAgICAg dmFyIHNlbGVjdCA9IHBhbmVsLl9maWxlc1NlbGVjdEVsZW1lbnQ7CisgICAgICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHNlbGVjdC5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIHZh ciBvcHRpb24gPSBzZWxlY3RbaV07CisgICAgICAgICAgICAgICAgdmFyIHRvb2x0aXAgPSAiLi4u IiArIG9wdGlvbi50aXRsZS5zdWJzdHJpbmcocm9vdFVSTC5sZW5ndGgpOworICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJ0ZXh0OiAiICsgb3B0aW9uLnRleHQgKyAiLCB0 b29sdGlwOiAiICsgdG9vbHRpcCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBuZXh0KCk7 CiAgICAgICAgIH0KICAgICBdKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJhYTUzMi4uOWYwYThiMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDExLTA2LTE0ICBQYXZlbCBQb2Rpdmlsb3Yg IDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCB0b29sdGlwIHRvIGZpbGUgc2Vs ZWN0IG9wdGlvbnMgaW4gc2NyaXB0cyBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTYyNTM3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3NvdXJjZUZp bGVBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5f YWRkT3B0aW9uVG9GaWxlc1NlbGVjdC5jb21wYXJlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jYWxsRnJhbWVTZWxlY3RlZC5k aWRHZXRTb3VyY2VMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fY2FsbEZyYW1lU2VsZWN0ZWQpOgorCiAyMDExLTA2LTEwICBLZW50IFRhbXVy YSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEds YXprb3YuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCmluZGV4IDU5Yjk3NzAuLmM1ZDZlOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xMTgsOSArMTE4LDkg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuc2lk ZWJhclBhbmVzLnNjb3BlY2hhaW4uZXhwYW5kZWQgPSB0cnVlOwogICAgIHRoaXMuc2lkZWJhclBh bmVzLmpzQnJlYWtwb2ludHMuZXhwYW5kZWQgPSB0cnVlOwotICAgIAorCiAgICAgdmFyIGhlbHBT ZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0Y3V0c0hlbHAuc2VjdGlvbihXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlNjcmlwdHMgUGFuZWwiKSk7Ci0gICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0 YWNrLnJlZ2lzdGVyU2hvcnRjdXRzKGhlbHBTZWN0aW9uLCB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQu YmluZCh0aGlzKSk7ICAgCisgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnJlZ2lzdGVy U2hvcnRjdXRzKGhlbHBTZWN0aW9uLCB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQuYmluZCh0aGlzKSk7 CiAKICAgICB2YXIgcGFuZWxFbmFibGVySGVhZGluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi WW91IG5lZWQgdG8gZW5hYmxlIGRlYnVnZ2luZyBiZWZvcmUgeW91IGNhbiB1c2UgdGhlIFNjcmlw dHMgcGFuZWwuIik7CiAgICAgdmFyIHBhbmVsRW5hYmxlckRpc2NsYWltZXIgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkVuYWJsaW5nIGRlYnVnZ2luZyB3aWxsIG1ha2Ugc2NyaXB0cyBydW4gc2xv d2VyLiIpOwpAQCAtMjM0LDcgKzIzNCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdGhp cy5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdChzb3VyY2VGaWxlLmlkKTsKKyAgICAgICAgdGhpcy5f YWRkT3B0aW9uVG9GaWxlc1NlbGVjdChzb3VyY2VGaWxlKTsKIAogICAgICAgICB2YXIgbGFzdFZp ZXdlZFVSTCA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5sYXN0Vmlld2VkU2NyaXB0RmlsZTsKICAg ICAgICAgaWYgKHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5sZW5ndGggPT09IDEpIHsKQEAgLTI0 OCwxNSArMjQ4LDE5IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5KHNvdXJjZUZp bGUuaWQpOwogICAgIH0sCiAKLSAgICBfYWRkT3B0aW9uVG9GaWxlc1NlbGVjdDogZnVuY3Rpb24o c291cmNlRmlsZUlkKQorICAgIF9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0OiBmdW5jdGlvbihzb3Vy Y2VGaWxlKQogICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLl9wcmVzZW50YXRp b25Nb2RlbC5zb3VyY2VGaWxlKHNvdXJjZUZpbGVJZCk7CiAgICAgICAgIHZhciBzZWxlY3QgPSB0 aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQ7CiAgICAgICAgIHZhciBvcHRpb24gPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJvcHRpb24iKTsKICAgICAgICAgb3B0aW9uLnRleHQgPSBzb3VyY2VGaWxl LmRpc3BsYXlOYW1lOworICAgICAgICBvcHRpb24udGl0bGUgPSBzb3VyY2VGaWxlLnVybDsKICAg ICAgICAgb3B0aW9uLmlzQ29udGVudFNjcmlwdCA9IHNvdXJjZUZpbGUuaXNDb250ZW50U2NyaXB0 OwogICAgICAgICBpZiAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3JpcHQpCiAgICAgICAgICAgICBv cHRpb24uYWRkU3R5bGVDbGFzcygiZXh0ZW5zaW9uLXNjcmlwdCIpOworICAgICAgICBmdW5jdGlv biBjb21wYXJlKGEsIGIpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBhIDwgYiA/IC0x IDogKGEgPiBiID8gMSA6IDApOworICAgICAgICB9CiAgICAgICAgIGZ1bmN0aW9uIG9wdGlvbkNv bXBhcmUoYSwgYikKICAgICAgICAgewogICAgICAgICAgICAgaWYgKGEgPT09IHNlbGVjdC5jb250 ZW50U2NyaXB0U2VjdGlvbikKQEAgLTI2OSw5ICsyNzMsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghYS5pc0NvbnRlbnRTY3JpcHQg JiYgYi5pc0NvbnRlbnRTY3JpcHQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIC0xOwogCi0gICAg ICAgICAgICBpZiAoYS50ZXh0ID09PSBiLnRleHQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIDA7 Ci0gICAgICAgICAgICByZXR1cm4gYS50ZXh0IDwgYi50ZXh0ID8gLTEgOiAxOworICAgICAgICAg ICAgcmV0dXJuIGNvbXBhcmUoYS50ZXh0LCBiLnRleHQpIHx8IGNvbXBhcmUoYS50aXRsZSwgYi50 aXRsZSk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgaW5zZXJ0aW9uSW5kZXggPSBpbnNlcnRp b25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24ob3B0aW9uLCBzZWxlY3QuY2hp bGROb2Rlcywgb3B0aW9uQ29tcGFyZSk7CkBAIC0yODYsOCArMjg4LDggQEAgV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgaW5zZXJ0aW9uSW5k ZXggPSBpbnNlcnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24oY29udGVu dFNjcmlwdFNlY3Rpb24sIHNlbGVjdC5jaGlsZE5vZGVzLCBvcHRpb25Db21wYXJlKTsKICAgICAg ICAgICAgIHNlbGVjdC5pbnNlcnRCZWZvcmUoY29udGVudFNjcmlwdFNlY3Rpb24sIGluc2VydGlv bkluZGV4IDwgMCA/IG51bGwgOiBzZWxlY3QuY2hpbGROb2Rlcy5pdGVtKGluc2VydGlvbkluZGV4 KSk7CiAgICAgICAgIH0KLSAgICAgICAgb3B0aW9uLl9zb3VyY2VGaWxlSWQgPSBzb3VyY2VGaWxl SWQ7Ci0gICAgICAgIHRoaXMuX3NvdXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb25bc291cmNl RmlsZUlkXSA9IG9wdGlvbjsKKyAgICAgICAgb3B0aW9uLl9zb3VyY2VGaWxlSWQgPSBzb3VyY2VG aWxlLmlkOworICAgICAgICB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uW3Nv dXJjZUZpbGUuaWRdID0gb3B0aW9uOwogICAgIH0sCiAKICAgICBzZXRTY3JpcHRTb3VyY2VJc0Jl aW5nRWRpdGVkOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQsIGluRWRpdE1vZGUpCkBAIC02NDgsNyAr NjUwLDggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgICAgIGlmICghKHNvdXJjZUZpbGVJZCBpbiB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2Vs ZWN0T3B0aW9uKSkgewogICAgICAgICAgICAgICAgIC8vIEFub255bW91cyBzY3JpcHRzIGFyZSBu b3QgYWRkZWQgdG8gZmlsZXMgc2VsZWN0IGJ5IGRlZmF1bHQuCi0gICAgICAgICAgICAgICAgdGhp cy5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdChzb3VyY2VGaWxlSWQpOworICAgICAgICAgICAgICAg IHZhciBzb3VyY2VGaWxlID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc291cmNlRmlsZShzb3Vy Y2VGaWxlSWQpOworICAgICAgICAgICAgICAgIHRoaXMuX2FkZE9wdGlvblRvRmlsZXNTZWxlY3Qo c291cmNlRmlsZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICB2YXIgc291cmNlRnJhbWUg PSB0aGlzLl9zaG93U291cmNlRnJhbWVBbmRBZGRUb0hpc3Rvcnkoc291cmNlRmlsZUlkKTsKICAg ICAgICAgICAgIHNvdXJjZUZyYW1lLnNldEV4ZWN1dGlvbkxpbmUobGluZU51bWJlcik7Cg==