18493 2008-04-14 11:04:57 -0700 REGRESSION: Clicking a resource link in the Console dosen't goto the file 2008-04-14 15:49:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P1 Normal --- 1 timothy timothy oldest_to_newest 77588 0 timothy 2008-04-14 11:04:57 -0700 This is a regression for bug 17773, the UI refresh. 77619 1 20536 timothy 2008-04-14 15:18:42 -0700 Created attachment 20536 Patch 77620 2 20536 aroben 2008-04-14 15:41:32 -0700 Comment on attachment 20536 Patch r=me 77621 3 timothy 2008-04-14 15:49:36 -0700 Landed in r31885. 20536 2008-04-14 15:18:42 -0700 2008-04-14 15:41:32 -0700 Patch 0001-Fixes-a-regression-where-clicking-a-resource-URL-in.patch text/plain 13554 timothy RnJvbSAzMGY0ZDEzMjAyMjQ0NTlmODY5MWE5YzU2NWMxYmNhYzQ1ODdlMjY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBNb24sIDE0IEFwciAyMDA4IDE1OjE3OjM4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gRml4 ZXMgYSByZWdyZXNzaW9uIHdoZXJlIGNsaWNraW5nIGEgcmVzb3VyY2UgVVJMIGluIHRoZSBDb25z b2xlIHdvdWxkIG5vdAogc2hvdyB0aGUgcmVzb3VyY2UgaW4gdGhlIFJlc291cmNlcyBwYW5lbC4K Cmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ5MwoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgoqIHBhZ2UvaW5zcGVjdG9yL0NvbnNvbGUuanM6CihXZWJJbnNw ZWN0b3IuQ29uc29sZS5wcm90b3R5cGUuX21lc3NhZ2VzQ2xpY2tlZCk6IFJlbW92ZWQgY29uc29s ZS1tZXNzYWdlLXVybApoYW5kbGluZyB0byBzaG93IHJlc291cmNlcy4gVGhpcyBpcyBub3cgaGFu ZGxlZCBieSBXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMLgooV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLnByb3RvdHlwZS50b01lc3NhZ2VFbGVtZW50KTogQWRkIHRoZSB3ZWJraXQt aHRtbC1yZXNvdXJjZS1saW5rCmNsYXNzIG5hbWUgdG8gdGhlIFVSTCBhbmNob3IuIEFsc28gYWRk IHRoZSBsaW5lIG51bWJlciBhcyBhIHByb3BlcnR5IHRvIHRoZSBhbmNob3IuCiogcGFnZS9pbnNw ZWN0b3IvUmVzb3VyY2VzUGFuZWwuanM6CihXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwpOiBB ZGQgYSByZWZlcmVuY2UgdG8gdGhlIHRyZWUgZWxlbWVudCB0byBlYWNoIGNhbGN1bGF0b3IuCihX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dSZXNvdXJjZSk6IFNlbGVj dCBhbmQgcmV2ZWFsIHRoZSByZXNvdXJjZSBpbgp0aGUgc2lkZWJhci4gQ2FsbCBzaG93TGluZSBv biB0aGUgcmVzb3VyY2UgdmlldyBpZiBpdCBpcyBpbXBsZW1lbnRlZC4KKFdlYkluc3BlY3Rvci5S ZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuY2xvc2VWaXNpYmxlUmVzb3VyY2UpOiBTZWxlY3QgdGhl IGN1cnJlbnQgY2FsY3VsYXRvcidzCnRyZWUgZWxlbWVudCBpbiB0aGUgc2lkZWJhci4KKFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2dyYXBoU2VsZWN0ZWQpOiBDYWxsIGNs b3NlVmlzaWJsZVJlc291cmNlIGFmdGVyCnRoZSBjYWxjdWxhdG9yIGNoYW5nZXMgc2luY2UgY2xv c2VWaXNpYmxlUmVzb3VyY2UgdXNlcyB0aGUgY2FsY3VsYXRvci4KKiBwYWdlL2luc3BlY3Rvci9T b3VyY2VWaWV3LmpzOgooV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLnNvdXJjZVJv dyk6IEVhcmx5IHJldHVybiBpZiB0aGUgbGluZSBpcyBudWxsL3plcm8uCihXZWJJbnNwZWN0b3Iu U291cmNlVmlldy5wcm90b3R5cGUuc2hvd0xpbmUpOiAgUmVuYW1lZCBmcm9tIHNob3dTb3VyY2VM aW5lLgoqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6Cihib2R5LmNvbnNvbGUtdmlzaWJs ZSAjbWFpbi1wYW5lbHMpOiBNYWRlIHRoZSBib3R0b20gMjRweCB0byBtYXRjaAp0aGUgaGVpZ2h0 IG9mICNtYWluLXN0YXR1cy1iYXIuCiguY29uc29sZS1tZXNzYWdlLXVybCk6IE1ha2UgdGhlIGNv bG9yIGltcG9ydGFudCBzbyBpdCB3aW5zIG92ZXIKdGhlIC53ZWJraXQtaHRtbC1yZXNvdXJjZS1s aW5rIHJ1bGUuCigucmVzb3VyY2UtdmlldyAucmVzb3VyY2Utdmlldy1jb250ZW50KTogTWFkZSBt b3JlIGdlbmVyaWMgZnJvbSAuaW1hZ2UKc28gYWxsIHJlc291cmNlIHZpZXdzIGdldCBzaXplZCBj b3JyZWN0bHkuCigucmVzb3VyY2Utdmlldy5pbWFnZSAucmVzb3VyY2Utdmlldy1jb250ZW50KTog UmVtb3ZlZC4KKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CihXZWJJbnNwZWN0b3IuZG9j dW1lbnRDbGljayk6IFBhc3MgdGhlIGxpbmUgbnVtYmVyIGZyb20gdGhlIGFuY2hvciB0bwpXZWJJ bnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMLgooV2ViSW5zcGVjdG9yLnNob3dSZXNvdXJjZUZv clVSTCk6IEFkZCBsaW5lIG51bWJlciBzdXBwb3J0LiBQYXNzIHRoZSBsaW5lCnRvIFJlc291cmNl c1BhbmVsLnNob3dSZXNvdXJjZS4KKFdlYkluc3BlY3Rvci5hZGRNYWluRXZlbnRMaXN0ZW5lcnMp OiBVc2UgYmluZCBmb3IgdGhlIGV2ZW50IGxpc3RlbmVycy4KLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgIHwgICA0MCArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5qcyAgICAgICAgfCAgIDI0ICsr Ky0tLS0tLS0tLS0tLS0tCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpz IHwgICAxNyArKysrKysrKysrKy0KIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvU291cmNlVmlldy5q cyAgICAgfCAgICA1ICsrKy0KIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcyAg ICAgfCAgIDIwICsrKysrKysrKy0tLS0tCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rv ci5qcyAgICAgIHwgICAxMiArKysrLS0tLQogNiBmaWxlcyBjaGFuZ2VkLCA4MyBpbnNlcnRpb25z KCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGUzOGI0ZDcuLjg5NmRhZTkgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDUgQEAKIDIw MDgtMDQtMTQgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCisgICAgICAg IEZpeGVzIGEgcmVncmVzc2lvbiB3aGVyZSBjbGlja2luZyBhIHJlc291cmNlIFVSTCBpbiB0aGUg Q29uc29sZSB3b3VsZCBub3QKKyAgICAgICAgc2hvdyB0aGUgcmVzb3VyY2UgaW4gdGhlIFJlc291 cmNlcyBwYW5lbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg0OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBhZ2UvaW5zcGVjdG9yL0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29uc29sZS5wcm90b3R5cGUuX21lc3NhZ2VzQ2xpY2tlZCk6IFJlbW92ZWQgY29uc29sZS1tZXNz YWdlLXVybAorICAgICAgICBoYW5kbGluZyB0byBzaG93IHJlc291cmNlcy4gVGhpcyBpcyBub3cg aGFuZGxlZCBieSBXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS50b01lc3NhZ2VFbGVtZW50KTogQWRk IHRoZSB3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rCisgICAgICAgIGNsYXNzIG5hbWUgdG8gdGhl IFVSTCBhbmNob3IuIEFsc28gYWRkIHRoZSBsaW5lIG51bWJlciBhcyBhIHByb3BlcnR5IHRvIHRo ZSBhbmNob3IuCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwpOiBBZGQgYSByZWZlcmVuY2UgdG8g dGhlIHRyZWUgZWxlbWVudCB0byBlYWNoIGNhbGN1bGF0b3IuCisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dSZXNvdXJjZSk6IFNlbGVjdCBhbmQgcmV2 ZWFsIHRoZSByZXNvdXJjZSBpbgorICAgICAgICB0aGUgc2lkZWJhci4gQ2FsbCBzaG93TGluZSBv biB0aGUgcmVzb3VyY2UgdmlldyBpZiBpdCBpcyBpbXBsZW1lbnRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuY2xvc2VWaXNpYmxlUmVzb3VyY2UpOiBT ZWxlY3QgdGhlIGN1cnJlbnQgY2FsY3VsYXRvcidzCisgICAgICAgIHRyZWUgZWxlbWVudCBpbiB0 aGUgc2lkZWJhci4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUuX2dyYXBoU2VsZWN0ZWQpOiBDYWxsIGNsb3NlVmlzaWJsZVJlc291cmNlIGFmdGVyCisgICAg ICAgIHRoZSBjYWxjdWxhdG9yIGNoYW5nZXMgc2luY2UgY2xvc2VWaXNpYmxlUmVzb3VyY2UgdXNl cyB0aGUgY2FsY3VsYXRvci4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9Tb3VyY2VWaWV3Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLnNvdXJjZVJvdyk6 IEVhcmx5IHJldHVybiBpZiB0aGUgbGluZSBpcyBudWxsL3plcm8uCisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuc2hvd0xpbmUpOiAgUmVuYW1lZCBmcm9tIHNob3dT b3VyY2VMaW5lLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6CisgICAg ICAgIChib2R5LmNvbnNvbGUtdmlzaWJsZSAjbWFpbi1wYW5lbHMpOiBNYWRlIHRoZSBib3R0b20g MjRweCB0byBtYXRjaAorICAgICAgICB0aGUgaGVpZ2h0IG9mICNtYWluLXN0YXR1cy1iYXIuCisg ICAgICAgICguY29uc29sZS1tZXNzYWdlLXVybCk6IE1ha2UgdGhlIGNvbG9yIGltcG9ydGFudCBz byBpdCB3aW5zIG92ZXIKKyAgICAgICAgdGhlIC53ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIHJ1 bGUuCisgICAgICAgICgucmVzb3VyY2UtdmlldyAucmVzb3VyY2Utdmlldy1jb250ZW50KTogTWFk ZSBtb3JlIGdlbmVyaWMgZnJvbSAuaW1hZ2UKKyAgICAgICAgc28gYWxsIHJlc291cmNlIHZpZXdz IGdldCBzaXplZCBjb3JyZWN0bHkuCisgICAgICAgICgucmVzb3VyY2Utdmlldy5pbWFnZSAucmVz b3VyY2Utdmlldy1jb250ZW50KTogUmVtb3ZlZC4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9p bnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayk6IFBhc3Mg dGhlIGxpbmUgbnVtYmVyIGZyb20gdGhlIGFuY2hvciB0bworICAgICAgICBXZWJJbnNwZWN0b3Iu c2hvd1Jlc291cmNlRm9yVVJMLgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dSZXNvdXJjZUZv clVSTCk6IEFkZCBsaW5lIG51bWJlciBzdXBwb3J0LiBQYXNzIHRoZSBsaW5lCisgICAgICAgIHRv IFJlc291cmNlc1BhbmVsLnNob3dSZXNvdXJjZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5hZGRN YWluRXZlbnRMaXN0ZW5lcnMpOiBVc2UgYmluZCBmb3IgdGhlIGV2ZW50IGxpc3RlbmVycy4KKwor MjAwOC0wNC0xNCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAg ICAgQWRkIHN1cHBvcnQgZm9yIGNoYW5naW5nIHRoZSBzb3J0IG9yZGVyIG9mIHRoZSByZXNvdXJj ZXMuIFRoZSB0d28gc29ydGluZwogICAgICAgICBtZXRob2RzIHN1cHBvcnRlZCBjdXJyZW50IGFy ZSBUaW1lIGFuZCBTaXplLgogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0Nv bnNvbGUuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0NvbnNvbGUuanMKaW5kZXggYzJhZDFj NC4uMTQzZDI4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Db25zb2xlLmpz CisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5qcwpAQCAtMjU5LDI2ICsyNTks MTAgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlID0gewogICAgIF9tZXNzYWdlc0Ns aWNrZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGxpbmsgPSBldmVudC50 YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZSgiYSIpOwotICAgICAgICBpZiAo bGluayAmJiBsaW5rLnJlcHJlc2VudGVkTm9kZSkgewotICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnVwZGF0ZUZvY3VzZWROb2RlKGxpbmsucmVwcmVzZW50ZWROb2RlKTsKKyAgICAgICAgaWYgKCFs aW5rIHx8ICFsaW5rLnJlcHJlc2VudGVkTm9kZSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgfQotCi0gICAgICAgIHZhciBtZXNzYWdlRWxlbWVudCA9IGV2ZW50LnRhcmdldC5lbmNsb3Np bmdOb2RlT3JTZWxmV2l0aENsYXNzKCJjb25zb2xlLW1lc3NhZ2UiKTsKLSAgICAgICAgaWYgKCFt ZXNzYWdlRWxlbWVudCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAoIW1lc3Nh Z2VFbGVtZW50Lm1lc3NhZ2UpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFyIHJl c291cmNlID0gbWVzc2FnZUVsZW1lbnQubWVzc2FnZS5yZXNvdXJjZTsKLSAgICAgICAgaWYgKCFy ZXNvdXJjZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAobGluayAmJiBsaW5r Lmhhc1N0eWxlQ2xhc3MoImNvbnNvbGUtbWVzc2FnZS11cmwiKSkgewotICAgICAgICAgICAgLy8g RklYTUU6IHNob3cgdGhlIHNvdXJjZSBpbiB0aGUgUmVzb3VyY2VzIHBhbmVsIGFuZCBzY3JvbGwg dG8gdGhlIGxpbmUuCi0gICAgICAgIH0KIAorICAgICAgICBXZWJJbnNwZWN0b3IudXBkYXRlRm9j dXNlZE5vZGUobGluay5yZXByZXNlbnRlZE5vZGUpOwogICAgICAgICBldmVudC5zdG9wUHJvcGFn YXRpb24oKTsKICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKICAgICB9LApAQCAtNTE0 LDcgKzQ5OCw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgaWYgKHRoaXMudXJsICYmIHRoaXMudXJsICE9PSAidW5kZWZpbmVkIikgewogICAg ICAgICAgICAgdmFyIHVybEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJhIik7Ci0g ICAgICAgICAgICB1cmxFbGVtZW50LmNsYXNzTmFtZSA9ICJjb25zb2xlLW1lc3NhZ2UtdXJsIjsK KyAgICAgICAgICAgIHVybEVsZW1lbnQuY2xhc3NOYW1lID0gImNvbnNvbGUtbWVzc2FnZS11cmwg d2Via2l0LWh0bWwtcmVzb3VyY2UtbGluayI7CisgICAgICAgICAgICB1cmxFbGVtZW50LmhyZWYg PSB0aGlzLnVybDsKKyAgICAgICAgICAgIHVybEVsZW1lbnQubGluZU51bWJlciA9IHRoaXMubGlu ZTsKIAogICAgICAgICAgICAgaWYgKHRoaXMubGluZSA+IDApCiAgICAgICAgICAgICAgICAgdXJs RWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJXMgKGxpbmUgJWQp IiwgdGhpcy51cmwsIHRoaXMubGluZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL1Jlc291cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQ YW5lbC5qcwppbmRleCBhNDQwMzJmLi40NzJjOWRjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2Uv aW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3Iv UmVzb3VyY2VzUGFuZWwuanMKQEAgLTg2LDEwICs4NiwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdmFyIHRpbWVHcmFwaEl0ZW0gPSBuZXcgV2ViSW5z cGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudCgicmVzb3VyY2VzLXRpbWUtZ3JhcGgtc2lkZWJhci1p dGVtIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lIikpOwogICAgIHRpbWVHcmFwaEl0ZW0u Y2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlclRpbWVDYWxjdWxh dG9yKCk7CiAgICAgdGltZUdyYXBoSXRlbS5vbnNlbGVjdCA9IHRoaXMuX2dyYXBoU2VsZWN0ZWQu YmluZCh0aGlzKTsKKyAgICB0aW1lR3JhcGhJdGVtLmNhbGN1bGF0b3IuX2dyYXBoc1RyZWVFbGVt ZW50ID0gdGltZUdyYXBoSXRlbTsKIAogICAgIHZhciBzaXplR3JhcGhJdGVtID0gbmV3IFdlYklu c3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQoInJlc291cmNlcy1zaXplLWdyYXBoLXNpZGViYXIt aXRlbSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2l6ZSIpKTsKICAgICBzaXplR3JhcGhJdGVt LmNhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJhbnNmZXJTaXplQ2FsY3Vs YXRvcigpOwogICAgIHNpemVHcmFwaEl0ZW0ub25zZWxlY3QgPSB0aGlzLl9ncmFwaFNlbGVjdGVk LmJpbmQodGhpcyk7CisgICAgc2l6ZUdyYXBoSXRlbS5jYWxjdWxhdG9yLl9ncmFwaHNUcmVlRWxl bWVudCA9IHNpemVHcmFwaEl0ZW07CiAKICAgICB0aGlzLmdyYXBoc1RyZWVFbGVtZW50ID0gbmV3 IFdlYkluc3BlY3Rvci5TaWRlYmFyU2VjdGlvblRyZWVFbGVtZW50KFdlYkluc3BlY3Rvci5VSVN0 cmluZygiR1JBUEhTIiksIHt9LCB0cnVlKTsKICAgICB0aGlzLnNpZGViYXJUcmVlLmFwcGVuZENo aWxkKHRoaXMuZ3JhcGhzVHJlZUVsZW1lbnQpOwpAQCAtMjk2LDcgKzI5OCw3IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGJhclJpZ2h0RWxlbWVu dC5zdHlsZS5yaWdodCA9ICgxMDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiOwogICAgIH0sCiAK LSAgICBzaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQorICAgIHNob3dSZXNvdXJjZTog ZnVuY3Rpb24ocmVzb3VyY2UsIGxpbmUpCiAgICAgewogICAgICAgICBpZiAoIXJlc291cmNlKQog ICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzEwLDYgKzMxMiwxNCBAQCBXZWJJbnNwZWN0b3IuUmVz b3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmVzb3VyY2UuX3Jlc291cmNl c1ZpZXcgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZVZpZXcocmVzb3VyY2UpOwogICAgICAgICByZXNv dXJjZS5fcmVzb3VyY2VzVmlldy5zaG93KCk7CiAKKyAgICAgICAgaWYgKGxpbmUgJiYgcmVzb3Vy Y2UuX3Jlc291cmNlc1ZpZXcuc2hvd0xpbmUpCisgICAgICAgICAgICByZXNvdXJjZS5fcmVzb3Vy Y2VzVmlldy5zaG93TGluZShsaW5lKTsKKworICAgICAgICBpZiAocmVzb3VyY2UuX3Jlc291cmNl c1RyZWVFbGVtZW50KSB7CisgICAgICAgICAgICByZXNvdXJjZS5fcmVzb3VyY2VzVHJlZUVsZW1l bnQucmV2ZWFsKCk7CisgICAgICAgICAgICByZXNvdXJjZS5fcmVzb3VyY2VzVHJlZUVsZW1lbnQu c2VsZWN0KHRydWUpOworICAgICAgICB9CisKICAgICAgICAgdGhpcy52aXNpYmxlUmVzb3VyY2Ug PSByZXNvdXJjZTsKIAogICAgICAgICB0aGlzLl91cGRhdGVTaWRlYmFyV2lkdGgoKTsKQEAgLTMx OSwxMCArMzI5LDEzIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgewogICAgICAgICB0aGlzLmNvbnRhaW5lckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygi dmlld2luZy1yZXNvdXJjZSIpOwogICAgICAgICB0aGlzLl91cGRhdGVEaXZpZGVyc0xhYmVsQmFy UG9zaXRpb24oKTsKKwogICAgICAgICBpZiAodGhpcy52aXNpYmxlUmVzb3VyY2UgJiYgdGhpcy52 aXNpYmxlUmVzb3VyY2UuX3Jlc291cmNlc1ZpZXcpCiAgICAgICAgICAgICB0aGlzLnZpc2libGVS ZXNvdXJjZS5fcmVzb3VyY2VzVmlldy5oaWRlKCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLnZpc2li bGVSZXNvdXJjZTsKIAorICAgICAgICB0aGlzLmNhbGN1bGF0b3IuX2dyYXBoc1RyZWVFbGVtZW50 LnNlbGVjdCh0cnVlKTsKKwogICAgICAgICB0aGlzLl91cGRhdGVTaWRlYmFyV2lkdGgoKTsKICAg ICB9LAogCkBAIC04MTAsOCArODIzLDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgIF9ncmFwaFNlbGVjdGVkOiBmdW5jdGlvbih0cmVlRWxlbWVudCkK ICAgICB7Ci0gICAgICAgIHRoaXMuY2xvc2VWaXNpYmxlUmVzb3VyY2UoKTsKICAgICAgICAgdGhp cy5jYWxjdWxhdG9yID0gdHJlZUVsZW1lbnQuY2FsY3VsYXRvcjsKKyAgICAgICAgdGhpcy5jbG9z ZVZpc2libGVSZXNvdXJjZSgpOwogICAgICAgICB0aGlzLmNvbnRhaW5lckVsZW1lbnQuc2Nyb2xs VG9wID0gMDsKICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Nv dXJjZVZpZXcuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1NvdXJjZVZpZXcuanMKaW5kZXgg MzExOGJjZi4uNTNjYjMwMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Tb3Vy Y2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvU291cmNlVmlldy5qcwpAQCAt NjYsNiArNjYsOSBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAKICAg ICBzb3VyY2VSb3c6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCiAgICAgeworICAgICAgICBpZiAoIWxp bmVOdW1iZXIpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdGhpcy5zZXR1cFNvdXJj ZUZyYW1lSWZOZWVkZWQoKTsKIAogICAgICAgICB2YXIgZG9jID0gdGhpcy5mcmFtZUVsZW1lbnQu Y29udGVudERvY3VtZW50OwpAQCAtNzksNyArODIsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmll dy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByb3dzW2xpbmVOdW1iZXJdOwogICAgIH0s CiAKLSAgICBzaG93U291cmNlTGluZTogZnVuY3Rpb24obGluZU51bWJlcikKKyAgICBzaG93TGlu ZTogZnVuY3Rpb24obGluZU51bWJlcikKICAgICB7CiAgICAgICAgIHZhciByb3cgPSB0aGlzLnNv dXJjZVJvdyhsaW5lTnVtYmVyKTsKICAgICAgICAgaWYgKCFyb3cpCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9y L2luc3BlY3Rvci5jc3MKaW5kZXggZmM4ZjIzMS4uMTQ0ZWExZCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmNzcwpAQCAtMTY5LDYgKzE2OSwxMCBAQCBib2R5LmNvbnNvbGUtdmlzaWJs ZSAjbWFpbi1zdGF0dXMtYmFyICogewogICAgIGN1cnNvcjogZGVmYXVsdDsKIH0KIAorYm9keS5j b25zb2xlLXZpc2libGUgI21haW4tcGFuZWxzIHsKKyAgICBib3R0b206IDI0cHg7Cit9CisKIC5z dGF0dXMtYmFyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjM1LCAyMzUsIDIzNSk7CiAg ICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9zdGF0dXNiYXJCYWNrZ3JvdW5kLnBuZyk7 CkBAIC0zNjYsNyArMzcwLDcgQEAgYm9keS5jb25zb2xlLXZpc2libGUgI2NvbnNvbGUgewogfQog CiAuY29uc29sZS1tZXNzYWdlLXVybCB7Ci0gICAgY29sb3I6IHJnYigzMyUsIDMzJSwgMzMlKTsK KyAgICBjb2xvcjogcmdiKDMzJSwgMzMlLCAzMyUpICFpbXBvcnRhbnQ7CiAgICAgY3Vyc29yOiBw b2ludGVyOwogfQogCkBAIC00MjMsNiArNDI3LDE0IEBAIGJvZHkuY29uc29sZS12aXNpYmxlICNj b25zb2xlIHsKICAgICBkaXNwbGF5OiBibG9jazsKIH0KIAorLnJlc291cmNlLXZpZXcgLnJlc291 cmNlLXZpZXctY29udGVudCB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsK KyAgICByaWdodDogMDsKKyAgICBsZWZ0OiAwOworICAgIGJvdHRvbTogMDsKK30KKwogLnJlc291 cmNlLXZpZXcuZm9udCB7CiAgICAgZm9udC1zaXplOiA2MHB4OwogICAgIHdoaXRlLXNwYWNlOiBw cmUtd3JhcDsKQEAgLTQ0MCwxMiArNDUyLDYgQEAgYm9keS5jb25zb2xlLXZpc2libGUgI2NvbnNv bGUgewogICAgIGJvdHRvbTogMDsKIH0KIAotLnJlc291cmNlLXZpZXcuaW1hZ2UgLnJlc291cmNl LXZpZXctY29udGVudCB7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotICAgIHdpZHRoOiAxMDAl OwotICAgIGhlaWdodDogMTAwJTsKLX0KLQogLnJlc291cmNlLXZpZXcuaW1hZ2UgLnJlc291cmNl LXZpZXctY29udGVudCA+IC5pbWFnZSB7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIGhl aWdodDogNzAlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3Iu anMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwppbmRleCBmNjg4NDcyLi40 MDYxNTJlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwor KysgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwpAQCAtMzMyLDcgKzMzMiw3 IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgaWYg KCFhbmNob3IuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtcmVzb3VyY2UtbGluayIpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBpZiAoV2ViSW5zcGVjdG9yLnNob3dSZXNvdXJjZUZvclVSTChh bmNob3IuZ2V0QXR0cmlidXRlKCJocmVmIikpKSB7CisgICAgaWYgKFdlYkluc3BlY3Rvci5zaG93 UmVzb3VyY2VGb3JVUkwoYW5jaG9yLmhyZWYsIGFuY2hvci5saW5lTnVtYmVyKSkgewogICAgICAg ICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24o KTsKICAgICB9CkBAIC03MDMsMTQgKzcwMywxNCBAQCBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JV UkwgPSBmdW5jdGlvbih1cmwpCiAgICAgcmV0dXJuIG51bGw7CiB9CiAKLVdlYkluc3BlY3Rvci5z aG93UmVzb3VyY2VGb3JVUkwgPSBmdW5jdGlvbih1cmwpCitXZWJJbnNwZWN0b3Iuc2hvd1Jlc291 cmNlRm9yVVJMID0gZnVuY3Rpb24odXJsLCBsaW5lKQogewogICAgIHZhciByZXNvdXJjZSA9IHRo aXMucmVzb3VyY2VGb3JVUkwodXJsKTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRoaXMucGFuZWxzLnJlc291cmNl czsKLSAgICB0aGlzLnBhbmVscy5yZXNvdXJjZXMuc2hvd1Jlc291cmNlKHJlc291cmNlKTsKKyAg ICB0aGlzLnBhbmVscy5yZXNvdXJjZXMuc2hvd1Jlc291cmNlKHJlc291cmNlLCBsaW5lKTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNzI2LDkgKzcyNiw5IEBAIFdlYkluc3BlY3Rvci5saW5r aWZ5VVJMID0gZnVuY3Rpb24odXJsLCBsaW5rVGV4dCwgY2xhc3NlcywgaXNFeHRlcm5hbCkKIAog V2ViSW5zcGVjdG9yLmFkZE1haW5FdmVudExpc3RlbmVycyA9IGZ1bmN0aW9uKGRvYykKIHsKLSAg ICBkb2MuZGVmYXVsdFZpZXcuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCBmdW5jdGlvbihldmVu dCkgeyBXZWJJbnNwZWN0b3Iud2luZG93Rm9jdXNlZChldmVudCkgfSwgdHJ1ZSk7Ci0gICAgZG9j LmRlZmF1bHRWaWV3LmFkZEV2ZW50TGlzdGVuZXIoImJsdXIiLCBmdW5jdGlvbihldmVudCkgeyBX ZWJJbnNwZWN0b3Iud2luZG93Qmx1cmVkKGV2ZW50KSB9LCB0cnVlKTsKLSAgICBkb2MuYWRkRXZl bnRMaXN0ZW5lcigiY2xpY2siLCBmdW5jdGlvbihldmVudCkgeyBXZWJJbnNwZWN0b3IuZG9jdW1l bnRDbGljayhldmVudCkgfSwgdHJ1ZSk7CisgICAgZG9jLmRlZmF1bHRWaWV3LmFkZEV2ZW50TGlz dGVuZXIoImZvY3VzIiwgdGhpcy53aW5kb3dGb2N1c2VkLmJpbmQodGhpcyksIHRydWUpOworICAg IGRvYy5kZWZhdWx0Vmlldy5hZGRFdmVudExpc3RlbmVyKCJibHVyIiwgdGhpcy53aW5kb3dCbHVy ZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgZG9jLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwg dGhpcy5kb2N1bWVudENsaWNrLmJpbmQodGhpcyksIHRydWUpOwogfQogCiBXZWJJbnNwZWN0b3Iu cGVyZm9ybVNlYXJjaCA9IGZ1bmN0aW9uKHF1ZXJ5KQotLSAKMS41LjQuNAoK