75230 2011-12-26 11:02:50 -0800 Web Inspector: Create tabbed editor for scripts panel. 2011-12-27 02:26:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75093 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 527227 0 vsevik 2011-12-26 11:02:50 -0800 Create tabbed editor for scripts panel. 527231 1 vsevik 2011-12-26 11:51:48 -0800 Screenshot: https://bug-75093-attachments.webkit.org/attachment.cgi?id=120329 527234 2 120559 vsevik 2011-12-26 12:16:45 -0800 Created attachment 120559 Patch 527320 3 vsevik 2011-12-27 02:26:39 -0800 Committed r103707: <http://trac.webkit.org/changeset/103707> 120559 2011-12-26 12:16:45 -0800 2011-12-27 02:14:48 -0800 Patch bug-75230-20111227001643.patch text/plain 21363 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2I2MGY0ODAwNjI0ZjA2 YzM4YzIxZWY1MTE1MjdiNWY0OWMyOTZiZC4uOWMwMmY1MmI0ZTI5NzQyNTg5OGYwZmE4YjlkZjY4 Njg4MWE3OWI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDExLTEyLTI2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IENyZWF0ZSB0YWJiZWQgZWRpdG9yIGZvciBzY3JpcHRzIHBhbmVsLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUyMzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAg ICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAgICAgKiBpbnNwZWN0b3Iv Y29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzTmF2aWdhdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu cHJvdG90eXBlLnJlcGxhY2VVSVNvdXJjZUNvZGVzLmdldCBpZik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUucmVwbGFjZVVJU291cmNlQ29kZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVtZW50LnByb3RvdHlw ZS5vbmRibGNsaWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVl RWxlbWVudC5wcm90b3R5cGUub25lbnRlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRF ZGl0b3JDb250YWluZXIuanM6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv VGFiYmVkUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlw ZS5nZXQgdmlzaWJsZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJv dG90eXBlLmdldCBzZWxlY3RlZFRhYklkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQ YW5lLnByb3RvdHlwZS5jbG9zZUFsbFRhYnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJl ZFBhbmUucHJvdG90eXBlLmNoYW5nZVRhYlRpdGxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U YWJiZWRQYW5lLnByb3RvdHlwZS5jaGFuZ2VUYWJWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UYWJiZWRQYW5lVGFiKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnBy b3RvdHlwZS5nZXQgdGl0bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIu cHJvdG90eXBlLnNldCB0aXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZVRh Yi5wcm90b3R5cGUuZ2V0IHZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVU YWIucHJvdG90eXBlLnNldCB2aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5l VGFiLnByb3RvdHlwZS5fY3JlYXRlVGFiRWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9zY3JpcHRzUGFuZWwuY3Nz OgorICAgICAgICAoLnNjcmlwdHMtdmlld3MtY29udGFpbmVyKToKKyAgICAgICAgKC5zY3JpcHQt dmlldyk6CisgICAgICAgICgjc2NyaXB0cy1lZGl0b3ItY29udGFpbmVyLXRhYmJlZC1wYW5lIC50 YWJiZWQtcGFuZS1oZWFkZXIpOgorICAgICAgICAoI3NjcmlwdHMtZWRpdG9yLWNvbnRhaW5lci10 YWJiZWQtcGFuZSAudGFiYmVkLXBhbmUtaGVhZGVyLWNvbnRlbnRzKToKKyAgICAgICAgKCNzY3Jp cHRzLWVkaXRvci1jb250YWluZXItdGFiYmVkLXBhbmUgLnRhYmJlZC1wYW5lLWNvbnRlbnQpOgor CisyMDExLTEyLTI2ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IEV4dHJhY3QgRmlsZUVkaXRvciBmcm9tIFNjcmlwdHNQYW5l bC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MjI5 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZ3lwaQppbmRleCAxOTU2YjQ5MmYzODcwNzJjMjA1MWVlODhjMTBlMjQ0YWY4 MmM5MmUwLi42NTM3M2QwOGJkMjY4ZGEyMjcxOTg5OTIwNGMyZTJmMTJjZWJjMjNjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXBpCkBAIC02NDkxLDYgKzY0OTEsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9m cm9udC1lbmQvU3BsaXRWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L1N0YXR1c0JhckJ1dHRvbi5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNTaWRlYmFyUGFuZS5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9U YWJiZWRFZGl0b3JDb250YWluZXIuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1l bmQvVGFiYmVkUGFuZS5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9UZXN0 Q29udHJvbGxlci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRp dG9ySGlnaGxpZ2h0ZXIuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3Byb2ovV2ViQ29yZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJD b3JlLnZjcHJvagppbmRleCBmNmU4M2U1NDI4ZmVmNjExZjJiMGY0ODlmMTliZGQyNDc1YmRkYTNl Li4zZjcyYjRkNWM3YjAwOTBjNTk5MzdmOGYyYTE0ZWRkOGI3NDc3YzExIDEwMDc1NQotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtNzIwMjksNiArNzIwMjks MTAgQEAKIAkJCQkJPgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9 Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzIgorCQkJCQk+ CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9y XGZyb250LWVuZFx0YWJiZWRQYW5lLmNzcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCA4NzMyODYwZWUy ZGYzZjk5NWU3MTI0YTdhNWQzZWQ3N2QyYjllY2U0Li4wM2Q0ZDlmYjI1NjE4NzEzNzllNzc5Mjdm MjQxNmUxZmVlYjAzNGVlIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29t cGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUt ZnJvbnQtZW5kLnNoCkBAIC0xNTEsMTAgKzE1MSwxMSBAQCBqYXZhIC1qYXIgfi9jbG9zdXJlL2Nv bXBpbGVyLmphciAtLXN1bW1hcnlfZGV0YWlsX2xldmVsIDMgLS1jb21waWxhdGlvbl9sZXZlbCBT SQogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJh c2VUYWJsZVZpZXcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBcCi0gICAgLS1tb2R1 bGUganNtb2R1bGVfc2NyaXB0czo5OmpzbW9kdWxlX2NvbXBvbmVudHMgXAorICAgIC0tbW9kdWxl IGpzbW9kdWxlX3NjcmlwdHM6MTA6anNtb2R1bGVfY29tcG9uZW50cyBcCiAgICAgICAgIC0tanMg U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5q cyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY29w ZUNoYWluU2lkZWJhclBhbmUuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIFwKKyAgICAgICAgLS1qcyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5q cyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzTmF2aWdhdG9yLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzU2VhcmNoU2NvcGUuanMgXApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCmlu ZGV4IGI2NTY4MjUwYzU2NmYyMjQ1NjY4MjY3ZDRkMjEzNzcxNmIzOTIxMzAuLjUyYWJiYWY4MDA1 NDE2OTM2YmUwMTU3YjZkZTU4OWVjZWU5NGViOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKQEAgLTEzNSw3ICsx MzUsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAg ICAqLwogICAgIHNldFNjcmlwdFNvdXJjZUlzRGlydHk6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwg aXNEaXJ0eSkKICAgICB7Ci0gICAgICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQKKyAgICAgICAgdmFy IHNjcmlwdFRyZWVFbGVtZW50ID0gdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNv ZGUuZ2V0KHVpU291cmNlQ29kZSk7CisgICAgICAgIHZhciB0aXRsZSA9IHVpU291cmNlQ29kZS5k aXNwbGF5TmFtZTsKKyAgICAgICAgaWYgKGlzRGlydHkpCisgICAgICAgICAgICB0aXRsZSArPSAi KiI7CisgICAgICAgIHNjcmlwdFRyZWVFbGVtZW50LnRpdGxlVGV4dCA9IHRpdGxlOwogICAgIH0s CiAKICAgICAvKioKQEAgLTE0NCw3ICsxNDgsMjIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZp Z2F0b3IucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHJlcGxhY2VVSVNvdXJjZUNvZGVzOiBm dW5jdGlvbihvbGRVSVNvdXJjZUNvZGVMaXN0LCB1aVNvdXJjZUNvZGVMaXN0KQogICAgIHsKLSAg ICAgICAgLy8gRklYTUU6IGltcGxlbWVudAorICAgICAgICB2YXIgc2VsZWN0ZWQgPSBmYWxzZTsK KyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBvbGRVSVNvdXJjZUNvZGVMaXN0Lmxlbmd0aDsg KytpKSB7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gb2xkVUlTb3VyY2VDb2RlTGlz dFtpXTsKKyAgICAgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuX3NjcmlwdFRyZWVFbGVt ZW50c0J5VUlTb3VyY2VDb2RlLmdldCh1aVNvdXJjZUNvZGUpOworICAgICAgICAgICAgaWYgKHRy ZWVFbGVtZW50KSB7CisgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2xhc3RTZWxlY3RlZFVJU291 cmNlQ29kZSAmJiB0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJjZUNvZGUgPT09IHVpU291cmNlQ29k ZSkKKyAgICAgICAgICAgICAgICAgICAgc2VsZWN0ZWQgPSB0cnVlOworICAgICAgICAgICAgICAg IHRoaXMucmVtb3ZlVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291 cmNlQ29kZUxpc3QubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlzLmFkZFVJU291cmNlQ29k ZSh1aVNvdXJjZUNvZGVMaXN0W2ldKTsKKworICAgICAgICBpZiAoc2VsZWN0ZWQpCisgICAgICAg ICAgICB0aGlzLnJldmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGVMaXN0WzBdKTsKICAgICB9 LAogCiAgICAgLyoqCkBAIC00MzYsMTMgKzQ1NSwxNiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9y U2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAg KiBAcGFyYW0ge1RyZWVFbGVtZW50fSB0cmVlRWxlbWVudAotICAgICAqIEBwYXJhbSB7Ym9vbGVh bj19IHNlbGVjdGVkQnlVc2VyCisgICAgICogQHBhcmFtIHtFdmVudH0gZXZlbnQKICAgICAgKi8K LSAgICBvbnNlbGVjdDogZnVuY3Rpb24odHJlZUVsZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQorICAg IG9uZGJsY2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fbmF2aWdh dG9yLnNjcmlwdFNlbGVjdGVkKHRoaXMudWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgb25l bnRlcjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHNlbGVjdGVkQnlVc2VyKQotICAg ICAgICAgICAgdGhpcy5fbmF2aWdhdG9yLnNjcmlwdFNlbGVjdGVkKHRoaXMudWlTb3VyY2VDb2Rl KTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yLnNjcmlwdFNlbGVjdGVkKHRoaXMudWlTb3VyY2VD b2RlKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggNmYyODZkZDk2OGMwYzFjYjBlMzBjZWYwMmEzYmEz YTcyNGY2MjlkMy4uODJkN2Y3YTNiN2E3ODAyMGM4ZTI0MTNlYjA4ZTRhYWU1OWYyODU0YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKQEAgLTc4LDggKzc4LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9u KHByZXNlbnRhdGlvbk1vZGVsKQogICAgICAgICB0aGlzLmVkaXRvclZpZXcuaW5zdGFsbFJlc2l6 ZXIodGhpcy5fbmF2aWdhdG9yUmVzaXplV2lkZ2V0RWxlbWVudCk7CiAgICAgICAgIHRoaXMuZWRp dG9yVmlldy5zaWRlYmFyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0b3JSZXNpemVX aWRnZXRFbGVtZW50KTsKIAotICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHVzZSBuZXcgVGFi YmVkRWRpdG9yIGhlcmUuCi0gICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lciA9IG5ldyBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLlNpbmdsZUZpbGVFZGl0b3JDb250YWluZXIoKTsKKyAgICAg ICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyID0gbmV3IFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JD b250YWluZXIoKTsKICAgICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnNob3codGhpcy5lZGl0 b3JWaWV3Lm1haW5FbGVtZW50KTsKICAgICB9IGVsc2UgewogICAgICAgICB0aGlzLl9maWxlU2Vs ZWN0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5Db21ib0JveEZpbGVTZWxlY3Rv cih0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCk7CkBAIC04Nyw3ICs4Niw3IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICAgICAgdGhp cy5fZmlsZVNlbGVjdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5GaWxlU2VsZWN0b3IuRXZlbnRzLlNjcmlwdFNlbGVjdGVkLCB0aGlzLl9zY3JpcHRTZWxlY3Rl ZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2ZpbGVTZWxlY3Rvci5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5SZWxlYXNlZEZvY3Vz QWZ0ZXJTZWxlY3Rpb24sIHRoaXMuX2ZpbGVTZWxlY3RvclJlbGVhc2VkRm9jdXMsIHRoaXMpOwog ICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3Iuc2hvdyh0aGlzLnNwbGl0Vmlldy5tYWluRWxlbWVu dCk7Ci0gICAgICAgIAorCiAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lciA9IG5ldyBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLlNpbmdsZUZpbGVFZGl0b3JDb250YWluZXIoKTsKICAgICAg ICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnNob3codGhpcy5zcGxpdFZpZXcubWFpbkVsZW1lbnQp OwogICAgIH0KQEAgLTI4MSw2ICsyODAsOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnBy b3RvdHlwZSA9IHsKICAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbih1 aVNvdXJjZUNvZGUsIGluRWRpdE1vZGUpCiAgICAgewogICAgICAgICB0aGlzLl9maWxlU2VsZWN0 b3Iuc2V0U2NyaXB0U291cmNlSXNEaXJ0eSh1aVNvdXJjZUNvZGUsIGluRWRpdE1vZGUpOworICAg ICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VGcmFtZXNCeVVJU291cmNlQ29kZS5n ZXQodWlTb3VyY2VDb2RlKQorICAgICAgICBpZiAoc291cmNlRnJhbWUpCisgICAgICAgICAgICB0 aGlzLl9lZGl0b3JDb250YWluZXIuc2V0U291cmNlRnJhbWVJc0RpcnR5KHNvdXJjZUZyYW1lLCBp bkVkaXRNb2RlKTsKICAgICB9LAogCiAgICAgX2NvbnNvbGVNZXNzYWdlc0NsZWFyZWQ6IGZ1bmN0 aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFi YmVkRWRpdG9yQ29udGFpbmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTFhOGUxZDNkNjcxMDIwZTA0 ZDYzNDFmODgxNDE5ZmE5NzU3MTExNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzCkBAIC0wLDAgKzEs MTgxIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6Cisg KgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBp biB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlCisgKiBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBHT09HTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlU RUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVW RU5UIFNIQUxMIEdPT0dMRSBJTkMuCisgKiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorICovCisKKy8qKgorICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwuRWRpdG9yQ29udGFpbmVyfQorICogQGNvbnN0cnVjdG9yCisgKi8KK1dl Ykluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIgPSBmdW5jdGlvbigpCit7CisgICAgdGhp cy5fdGFiYmVkUGFuZSA9IG5ldyBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZSgpOworICAgIHRoaXMu X3RhYmJlZFBhbmUuY2xvc2VhYmxlVGFicyA9IHRydWU7CisgICAgdGhpcy5fdGFiYmVkUGFuZS5l bGVtZW50LmlkID0gInNjcmlwdHMtZWRpdG9yLWNvbnRhaW5lci10YWJiZWQtcGFuZSI7CisKKyAg ICB0aGlzLl90aXRsZXMgPSBuZXcgTWFwKCk7CisgICAgdGhpcy5fdGFiSWRzID0gbmV3IE1hcCgp OyAgCit9CisKK1dlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIuX3RhYklkID0gMDsK KworV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CisgICAg LyoqCisgICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0KKyAgICAgKi8KKyAg ICBnZXQgY3VycmVudFNvdXJjZUZyYW1lKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl90 YWJiZWRQYW5lLnZpc2libGVWaWV3OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e0VsZW1lbnR9IHBhcmVudEVsZW1lbnQKKyAgICAgKi8KKyAgICBzaG93OiBmdW5jdGlvbihwYXJl bnRFbGVtZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5zaG93KHBhcmVudEVs ZW1lbnQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdGl0bGUK KyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNlRnJhbWUKKyAg ICAgKi8KKyAgICBzaG93U291cmNlRnJhbWU6IGZ1bmN0aW9uKHRpdGxlLCBzb3VyY2VGcmFtZSkK KyAgICB7CisgICAgICAgIHZhciB0YWJJZCA9IHRoaXMuX3RhYklkcy5nZXQoc291cmNlRnJhbWUp IHx8IHRoaXMuX2FwcGVuZFNvdXJjZUZyYW1lVGFiKHRpdGxlLCBzb3VyY2VGcmFtZSk7CisgICAg ICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKHRhYklkKTsKKyAgICB9LAorCisgICAgLyoq CisgICAgICogQHBhcmFtIHtzdHJpbmd9IHRpdGxlCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWV9IHNvdXJjZUZyYW1lCisgICAgICovCisgICAgX2FwcGVuZFNvdXJjZUZy YW1lVGFiOiBmdW5jdGlvbih0aXRsZSwgc291cmNlRnJhbWUpCisgICAgeworICAgICAgICB2YXIg dGFiSWQgPSB0aGlzLl9nZW5lcmF0ZVRhYklkKCk7CisgICAgICAgIHRoaXMuX3RhYklkcy5wdXQo c291cmNlRnJhbWUsIHRhYklkKQorICAgICAgICB0aGlzLl90aXRsZXMucHV0KHNvdXJjZUZyYW1l LCB0aXRsZSkKKyAgICAgICAgCisgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKHRh YklkLCB0aXRsZSwgc291cmNlRnJhbWUpOworICAgICAgICByZXR1cm4gdGFiSWQ7CisgICAgfSwK KworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfSBzb3Vy Y2VGcmFtZQorICAgICAqLworICAgIF9yZW1vdmVTb3VyY2VGcmFtZVRhYjogZnVuY3Rpb24oc291 cmNlRnJhbWUpCisgICAgeworICAgICAgICB2YXIgdGFiSWQgPSB0aGlzLl90YWJJZHMuZ2V0KHNv dXJjZUZyYW1lKTsKKyAgICAgICAgCisgICAgICAgIGlmICh0YWJJZCkgeworICAgICAgICAgICAg dGhpcy5fdGFiYmVkUGFuZS5jbG9zZVRhYih0YWJJZCk7CisgICAgICAgICAgICB0aGlzLl90YWJJ ZHMucmVtb3ZlKHNvdXJjZUZyYW1lKTsKKyAgICAgICAgICAgIHRoaXMuX3RpdGxlcy5yZW1vdmUo c291cmNlRnJhbWUpOworICAgICAgICB9CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJh bSB7c3RyaW5nfSB0aXRsZQorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l fSBzb3VyY2VGcmFtZQorICAgICAqLworICAgIF9yZXBsYWNlU291cmNlRnJhbWVUYWI6IGZ1bmN0 aW9uKG9sZFNvdXJjZUZyYW1lLCB0aXRsZSwgc291cmNlRnJhbWUpCisgICAgeworICAgICAgICB2 YXIgdGFiSWQgPSB0aGlzLl90YWJJZHMuZ2V0KG9sZFNvdXJjZUZyYW1lKTsKKyAgICAgICAgCisg ICAgICAgIGlmICh0YWJJZCkgeworICAgICAgICAgICAgdGhpcy5fdGFiSWRzLnJlbW92ZShvbGRT b3VyY2VGcmFtZSk7CisgICAgICAgICAgICB0aGlzLl90aXRsZXMucmVtb3ZlKG9sZFNvdXJjZUZy YW1lKTsKKworICAgICAgICAgICAgdGhpcy5fdGFiSWRzLnB1dChzb3VyY2VGcmFtZSwgdGFiSWQp OworICAgICAgICAgICAgdGhpcy5fdGl0bGVzLnB1dChzb3VyY2VGcmFtZSwgdGl0bGUpOworCisg ICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNoYW5nZVRhYlRpdGxlKHRhYklkLCB0aXRsZSk7 CisgICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNoYW5nZVRhYlZpZXcodGFiSWQsIHNvdXJj ZUZyYW1lKTsKKyAgICAgICAgfQorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNlRnJhbWUKKyAgICAgKiBAcmV0dXJuIHtib29s ZWFufQorICAgICAqLworICAgIGlzU291cmNlRnJhbWVPcGVuOiBmdW5jdGlvbihzb3VyY2VGcmFt ZSkKKyAgICB7CisgICAgICAgIHJldHVybiAhIXRoaXMuX3RhYklkcy5nZXQoc291cmNlRnJhbWUp OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWU+fSBvbGRTb3VyY2VGcmFtZXMKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdGl0 bGUKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNlRnJhbWUK KyAgICAgKi8KKyAgICByZXBsYWNlU291cmNlRnJhbWVzOiBmdW5jdGlvbihvbGRTb3VyY2VGcmFt ZXMsIHRpdGxlLCBzb3VyY2VGcmFtZSkKKyAgICB7CisgICAgICAgIHZhciBtYWluU291cmNlRnJh bWU7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgb2xkU291cmNlRnJhbWVzLmxlbmd0aDsg KytpKSB7CisgICAgICAgICAgICB2YXIgdGFiSWQgPSB0aGlzLl90YWJJZHMuZ2V0KG9sZFNvdXJj ZUZyYW1lc1tpXSk7CisgICAgICAgICAgICBpZiAodGFiSWQgJiYgKCFtYWluU291cmNlRnJhbWUg fHwgdGhpcy5fdGFiYmVkUGFuZS5zZWxlY3RlZFRhYklkID09PSB0YWJJZCkpIHsKKyAgICAgICAg ICAgICAgICBtYWluU291cmNlRnJhbWUgPSBvbGRTb3VyY2VGcmFtZXNbaV07CisgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICB9IAorICAgICAgICB9CisgICAgICAgIAorICAgICAg ICBpZiAobWFpblNvdXJjZUZyYW1lKQorICAgICAgICAgICAgdGhpcy5fcmVwbGFjZVNvdXJjZUZy YW1lVGFiKG1haW5Tb3VyY2VGcmFtZSwgdGl0bGUsIHNvdXJjZUZyYW1lKTsKKyAgICAgICAgCisg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgb2xkU291cmNlRnJhbWVzLmxlbmd0aDsgKytpKQor ICAgICAgICAgICAgdGhpcy5fcmVtb3ZlU291cmNlRnJhbWVUYWIob2xkU291cmNlRnJhbWVzW2ld KTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNl RnJhbWV9IHNvdXJjZUZyYW1lCisgICAgICogQHBhcmFtIHtib29sZWFufSBpc0RpcnR5CisgICAg ICovCisgICAgc2V0U291cmNlRnJhbWVJc0RpcnR5OiBmdW5jdGlvbihzb3VyY2VGcmFtZSwgaXNE aXJ0eSkKKyAgICB7CisgICAgICAgIHZhciB0YWJJZCA9IHRoaXMuX3RhYklkcy5nZXQoc291cmNl RnJhbWUpOworICAgICAgICBpZiAodGFiSWQpIHsKKyAgICAgICAgICAgIHZhciB0aXRsZSA9IHRo aXMuX3RpdGxlcy5nZXQoc291cmNlRnJhbWUpOworICAgICAgICAgICAgaWYgKGlzRGlydHkpCisg ICAgICAgICAgICAgICAgdGl0bGUgKz0gIioiOworICAgICAgICAgICAgdGhpcy5fdGFiYmVkUGFu ZS5jaGFuZ2VUYWJUaXRsZSh0YWJJZCwgdGl0bGUpOworICAgICAgICB9CisgICAgfSwKKworICAg IHJlc2V0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNsb3Nl QWxsVGFicygpOworICAgICAgICB0aGlzLl90aXRsZXMgPSBuZXcgTWFwKCk7CisgICAgICAgIHRo aXMuX3RhYklkcyA9IG5ldyBNYXAoKTsgIAorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcmV0 dXJuIHtzdHJpbmd9CisgICAgICovCisgICAgX2dlbmVyYXRlVGFiSWQ6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHJldHVybiAidGFiXyIgKyAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNv bnRhaW5lci5fdGFiSWQrKyk7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCmluZGV4IDhiZWEzMDA2OTg4MThlMzVmY2YzMTE3 NzY3ODcyNTMzYjI4OWIyZmEuLmYzNDlhNjM0MzA4NmNmZTA1NWM4MTZiMGM1YTIyYmQ1YmM0YjFm MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVk UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBh bmUuanMKQEAgLTUwLDYgKzUwLDIyIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lID0gZnVuY3Rp b24oKQogCiBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCisg ICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5WaWV3fQorICAgICAqLworICAgIGdldCB2aXNpYmxl VmlldygpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVudFRhYiA/IHRoaXMuX2N1 cnJlbnRUYWIudmlldyA6IG51bGw7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEB0eXBlIHtz dHJpbmd9CisgICAgICovCisgICAgZ2V0IHNlbGVjdGVkVGFiSWQoKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRoaXMuX2N1cnJlbnRUYWIgPyB0aGlzLl9jdXJyZW50VGFiLmlkIDogbnVsbDsKKyAg ICB9LAorCisgICAgLyoqCiAgICAgICogQHR5cGUge2Jvb2xlYW59IHNocmlua2FibGVUYWJzCiAg ICAgICovCiAgICAgc2V0IHNocmlua2FibGVUYWJzKHNocmlua2FibGVUYWJzKQpAQCAtMTA1LDYg KzEyMSwxMiBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0sCiAKKyAgICBjbG9zZUFsbFRhYnM6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fdGFicy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgIHRoaXMuY2xvc2VUYWIodGhpcy5fdGFic1tpXS5pZCwgZmFsc2UpOworICAg IH0sCisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gaWQKICAgICAgKiBAcGFyYW0g e2Jvb2xlYW49fSB1c2VyR2VzdHVyZQpAQCAtMTMxLDYgKzE1MywzMiBAQCBXZWJJbnNwZWN0b3Iu VGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gaWQKKyAgICAgKiBAcGFyYW0ge3N0cmlu Z30gdGFiVGl0bGUKKyAgICAgKi8KKyAgICBjaGFuZ2VUYWJUaXRsZTogZnVuY3Rpb24oaWQsIHRh YlRpdGxlKQorICAgIHsKKyAgICAgICAgdmFyIHRhYiA9IHRoaXMuX3RhYnNCeUlkW2lkXTsKKyAg ICAgICAgdGFiLnRpdGxlID0gdGFiVGl0bGU7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRhYkVsZW1l bnRzKCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAg ICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlZpZXd9IHZpZXcKKyAgICAgKi8KKyAgICBjaGFuZ2VU YWJWaWV3OiBmdW5jdGlvbihpZCwgdmlldykKKyAgICB7CisgICAgICAgIHZhciB0YWIgPSB0aGlz Ll90YWJzQnlJZFtpZF07CisgICAgICAgIGlmICh0aGlzLl9jdXJyZW50VGFiICYmIHRoaXMuX2N1 cnJlbnRUYWIuaWQgPT09IHRhYi5pZCkgeworICAgICAgICAgICAgdGhpcy5faGlkZVRhYih0YWIp OworICAgICAgICAgICAgdGFiLnZpZXcgPSB2aWV3OworICAgICAgICAgICAgdGhpcy5fc2hvd1Rh Yih0YWIpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHRhYi52aWV3ID0gdmlldzsKKyAg ICB9LAorCiAgICAgb25SZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Vw ZGF0ZVRhYkVsZW1lbnRzKCk7CkBAIC0zNzIsOCArNDIwLDggQEAgV2ViSW5zcGVjdG9yLlRhYmJl ZFBhbmVUYWIgPSBmdW5jdGlvbih0YWJiZWRQYW5lLCBtZWFzdXJlRWxlbWVudCwgaWQsIHRpdGxl LCBjbG8KICAgICB0aGlzLl90YWJiZWRQYW5lID0gdGFiYmVkUGFuZTsKICAgICB0aGlzLl9tZWFz dXJlRWxlbWVudCA9IG1lYXN1cmVFbGVtZW50OwogICAgIHRoaXMuX2lkID0gaWQ7Ci0gICAgdGhp cy50aXRsZSA9IHRpdGxlOwotICAgIHRoaXMudmlldyA9IHZpZXc7CisgICAgdGhpcy5fdGl0bGUg PSB0aXRsZTsKKyAgICB0aGlzLl92aWV3ID0gdmlldzsKICAgICB0aGlzLnNob3duID0gZmFsc2U7 CiB9CiAKQEAgLTM4Nyw2ICs0MzUsMzUgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIucHJv dG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAdHlwZSB7c3RyaW5nfQorICAg ICAqLworICAgIGdldCB0aXRsZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdGl0bGU7 CisgICAgfSwKKworICAgIHNldCB0aXRsZSh0aXRsZSkKKyAgICB7CisgICAgICAgIHRoaXMuX3Rp dGxlID0gdGl0bGU7CisgICAgICAgIGlmICh0aGlzLl90aXRsZUVsZW1lbnQpCisgICAgICAgICAg ICB0aGlzLl90aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0aXRsZTsKKyAgICAgICAgZGVsZXRl IHRoaXMuX21lYXN1cmVkV2lkdGg7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEB0eXBlIHtX ZWJJbnNwZWN0b3IuVmlld30KKyAgICAgKi8KKyAgICBnZXQgdmlldygpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fdmlldzsKKyAgICB9LAorCisgICAgc2V0IHZpZXcodmlldykKKyAgICB7 CisgICAgICAgIHRoaXMuX3ZpZXcgPSB2aWV3OworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBA dHlwZSB7RWxlbWVudH0KICAgICAgKi8KICAgICBnZXQgdGFiRWxlbWVudCgpCkBAIC00MzIsOCAr NTA5LDEwIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdmFyIHRhYkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAg ICAgdGFiRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJ0YWJiZWQtcGFuZS1oZWFkZXItdGFiIik7CiAg ICAgICAgIAotICAgICAgICB2YXIgdGFiVGl0bGVFbGVtZW50ID0gdGFiRWxlbWVudC5jcmVhdGVD aGlsZCgic3BhbiIsICJ0YWJiZWQtcGFuZS1oZWFkZXItdGFiLXRpdGxlIik7Ci0gICAgICAgIHRh YlRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMudGl0bGU7CisgICAgICAgIHZhciB0aXRs ZUVsZW1lbnQgPSB0YWJFbGVtZW50LmNyZWF0ZUNoaWxkKCJzcGFuIiwgInRhYmJlZC1wYW5lLWhl YWRlci10YWItdGl0bGUiKTsKKyAgICAgICAgdGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGhp cy50aXRsZTsKKyAgICAgICAgaWYgKCFtZWFzdXJpbmcpCisgICAgICAgICAgICB0aGlzLl90aXRs ZUVsZW1lbnQgPSB0aXRsZUVsZW1lbnQ7CiAKICAgICAgICAgaWYgKHRoaXMuX2Nsb3NlYWJsZSkg ewogICAgICAgICAgICAgdmFyIGNsb3NlQnV0dG9uU3BhbiA9IHRhYkVsZW1lbnQuY3JlYXRlQ2hp bGQoInNwYW4iLCAidGFiYmVkLXBhbmUtaGVhZGVyLXRhYi1jbG9zZS1idXR0b24iKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCA1NjNmMzA2 ZGNhODRkNjQ4NzM4MzIyMGE0ZWVhYmU0YWM4NDhiMGYzLi5jNmU1ZDQ0OGJlZTQ3YzEyYjdiMWJh Mzk4YmUyMTEzMWI1ODVmZjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9XZWJLaXQucXJjCkBAIC0xMzIsNiArMTMyLDcgQEAKICAgICA8ZmlsZT5TcGxpdFZpZXcu anM8L2ZpbGU+CiAgICAgPGZpbGU+U3RhdHVzQmFyQnV0dG9uLmpzPC9maWxlPgogICAgIDxmaWxl PlN0eWxlc1NpZGViYXJQYW5lLmpzPC9maWxlPgorICAgIDxmaWxlPlRhYmJlZEVkaXRvckNvbnRh aW5lci5qczwvZmlsZT4KICAgICA8ZmlsZT5UYWJiZWRQYW5lLmpzPC9maWxlPgogICAgIDxmaWxl PlRlc3RDb250cm9sbGVyLmpzPC9maWxlPgogICAgIDxmaWxlPlRleHRFZGl0b3JIaWdobGlnaHRl ci5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCmluZGV4IDc3N2YwZDJkM2EzZTMxYTk4OTk0YjFiZjBiMWEyODJiZDhlZWM2 ZGQuLjE1ZDUyZjllMzJhMjY1ZGI0MTkzMTA4YzRmOTZhNWI1OTI4YzY0M2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtMTE2 LDYgKzExNiw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iSmF2YVNjcmlwdE91dGxpbmVEaWFsb2cuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkphdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU3BsaXRWaWV3 LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJU YWJiZWRFZGl0b3JDb250YWluZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4 dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdHNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0c05hdmlnYXRvci5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUmVzb3VyY2VzUGFu ZWwuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9zY3JpcHRzUGFuZWwuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9zY3JpcHRzUGFuZWwuY3NzCmluZGV4IDRiMmQ5NmYxOWI4YzA4YjYzNGQ0NjhjYWI3Y2Mw OGE5ZWZjMjkwNTAuLjFhNGI0YjE3YjYxOTE0N2RkYTFmZjA0MjQ4NGU0ZTViNWYwMTA1ZTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1BhbmVs LmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NjcmlwdHNQYW5l bC5jc3MKQEAgLTE1MywxNCArMTUzLDE3IEBACiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogY2Vu dGVyOwogfQogCi0uc2NyaXB0LXZpZXcgewotICAgIGRpc3BsYXk6IG5vbmU7Ci0gICAgb3ZlcmZs b3c6IGhpZGRlbjsKKy5zY3JpcHRzLXZpZXdzLWNvbnRhaW5lciB7CiAgICAgcG9zaXRpb246IGFi c29sdXRlOwogICAgIHRvcDogMjNweDsKLSAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwogICAg IGJvdHRvbTogMDsKKyAgICBsZWZ0OiAwOworfQorCisuc2NyaXB0LXZpZXcgeworICAgIGRpc3Bs YXk6IG5vbmU7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0KIAogLnNjcmlwdC12aWV3LnZpc2li bGUgewpAQCAtMjExLDYgKzIxNCwxOSBAQAogICAgIG1hcmdpbi10b3A6IDFweDsKIH0KIAorI3Nj cmlwdHMtZWRpdG9yLWNvbnRhaW5lci10YWJiZWQtcGFuZSAudGFiYmVkLXBhbmUtaGVhZGVyIHsK KyAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgMCUgMCUsIDAl IDEwMCUsIGZyb20oI0Y1RjVGNSksIHRvKCNFNUU1RTUpKTsKK30KKworI3NjcmlwdHMtZWRpdG9y LWNvbnRhaW5lci10YWJiZWQtcGFuZSAudGFiYmVkLXBhbmUtaGVhZGVyLWNvbnRlbnRzIHsKKyAg ICBtYXJnaW4tbGVmdDogMXB4OworICAgIG1hcmdpbi1yaWdodDogMTZweDsKK30KKworI3Njcmlw dHMtZWRpdG9yLWNvbnRhaW5lci10YWJiZWQtcGFuZSAudGFiYmVkLXBhbmUtY29udGVudCB7Cisg ICAgbWFyZ2luLXRvcDogMXB4OworfQorCiAuc2NyaXB0cy5wYW5lbCAubmF2aWdhdG9yIGxpIHsK ICAgICBoZWlnaHQ6IDE3cHg7CiAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsK