56941 2011-03-23 11:29:55 -0700 Web Inspector: fix reveal line in formatted script. 2011-04-01 08:26:42 -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 yurys oldest_to_newest 372283 0 podivilov 2011-03-23 11:29:55 -0700 Web Inspector: fix reveal line in formatted script. Replace Panel's showSourceLine method with showAnchorLocation method. This is needed to highlight correct line in formatted script. This will also allow creating anchor for console messages in anonymous scripts. 372284 1 86649 podivilov 2011-03-23 11:30:29 -0700 Created attachment 86649 Patch. 372289 2 86651 podivilov 2011-03-23 11:33:38 -0700 Created attachment 86651 Patch. 377807 3 podivilov 2011-04-01 08:26:42 -0700 Committed r82685: <http://trac.webkit.org/changeset/82685> 86649 2011-03-23 11:30:29 -0700 2011-03-23 11:33:38 -0700 Patch. patch text/plain 14609 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwZTg3MGNhLi4xZGRkYjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsNDEg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBmaXggcmV2ZWFsIGxpbmUgaW4gZm9ybWF0dGVkIHNjcmlwdC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2OTQxCisKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlw ZS5fYnJlYWtwb2ludENsaWNrZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5zb3VyY2VGaWxlRm9yU2NyaXB0VVJMKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlLmNhblNob3dBbmNob3JMb2NhdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5zaG93QW5jaG9y TG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLmNhblNob3dBbmNob3JMb2NhdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnNob3dBbmNob3JMb2NhdGlv bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuY2FuU2hvd0FuY2hv ckxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUuc2hvd0FuY2hvckxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUuc2hvd1Jlc291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuY2FuU2hvd0Fu Y2hvckxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLnNob3dBbmNob3JMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5fc2hvd1NvdXJjZUxpbmUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLmhpZ2hsaWdodExpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZS5fY3JlYXRlVGV4dFZpZXdlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGlj ay5mb2xsb3dMaW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uKToKKworMjAxMS0wMy0yMyAg UGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXggYnJl YWtwb2ludHMgcG9zaXRpb25zIGluIGZvcm1hdHRlZCBzY3JpcHRzLgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5MzEKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQ YW5lLmpzCmluZGV4IDYzYTZlMmEuLjFlZGRjMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMK QEAgLTIzLDExICsyMywxMiBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbihtb2RlbCkKK1dlYklu c3BlY3Rvci5KYXZhU2NyaXB0QnJlYWtwb2ludHNTaWRlYmFyUGFuZSA9IGZ1bmN0aW9uKG1vZGVs LCBzaG93U291cmNlTGluZURlbGVnYXRlKQogewogICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFu ZS5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQnJlYWtwb2ludHMiKSk7CiAKICAg ICB0aGlzLl9tb2RlbCA9IG1vZGVsOworICAgIHRoaXMuX3Nob3dTb3VyY2VMaW5lRGVsZWdhdGUg PSBzaG93U291cmNlTGluZURlbGVnYXRlOwogCiAgICAgdGhpcy5saXN0RWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgdGhpcy5saXN0RWxlbWVudC5jbGFzc05hbWUg PSAiYnJlYWtwb2ludC1saXN0IjsKQEAgLTEyMyw3ICsxMjQsNyBAQCBXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiAgICAgX2JyZWFr cG9pbnRDbGlja2VkOiBmdW5jdGlvbihicmVha3BvaW50LCBldmVudCkKICAgICB7Ci0gICAgICAg IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5zaG93U291cmNlTGluZShicmVha3BvaW50LnNv dXJjZUZpbGVJZCwgYnJlYWtwb2ludC5saW5lTnVtYmVyICsgMSk7CisgICAgICAgIHRoaXMuX3No b3dTb3VyY2VMaW5lRGVsZWdhdGUoYnJlYWtwb2ludC5zb3VyY2VGaWxlSWQsIGJyZWFrcG9pbnQu bGluZU51bWJlcik7CiAgICAgfSwKIAogICAgIF9icmVha3BvaW50Q2hlY2tib3hDbGlja2VkOiBm dW5jdGlvbihicmVha3BvaW50LCBldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpp bmRleCBhYTg5ODZlLi5iODU0NjlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBA IC01OSw2ICs1OSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGaWxlc1tzb3VyY2VGaWxl SWRdOwogICAgIH0sCiAKKyAgICBzb3VyY2VGaWxlRm9yU2NyaXB0VVJMOiBmdW5jdGlvbihzY3Jp cHRVUkwpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRmlsZXNbc2NyaXB0VVJM XTsKKyAgICB9LAorCiAgICAgcmVxdWVzdFNvdXJjZUZpbGVDb250ZW50OiBmdW5jdGlvbihzb3Vy Y2VGaWxlSWQsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdGhpcy5fc291cmNlRmlsZXNbc291 cmNlRmlsZUlkXS5yZXF1ZXN0Q29udGVudChjYWxsYmFjayk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IGMzNWQ5ZTIuLjJm NzEwMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzCkBAIC04MDUsMTQgKzgwNSwxNCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVzb3VyY2VzVG9BcHBlbmQuZm9yRWFjaCh0aGlz Ll9hcHBlbmRSZXNvdXJjZSwgdGhpcyk7CiAgICAgfSwKIAotICAgIGNhblNob3dTb3VyY2VMaW5l OiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAgY2FuU2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlv bihhbmNob3IpCiAgICAgewotICAgICAgICByZXR1cm4gISF0aGlzLl9yZXNvdXJjZXNCeVVSTFt1 cmxdOworICAgICAgICByZXR1cm4gISF0aGlzLl9yZXNvdXJjZXNCeVVSTFthbmNob3IuaHJlZl07 CiAgICAgfSwKIAotICAgIHNob3dTb3VyY2VMaW5lOiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAg c2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewotICAgICAgICB0aGlz Ll9zaG93UmVzb3VyY2UodGhpcy5fcmVzb3VyY2VzQnlVUkxbdXJsXSwgbGluZSk7CisgICAgICAg IHRoaXMuX3Nob3dSZXNvdXJjZSh0aGlzLl9yZXNvdXJjZXNCeVVSTFthbmNob3IuaHJlZl0sIGFu Y2hvci5nZXRBdHRyaWJ1dGUoImxpbmVfbnVtYmVyIikgLSAxKTsKICAgICB9LAogCiAgICAgX3No b3dSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UsIGxpbmUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCAxYjk5ZGQ0Li5iMmFmMzk3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAgLTM4NCwxMiArMzg0 LDEyIEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2aXNp YmxlVmlldy5yZXNpemUoKTsKICAgICB9LAogCi0gICAgY2FuU2hvd1NvdXJjZUxpbmU6IGZ1bmN0 aW9uKHVybCwgbGluZSkKKyAgICBjYW5TaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hv cikKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LAogCi0gICAgc2hvd1NvdXJj ZUxpbmU6IGZ1bmN0aW9uKHVybCwgbGluZSkKKyAgICBzaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0 aW9uKGFuY2hvcikKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMK aW5kZXggYTdiYTBjYS4uNGNmMzE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0zMjgsMjMgKzMyOCwyMyBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKIAotICAgIGNhblNob3dTb3VyY2VMaW5lOiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAgY2Fu U2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewotICAgICAgICByZXR1 cm4gISFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodXJsKTsKKyAgICAgICAgcmV0dXJuICEh V2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKGFuY2hvci5ocmVmKTsKICAgICB9LAogCi0gICAg c2hvd1NvdXJjZUxpbmU6IGZ1bmN0aW9uKHVybCwgbGluZSkKKyAgICBzaG93QW5jaG9yTG9jYXRp b246IGZ1bmN0aW9uKGFuY2hvcikKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IFdlYklu c3BlY3Rvci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJ bnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoYW5jaG9yLmhyZWYpOwogICAgICAgICBpZiAocmVzb3Vy Y2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuWEhSKSB7CiAgICAgICAgICAg ICAvLyBTaG93IFhIUnMgaW4gdGhlIG5ldHdvcmsgcGFuZWwgb25seS4KLSAgICAgICAgICAgIGlm IChXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3 b3JrLmNhblNob3dTb3VyY2VMaW5lKHVybCwgbGluZSkpIHsKKyAgICAgICAgICAgIGlmIChXZWJJ bnNwZWN0b3IucGFuZWxzLm5ldHdvcmsgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLmNh blNob3dBbmNob3JMb2NhdGlvbihhbmNob3IpKSB7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmN1cnJlbnRQYW5lbCA9IFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yazsKLSAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuc2hvd1NvdXJjZUxpbmUodXJsLCBs aW5lKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuc2hvd1Nv dXJjZUxvY2F0aW9uKGFuY2hvcik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5zaG93UmVzb3VyY2UoV2ViSW5zcGVjdG9yLnJlc291 cmNlRm9yVVJMKHVybCksIGxpbmUpOworICAgICAgICB0aGlzLnNob3dSZXNvdXJjZShyZXNvdXJj ZSwgYW5jaG9yLmdldEF0dHJpYnV0ZSgibGluZV9udW1iZXIiKSAtIDEpOwogICAgIH0sCiAKICAg ICBzaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlLCBsaW5lKQpAQCAtMzU1LDEwICszNTUs OCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgcmVzb3VyY2VUcmVlRWxlbWVudC5zZWxlY3QoKTsKICAgICAgICAgfQogCi0gICAgICAgIGlm IChsaW5lKSB7CisgICAgICAgIGlmIChsaW5lICE9PSB1bmRlZmluZWQpIHsKICAgICAgICAgICAg IHZhciB2aWV3ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNvdXJjZVZpZXdGb3JSZXNv dXJjZShyZXNvdXJjZSk7Ci0gICAgICAgICAgICBpZiAodmlldy5yZXZlYWxMaW5lKQotICAgICAg ICAgICAgICAgIHZpZXcucmV2ZWFsTGluZShsaW5lKTsKICAgICAgICAgICAgIGlmICh2aWV3Lmhp Z2hsaWdodExpbmUpCiAgICAgICAgICAgICAgICAgdmlldy5oaWdobGlnaHRMaW5lKGxpbmUpOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCmluZGV4IDBjMjkxMjEuLjc3MmI0YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xNDIsNyArMTQy LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNp ZGViYXJQYW5lcy53YXRjaEV4cHJlc3Npb25zID0gbmV3IFdlYkluc3BlY3Rvci5XYXRjaEV4cHJl c3Npb25zU2lkZWJhclBhbmUoKTsKICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2sgPSBu ZXcgV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lKHRoaXMuX3ByZXNlbnRhdGlvbk1v ZGVsKTsKICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29wZWNoYWluID0gbmV3IFdlYkluc3BlY3Rv ci5TY29wZUNoYWluU2lkZWJhclBhbmUoKTsKLSAgICB0aGlzLnNpZGViYXJQYW5lcy5qc0JyZWFr cG9pbnRzID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0QnJlYWtwb2ludHNTaWRlYmFyUGFu ZSh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCk7CisgICAgdGhpcy5zaWRlYmFyUGFuZXMuanNCcmVh a3BvaW50cyA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBh bmUodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHRoaXMuX3Nob3dTb3VyY2VMaW5lLmJpbmQodGhp cykpOwogICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkKSB7 CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRvbUJyZWFrcG9pbnRzID0gV2ViSW5zcGVjdG9y LmNyZWF0ZURPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKICAgICAgICAgdGhpcy5zaWRlYmFy UGFuZXMueGhyQnJlYWtwb2ludHMgPSBuZXcgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lk ZWJhclBhbmUoKTsKQEAgLTQ3OCwxNyArNDc4LDI2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgeC5zaG93KHRoaXMudmlld3NDb250YWluZXJF bGVtZW50KTsKICAgICB9LAogCi0gICAgY2FuU2hvd1NvdXJjZUxpbmU6IGZ1bmN0aW9uKHVybCwg bGluZSkKKyAgICBjYW5TaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hvcikKICAgICB7 Ci0gICAgICAgIHJldHVybiB0aGlzLl9kZWJ1Z2dlckVuYWJsZWQgJiYgKHVybCBpbiB0aGlzLl9z b3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2Rl YnVnZ2VyRW5hYmxlZCAmJiB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zb3VyY2VGaWxlRm9yU2Ny aXB0VVJMKGFuY2hvci5ocmVmKTsKICAgICB9LAogCi0gICAgc2hvd1NvdXJjZUxpbmU6IGZ1bmN0 aW9uKHVybCwgbGluZSkKKyAgICBzaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hvcikK ICAgICB7Ci0gICAgICAgIGlmICghKHVybCBpbiB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2Vs ZWN0T3B0aW9uKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1l ID0gdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5KHVybCk7Ci0gICAgICAgIHNv dXJjZUZyYW1lLmhpZ2hsaWdodExpbmUobGluZSk7CisgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVl c3RNYXBwaW5nKG1hcHBpbmcpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBsb2NhdGlvbiA9 IG1hcHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxvY2F0aW9uKGFuY2hvci5nZXRBdHRyaWJ1 dGUoImxpbmVfbnVtYmVyIikgLSAxLCAwKTsKKyAgICAgICAgICAgIHRoaXMuX3Nob3dTb3VyY2VM aW5lKHNvdXJjZUZpbGUuaWQsIGxvY2F0aW9uLmxpbmVOdW1iZXIpOworICAgICAgICB9CisgICAg ICAgIHZhciBzb3VyY2VGaWxlID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc291cmNlRmlsZUZv clNjcmlwdFVSTChhbmNob3IuaHJlZik7CisgICAgICAgIHNvdXJjZUZpbGUucmVxdWVzdE1hcHBp bmcoZGlkUmVxdWVzdE1hcHBpbmcuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9zaG93U291 cmNlTGluZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQorICAgIHsKKyAgICAg ICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5 KHNvdXJjZUZpbGVJZCk7CisgICAgICAgIHNvdXJjZUZyYW1lLmhpZ2hsaWdodExpbmUobGluZU51 bWJlcik7CiAgICAgfSwKIAogICAgIGhhbmRsZVNob3J0Y3V0OiBmdW5jdGlvbihldmVudCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmlu ZGV4IGJmOTYzOGMuLjk2YzMwODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTA5LDE0ICsxMDksNiBAQCBXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fdXBkYXRlRGlm ZkRlY29yYXRpb25zKCk7CiAgICAgfSwKIAotICAgIHJldmVhbExpbmU6IGZ1bmN0aW9uKGxpbmVO dW1iZXIpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikKLSAgICAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIucmV2ZWFsTGluZShsaW5lTnVtYmVyIC0gMSwgMCk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHRoaXMuX2xpbmVOdW1iZXJUb1JldmVhbCA9IGxpbmVOdW1iZXI7 Ci0gICAgfSwKLQogICAgIGFkZE1lc3NhZ2U6IGZ1bmN0aW9uKG1zZykKICAgICB7CiAgICAgICAg IC8vIERvbid0IGFkZCB0aGUgbWVzc2FnZSBpZiB0aGVyZSBpcyBubyBtZXNzYWdlIG9yIHZhbGlk IGxpbmUgb3IgaWYgdGhlIG1zZyBpc24ndCBhbiBlcnJvciBvciB3YXJuaW5nLgpAQCAtMTYxLDcg KzE1Myw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgaGln aGxpZ2h0TGluZTogZnVuY3Rpb24obGluZSkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl90ZXh0 Vmlld2VyKQotICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5oaWdobGlnaHRMaW5lKGxpbmUg LSAxKTsKKyAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuaGlnaGxpZ2h0TGluZShsaW5lKTsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fbGluZVRvSGlnaGxpZ2h0ID0gbGluZTsK ICAgICB9LApAQCAtMjE0LDExICsyMDYsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLm1pbWVUeXBlID0gbWltZVR5cGU7 CiAgICAgICAgIHRoaXMuX3NldFRleHRWaWV3ZXJEZWNvcmF0aW9ucygpOwogCi0gICAgICAgIGlm ICh0aGlzLl9saW5lTnVtYmVyVG9SZXZlYWwpIHsKLSAgICAgICAgICAgIHRoaXMucmV2ZWFsTGlu ZSh0aGlzLl9saW5lTnVtYmVyVG9SZXZlYWwpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xp bmVOdW1iZXJUb1JldmVhbDsKLSAgICAgICAgfQotCiAgICAgICAgIGlmICh0aGlzLl9saW5lVG9I aWdobGlnaHQpIHsKICAgICAgICAgICAgIHRoaXMuaGlnaGxpZ2h0TGluZSh0aGlzLl9saW5lVG9I aWdobGlnaHQpOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xpbmVUb0hpZ2hsaWdodDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg ZWVkYjhlYS4uM2Y2ZWU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKQEAgLTYyMywxNiArNjIzLDggQEAgV2ViSW5zcGVjdG9yLmRvY3Vt ZW50Q2xpY2sgPSBmdW5jdGlvbihldmVudCkKIAogICAgIGZ1bmN0aW9uIGZvbGxvd0xpbmsoKQog ICAgIHsKLSAgICAgICAgLy8gRklYTUU6IHN1cHBvcnQgd2Via2l0LWh0bWwtZXh0ZXJuYWwtbGlu ayBsaW5rcyBoZXJlLgotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmNhblNob3dTb3VyY2VMaW5l KGFuY2hvci5ocmVmLCBhbmNob3IuZ2V0QXR0cmlidXRlKCJsaW5lX251bWJlciIpLCBhbmNob3Iu Z2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiKSkpIHsKLSAgICAgICAgICAgIGlmIChhbmNo b3IuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpKSB7Ci0gICAgICAg ICAgICAgICAgYW5jaG9yLnJlbW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxp bmsiKTsKLSAgICAgICAgICAgICAgICBhbmNob3IuYWRkU3R5bGVDbGFzcygid2Via2l0LWh0bWwt cmVzb3VyY2UtbGluayIpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBXZWJJbnNwZWN0 b3Iuc2hvd1NvdXJjZUxpbmUoYW5jaG9yLmhyZWYsIGFuY2hvci5nZXRBdHRyaWJ1dGUoImxpbmVf bnVtYmVyIiksIGFuY2hvci5nZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIpKTsKKyAgICAg ICAgaWYgKFdlYkluc3BlY3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uKGFuY2hvcikpCiAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KIAogICAgICAgICBjb25zdCBwcm9maWxlTWF0Y2ggPSBX ZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUuVVJMUmVnRXhwLmV4ZWMoYW5jaG9yLmhyZWYpOwogICAg ICAgICBpZiAocHJvZmlsZU1hdGNoKSB7CkBAIC0xMjEyLDMxICsxMjA0LDMxIEBAIFdlYkluc3Bl Y3Rvci5kaXNwbGF5TmFtZUZvclVSTCA9IGZ1bmN0aW9uKHVybCkKICAgICByZXR1cm4gdXJsLnRy aW1VUkwoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5kb21haW4pOwogfQogCi1XZWJJbnNwZWN0 b3IuX2Nob29zZVBhbmVsVG9TaG93U291cmNlTGluZSA9IGZ1bmN0aW9uKHVybCwgbGluZSwgcHJl ZmVycmVkUGFuZWwpCitXZWJJbnNwZWN0b3IuX3Nob3dBbmNob3JMb2NhdGlvbiA9IGZ1bmN0aW9u KGFuY2hvcikKIHsKLSAgICBwcmVmZXJyZWRQYW5lbCA9IHByZWZlcnJlZFBhbmVsIHx8ICJyZXNv dXJjZXMiOwotCi0gICAgdmFyIHBhbmVsID0gdGhpcy5wYW5lbHNbcHJlZmVycmVkUGFuZWxdOwot ICAgIGlmIChwYW5lbCAmJiBwYW5lbC5jYW5TaG93U291cmNlTGluZSh1cmwsIGxpbmUpKQotICAg ICAgICByZXR1cm4gcGFuZWw7Ci0gICAgcGFuZWwgPSB0aGlzLnBhbmVscy5yZXNvdXJjZXM7Ci0g ICAgcmV0dXJuIHBhbmVsLmNhblNob3dTb3VyY2VMaW5lKHVybCwgbGluZSkgPyBwYW5lbCA6IG51 bGw7Ci19CisgICAgdmFyIHBhbmVscyA9IFtdOworICAgIHZhciBwcmVmZXJlZFBhbmVsID0gdGhp cy5wYW5lbHNbYW5jaG9yLmdldEF0dHJpYnV0ZSgicHJlZmVycmVkX3BhbmVsIikgfHwgInJlc291 cmNlcyJdOworICAgIHBhbmVscy5wdXNoKHByZWZlcmVkUGFuZWwpOworICAgIGlmIChwcmVmZXJl ZFBhbmVsICE9PSB0aGlzLnBhbmVscy5yZXNvdXJjZXMpCisgICAgICAgIHBhbmVscy5wdXNoKHRo aXMucGFuZWxzLnJlc291cmNlcyk7CisKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBhbmVscy5s ZW5ndGg7ICsraSkgeworICAgICAgICBpZiAoIXBhbmVsc1tpXS5jYW5TaG93QW5jaG9yTG9jYXRp b24oYW5jaG9yKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwogCi1XZWJJbnNwZWN0b3IuY2FuU2hv d1NvdXJjZUxpbmUgPSBmdW5jdGlvbih1cmwsIGxpbmUsIHByZWZlcnJlZFBhbmVsKQotewotICAg IHJldHVybiAhIXRoaXMuX2Nob29zZVBhbmVsVG9TaG93U291cmNlTGluZSh1cmwsIGxpbmUsIHBy ZWZlcnJlZFBhbmVsKTsKLX0KKyAgICAgICAgLy8gRklYTUU6IHN1cHBvcnQgd2Via2l0LWh0bWwt ZXh0ZXJuYWwtbGluayBsaW5rcyBoZXJlLgorICAgICAgICBpZiAoYW5jaG9yLmhhc1N0eWxlQ2xh c3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsiKSkgeworICAgICAgICAgICAgYW5jaG9yLnJl bW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsiKTsKKyAgICAgICAgICAg IGFuY2hvci5hZGRTdHlsZUNsYXNzKCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIik7CisgICAg ICAgIH0KIAotV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VMaW5lID0gZnVuY3Rpb24odXJsLCBsaW5l LCBwcmVmZXJyZWRQYW5lbCkKLXsKLSAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRoaXMuX2Nob29z ZVBhbmVsVG9TaG93U291cmNlTGluZSh1cmwsIGxpbmUsIHByZWZlcnJlZFBhbmVsKTsKLSAgICBp ZiAoIXRoaXMuY3VycmVudFBhbmVsKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKHRo aXMuZHJhd2VyKQotICAgICAgICB0aGlzLmRyYXdlci5pbW1lZGlhdGVseUZpbmlzaEFuaW1hdGlv bigpOwotICAgIHRoaXMuY3VycmVudFBhbmVsLnNob3dTb3VyY2VMaW5lKHVybCwgbGluZSk7Ci0g ICAgcmV0dXJuIHRydWU7CisgICAgICAgIHRoaXMuY3VycmVudFBhbmVsID0gcGFuZWxzW2ldOwor ICAgICAgICBpZiAodGhpcy5kcmF3ZXIpCisgICAgICAgICAgICB0aGlzLmRyYXdlci5pbW1lZGlh dGVseUZpbmlzaEFuaW1hdGlvbigpOworICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbC5zaG93QW5j aG9yTG9jYXRpb24oYW5jaG9yKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJl dHVybiBmYWxzZTsKIH0KIAogV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdBc0ZyYWdtZW50ID0g ZnVuY3Rpb24oc3RyaW5nKQo= 86651 2011-03-23 11:33:38 -0700 2011-03-29 04:17:45 -0700 Patch. patch text/plain 14609 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwZTg3MGNhLi4xZGRkYjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsNDEg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBmaXggcmV2ZWFsIGxpbmUgaW4gZm9ybWF0dGVkIHNjcmlwdC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2OTQxCisKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlw ZS5fYnJlYWtwb2ludENsaWNrZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5zb3VyY2VGaWxlRm9yU2NyaXB0VVJMKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlLmNhblNob3dBbmNob3JMb2NhdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5zaG93QW5jaG9y TG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLmNhblNob3dBbmNob3JMb2NhdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnNob3dBbmNob3JMb2NhdGlv bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuY2FuU2hvd0FuY2hv ckxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUuc2hvd0FuY2hvckxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUuc2hvd1Jlc291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuY2FuU2hvd0Fu Y2hvckxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLnNob3dBbmNob3JMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5fc2hvd1NvdXJjZUxpbmUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLmhpZ2hsaWdodExpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZS5fY3JlYXRlVGV4dFZpZXdlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGlj ay5mb2xsb3dMaW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uKToKKworMjAxMS0wMy0yMyAg UGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXggYnJl YWtwb2ludHMgcG9zaXRpb25zIGluIGZvcm1hdHRlZCBzY3JpcHRzLgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5MzEKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQ YW5lLmpzCmluZGV4IDYzYTZlMmEuLjFlZGRjMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMK QEAgLTIzLDExICsyMywxMiBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbihtb2RlbCkKK1dlYklu c3BlY3Rvci5KYXZhU2NyaXB0QnJlYWtwb2ludHNTaWRlYmFyUGFuZSA9IGZ1bmN0aW9uKG1vZGVs LCBzaG93U291cmNlTGluZURlbGVnYXRlKQogewogICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFu ZS5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQnJlYWtwb2ludHMiKSk7CiAKICAg ICB0aGlzLl9tb2RlbCA9IG1vZGVsOworICAgIHRoaXMuX3Nob3dTb3VyY2VMaW5lRGVsZWdhdGUg PSBzaG93U291cmNlTGluZURlbGVnYXRlOwogCiAgICAgdGhpcy5saXN0RWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgdGhpcy5saXN0RWxlbWVudC5jbGFzc05hbWUg PSAiYnJlYWtwb2ludC1saXN0IjsKQEAgLTEyMyw3ICsxMjQsNyBAQCBXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiAgICAgX2JyZWFr cG9pbnRDbGlja2VkOiBmdW5jdGlvbihicmVha3BvaW50LCBldmVudCkKICAgICB7Ci0gICAgICAg IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5zaG93U291cmNlTGluZShicmVha3BvaW50LnNv dXJjZUZpbGVJZCwgYnJlYWtwb2ludC5saW5lTnVtYmVyICsgMSk7CisgICAgICAgIHRoaXMuX3No b3dTb3VyY2VMaW5lRGVsZWdhdGUoYnJlYWtwb2ludC5zb3VyY2VGaWxlSWQsIGJyZWFrcG9pbnQu bGluZU51bWJlcik7CiAgICAgfSwKIAogICAgIF9icmVha3BvaW50Q2hlY2tib3hDbGlja2VkOiBm dW5jdGlvbihicmVha3BvaW50LCBldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpp bmRleCBhYTg5ODZlLi5iODU0NjlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBA IC01OSw2ICs1OSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGaWxlc1tzb3VyY2VGaWxl SWRdOwogICAgIH0sCiAKKyAgICBzb3VyY2VGaWxlRm9yU2NyaXB0VVJMOiBmdW5jdGlvbihzY3Jp cHRVUkwpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRmlsZXNbc2NyaXB0VVJM XTsKKyAgICB9LAorCiAgICAgcmVxdWVzdFNvdXJjZUZpbGVDb250ZW50OiBmdW5jdGlvbihzb3Vy Y2VGaWxlSWQsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdGhpcy5fc291cmNlRmlsZXNbc291 cmNlRmlsZUlkXS5yZXF1ZXN0Q29udGVudChjYWxsYmFjayk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IGMzNWQ5ZTIuLjJm NzEwMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzCkBAIC04MDUsMTQgKzgwNSwxNCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVzb3VyY2VzVG9BcHBlbmQuZm9yRWFjaCh0aGlz Ll9hcHBlbmRSZXNvdXJjZSwgdGhpcyk7CiAgICAgfSwKIAotICAgIGNhblNob3dTb3VyY2VMaW5l OiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAgY2FuU2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlv bihhbmNob3IpCiAgICAgewotICAgICAgICByZXR1cm4gISF0aGlzLl9yZXNvdXJjZXNCeVVSTFt1 cmxdOworICAgICAgICByZXR1cm4gISF0aGlzLl9yZXNvdXJjZXNCeVVSTFthbmNob3IuaHJlZl07 CiAgICAgfSwKIAotICAgIHNob3dTb3VyY2VMaW5lOiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAg c2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewotICAgICAgICB0aGlz Ll9zaG93UmVzb3VyY2UodGhpcy5fcmVzb3VyY2VzQnlVUkxbdXJsXSwgbGluZSk7CisgICAgICAg IHRoaXMuX3Nob3dSZXNvdXJjZSh0aGlzLl9yZXNvdXJjZXNCeVVSTFthbmNob3IuaHJlZl0sIGFu Y2hvci5nZXRBdHRyaWJ1dGUoImxpbmVfbnVtYmVyIikgLSAxKTsKICAgICB9LAogCiAgICAgX3No b3dSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UsIGxpbmUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCAxYjk5ZGQ0Li5iMmFmMzk3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAgLTM4NCwxMiArMzg0 LDEyIEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2aXNp YmxlVmlldy5yZXNpemUoKTsKICAgICB9LAogCi0gICAgY2FuU2hvd1NvdXJjZUxpbmU6IGZ1bmN0 aW9uKHVybCwgbGluZSkKKyAgICBjYW5TaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hv cikKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LAogCi0gICAgc2hvd1NvdXJj ZUxpbmU6IGZ1bmN0aW9uKHVybCwgbGluZSkKKyAgICBzaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0 aW9uKGFuY2hvcikKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMK aW5kZXggYTdiYTBjYS4uMTE2MjcyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0zMjgsMjMgKzMyOCwyMyBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKIAotICAgIGNhblNob3dTb3VyY2VMaW5lOiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAgY2Fu U2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewotICAgICAgICByZXR1 cm4gISFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodXJsKTsKKyAgICAgICAgcmV0dXJuICEh V2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKGFuY2hvci5ocmVmKTsKICAgICB9LAogCi0gICAg c2hvd1NvdXJjZUxpbmU6IGZ1bmN0aW9uKHVybCwgbGluZSkKKyAgICBzaG93QW5jaG9yTG9jYXRp b246IGZ1bmN0aW9uKGFuY2hvcikKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IFdlYklu c3BlY3Rvci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJ bnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoYW5jaG9yLmhyZWYpOwogICAgICAgICBpZiAocmVzb3Vy Y2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuWEhSKSB7CiAgICAgICAgICAg ICAvLyBTaG93IFhIUnMgaW4gdGhlIG5ldHdvcmsgcGFuZWwgb25seS4KLSAgICAgICAgICAgIGlm IChXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3 b3JrLmNhblNob3dTb3VyY2VMaW5lKHVybCwgbGluZSkpIHsKKyAgICAgICAgICAgIGlmIChXZWJJ bnNwZWN0b3IucGFuZWxzLm5ldHdvcmsgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLmNh blNob3dBbmNob3JMb2NhdGlvbihhbmNob3IpKSB7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmN1cnJlbnRQYW5lbCA9IFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yazsKLSAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuc2hvd1NvdXJjZUxpbmUodXJsLCBs aW5lKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuc2hvd0Fu Y2hvckxvY2F0aW9uKGFuY2hvcik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5zaG93UmVzb3VyY2UoV2ViSW5zcGVjdG9yLnJlc291 cmNlRm9yVVJMKHVybCksIGxpbmUpOworICAgICAgICB0aGlzLnNob3dSZXNvdXJjZShyZXNvdXJj ZSwgYW5jaG9yLmdldEF0dHJpYnV0ZSgibGluZV9udW1iZXIiKSAtIDEpOwogICAgIH0sCiAKICAg ICBzaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlLCBsaW5lKQpAQCAtMzU1LDEwICszNTUs OCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgcmVzb3VyY2VUcmVlRWxlbWVudC5zZWxlY3QoKTsKICAgICAgICAgfQogCi0gICAgICAgIGlm IChsaW5lKSB7CisgICAgICAgIGlmIChsaW5lICE9PSB1bmRlZmluZWQpIHsKICAgICAgICAgICAg IHZhciB2aWV3ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNvdXJjZVZpZXdGb3JSZXNv dXJjZShyZXNvdXJjZSk7Ci0gICAgICAgICAgICBpZiAodmlldy5yZXZlYWxMaW5lKQotICAgICAg ICAgICAgICAgIHZpZXcucmV2ZWFsTGluZShsaW5lKTsKICAgICAgICAgICAgIGlmICh2aWV3Lmhp Z2hsaWdodExpbmUpCiAgICAgICAgICAgICAgICAgdmlldy5oaWdobGlnaHRMaW5lKGxpbmUpOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCmluZGV4IDBjMjkxMjEuLjc3MmI0YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xNDIsNyArMTQy LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNp ZGViYXJQYW5lcy53YXRjaEV4cHJlc3Npb25zID0gbmV3IFdlYkluc3BlY3Rvci5XYXRjaEV4cHJl c3Npb25zU2lkZWJhclBhbmUoKTsKICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2sgPSBu ZXcgV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lKHRoaXMuX3ByZXNlbnRhdGlvbk1v ZGVsKTsKICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29wZWNoYWluID0gbmV3IFdlYkluc3BlY3Rv ci5TY29wZUNoYWluU2lkZWJhclBhbmUoKTsKLSAgICB0aGlzLnNpZGViYXJQYW5lcy5qc0JyZWFr cG9pbnRzID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0QnJlYWtwb2ludHNTaWRlYmFyUGFu ZSh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCk7CisgICAgdGhpcy5zaWRlYmFyUGFuZXMuanNCcmVh a3BvaW50cyA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBh bmUodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHRoaXMuX3Nob3dTb3VyY2VMaW5lLmJpbmQodGhp cykpOwogICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkKSB7 CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRvbUJyZWFrcG9pbnRzID0gV2ViSW5zcGVjdG9y LmNyZWF0ZURPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKICAgICAgICAgdGhpcy5zaWRlYmFy UGFuZXMueGhyQnJlYWtwb2ludHMgPSBuZXcgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lk ZWJhclBhbmUoKTsKQEAgLTQ3OCwxNyArNDc4LDI2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgeC5zaG93KHRoaXMudmlld3NDb250YWluZXJF bGVtZW50KTsKICAgICB9LAogCi0gICAgY2FuU2hvd1NvdXJjZUxpbmU6IGZ1bmN0aW9uKHVybCwg bGluZSkKKyAgICBjYW5TaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hvcikKICAgICB7 Ci0gICAgICAgIHJldHVybiB0aGlzLl9kZWJ1Z2dlckVuYWJsZWQgJiYgKHVybCBpbiB0aGlzLl9z b3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2Rl YnVnZ2VyRW5hYmxlZCAmJiB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zb3VyY2VGaWxlRm9yU2Ny aXB0VVJMKGFuY2hvci5ocmVmKTsKICAgICB9LAogCi0gICAgc2hvd1NvdXJjZUxpbmU6IGZ1bmN0 aW9uKHVybCwgbGluZSkKKyAgICBzaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hvcikK ICAgICB7Ci0gICAgICAgIGlmICghKHVybCBpbiB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2Vs ZWN0T3B0aW9uKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1l ID0gdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5KHVybCk7Ci0gICAgICAgIHNv dXJjZUZyYW1lLmhpZ2hsaWdodExpbmUobGluZSk7CisgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVl c3RNYXBwaW5nKG1hcHBpbmcpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBsb2NhdGlvbiA9 IG1hcHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxvY2F0aW9uKGFuY2hvci5nZXRBdHRyaWJ1 dGUoImxpbmVfbnVtYmVyIikgLSAxLCAwKTsKKyAgICAgICAgICAgIHRoaXMuX3Nob3dTb3VyY2VM aW5lKHNvdXJjZUZpbGUuaWQsIGxvY2F0aW9uLmxpbmVOdW1iZXIpOworICAgICAgICB9CisgICAg ICAgIHZhciBzb3VyY2VGaWxlID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc291cmNlRmlsZUZv clNjcmlwdFVSTChhbmNob3IuaHJlZik7CisgICAgICAgIHNvdXJjZUZpbGUucmVxdWVzdE1hcHBp bmcoZGlkUmVxdWVzdE1hcHBpbmcuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9zaG93U291 cmNlTGluZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQorICAgIHsKKyAgICAg ICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5kQWRkVG9IaXN0b3J5 KHNvdXJjZUZpbGVJZCk7CisgICAgICAgIHNvdXJjZUZyYW1lLmhpZ2hsaWdodExpbmUobGluZU51 bWJlcik7CiAgICAgfSwKIAogICAgIGhhbmRsZVNob3J0Y3V0OiBmdW5jdGlvbihldmVudCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmlu ZGV4IGJmOTYzOGMuLjk2YzMwODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTA5LDE0ICsxMDksNiBAQCBXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fdXBkYXRlRGlm ZkRlY29yYXRpb25zKCk7CiAgICAgfSwKIAotICAgIHJldmVhbExpbmU6IGZ1bmN0aW9uKGxpbmVO dW1iZXIpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikKLSAgICAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIucmV2ZWFsTGluZShsaW5lTnVtYmVyIC0gMSwgMCk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHRoaXMuX2xpbmVOdW1iZXJUb1JldmVhbCA9IGxpbmVOdW1iZXI7 Ci0gICAgfSwKLQogICAgIGFkZE1lc3NhZ2U6IGZ1bmN0aW9uKG1zZykKICAgICB7CiAgICAgICAg IC8vIERvbid0IGFkZCB0aGUgbWVzc2FnZSBpZiB0aGVyZSBpcyBubyBtZXNzYWdlIG9yIHZhbGlk IGxpbmUgb3IgaWYgdGhlIG1zZyBpc24ndCBhbiBlcnJvciBvciB3YXJuaW5nLgpAQCAtMTYxLDcg KzE1Myw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgaGln aGxpZ2h0TGluZTogZnVuY3Rpb24obGluZSkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl90ZXh0 Vmlld2VyKQotICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5oaWdobGlnaHRMaW5lKGxpbmUg LSAxKTsKKyAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuaGlnaGxpZ2h0TGluZShsaW5lKTsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fbGluZVRvSGlnaGxpZ2h0ID0gbGluZTsK ICAgICB9LApAQCAtMjE0LDExICsyMDYsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLm1pbWVUeXBlID0gbWltZVR5cGU7 CiAgICAgICAgIHRoaXMuX3NldFRleHRWaWV3ZXJEZWNvcmF0aW9ucygpOwogCi0gICAgICAgIGlm ICh0aGlzLl9saW5lTnVtYmVyVG9SZXZlYWwpIHsKLSAgICAgICAgICAgIHRoaXMucmV2ZWFsTGlu ZSh0aGlzLl9saW5lTnVtYmVyVG9SZXZlYWwpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xp bmVOdW1iZXJUb1JldmVhbDsKLSAgICAgICAgfQotCiAgICAgICAgIGlmICh0aGlzLl9saW5lVG9I aWdobGlnaHQpIHsKICAgICAgICAgICAgIHRoaXMuaGlnaGxpZ2h0TGluZSh0aGlzLl9saW5lVG9I aWdobGlnaHQpOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xpbmVUb0hpZ2hsaWdodDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg ZWVkYjhlYS4uM2Y2ZWU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKQEAgLTYyMywxNiArNjIzLDggQEAgV2ViSW5zcGVjdG9yLmRvY3Vt ZW50Q2xpY2sgPSBmdW5jdGlvbihldmVudCkKIAogICAgIGZ1bmN0aW9uIGZvbGxvd0xpbmsoKQog ICAgIHsKLSAgICAgICAgLy8gRklYTUU6IHN1cHBvcnQgd2Via2l0LWh0bWwtZXh0ZXJuYWwtbGlu ayBsaW5rcyBoZXJlLgotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmNhblNob3dTb3VyY2VMaW5l KGFuY2hvci5ocmVmLCBhbmNob3IuZ2V0QXR0cmlidXRlKCJsaW5lX251bWJlciIpLCBhbmNob3Iu Z2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiKSkpIHsKLSAgICAgICAgICAgIGlmIChhbmNo b3IuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpKSB7Ci0gICAgICAg ICAgICAgICAgYW5jaG9yLnJlbW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxp bmsiKTsKLSAgICAgICAgICAgICAgICBhbmNob3IuYWRkU3R5bGVDbGFzcygid2Via2l0LWh0bWwt cmVzb3VyY2UtbGluayIpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBXZWJJbnNwZWN0 b3Iuc2hvd1NvdXJjZUxpbmUoYW5jaG9yLmhyZWYsIGFuY2hvci5nZXRBdHRyaWJ1dGUoImxpbmVf bnVtYmVyIiksIGFuY2hvci5nZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIpKTsKKyAgICAg ICAgaWYgKFdlYkluc3BlY3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uKGFuY2hvcikpCiAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KIAogICAgICAgICBjb25zdCBwcm9maWxlTWF0Y2ggPSBX ZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUuVVJMUmVnRXhwLmV4ZWMoYW5jaG9yLmhyZWYpOwogICAg ICAgICBpZiAocHJvZmlsZU1hdGNoKSB7CkBAIC0xMjEyLDMxICsxMjA0LDMxIEBAIFdlYkluc3Bl Y3Rvci5kaXNwbGF5TmFtZUZvclVSTCA9IGZ1bmN0aW9uKHVybCkKICAgICByZXR1cm4gdXJsLnRy aW1VUkwoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5kb21haW4pOwogfQogCi1XZWJJbnNwZWN0 b3IuX2Nob29zZVBhbmVsVG9TaG93U291cmNlTGluZSA9IGZ1bmN0aW9uKHVybCwgbGluZSwgcHJl ZmVycmVkUGFuZWwpCitXZWJJbnNwZWN0b3IuX3Nob3dBbmNob3JMb2NhdGlvbiA9IGZ1bmN0aW9u KGFuY2hvcikKIHsKLSAgICBwcmVmZXJyZWRQYW5lbCA9IHByZWZlcnJlZFBhbmVsIHx8ICJyZXNv dXJjZXMiOwotCi0gICAgdmFyIHBhbmVsID0gdGhpcy5wYW5lbHNbcHJlZmVycmVkUGFuZWxdOwot ICAgIGlmIChwYW5lbCAmJiBwYW5lbC5jYW5TaG93U291cmNlTGluZSh1cmwsIGxpbmUpKQotICAg ICAgICByZXR1cm4gcGFuZWw7Ci0gICAgcGFuZWwgPSB0aGlzLnBhbmVscy5yZXNvdXJjZXM7Ci0g ICAgcmV0dXJuIHBhbmVsLmNhblNob3dTb3VyY2VMaW5lKHVybCwgbGluZSkgPyBwYW5lbCA6IG51 bGw7Ci19CisgICAgdmFyIHBhbmVscyA9IFtdOworICAgIHZhciBwcmVmZXJlZFBhbmVsID0gdGhp cy5wYW5lbHNbYW5jaG9yLmdldEF0dHJpYnV0ZSgicHJlZmVycmVkX3BhbmVsIikgfHwgInJlc291 cmNlcyJdOworICAgIHBhbmVscy5wdXNoKHByZWZlcmVkUGFuZWwpOworICAgIGlmIChwcmVmZXJl ZFBhbmVsICE9PSB0aGlzLnBhbmVscy5yZXNvdXJjZXMpCisgICAgICAgIHBhbmVscy5wdXNoKHRo aXMucGFuZWxzLnJlc291cmNlcyk7CisKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBhbmVscy5s ZW5ndGg7ICsraSkgeworICAgICAgICBpZiAoIXBhbmVsc1tpXS5jYW5TaG93QW5jaG9yTG9jYXRp b24oYW5jaG9yKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwogCi1XZWJJbnNwZWN0b3IuY2FuU2hv d1NvdXJjZUxpbmUgPSBmdW5jdGlvbih1cmwsIGxpbmUsIHByZWZlcnJlZFBhbmVsKQotewotICAg IHJldHVybiAhIXRoaXMuX2Nob29zZVBhbmVsVG9TaG93U291cmNlTGluZSh1cmwsIGxpbmUsIHBy ZWZlcnJlZFBhbmVsKTsKLX0KKyAgICAgICAgLy8gRklYTUU6IHN1cHBvcnQgd2Via2l0LWh0bWwt ZXh0ZXJuYWwtbGluayBsaW5rcyBoZXJlLgorICAgICAgICBpZiAoYW5jaG9yLmhhc1N0eWxlQ2xh c3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsiKSkgeworICAgICAgICAgICAgYW5jaG9yLnJl bW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsiKTsKKyAgICAgICAgICAg IGFuY2hvci5hZGRTdHlsZUNsYXNzKCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIik7CisgICAg ICAgIH0KIAotV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VMaW5lID0gZnVuY3Rpb24odXJsLCBsaW5l LCBwcmVmZXJyZWRQYW5lbCkKLXsKLSAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRoaXMuX2Nob29z ZVBhbmVsVG9TaG93U291cmNlTGluZSh1cmwsIGxpbmUsIHByZWZlcnJlZFBhbmVsKTsKLSAgICBp ZiAoIXRoaXMuY3VycmVudFBhbmVsKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKHRo aXMuZHJhd2VyKQotICAgICAgICB0aGlzLmRyYXdlci5pbW1lZGlhdGVseUZpbmlzaEFuaW1hdGlv bigpOwotICAgIHRoaXMuY3VycmVudFBhbmVsLnNob3dTb3VyY2VMaW5lKHVybCwgbGluZSk7Ci0g ICAgcmV0dXJuIHRydWU7CisgICAgICAgIHRoaXMuY3VycmVudFBhbmVsID0gcGFuZWxzW2ldOwor ICAgICAgICBpZiAodGhpcy5kcmF3ZXIpCisgICAgICAgICAgICB0aGlzLmRyYXdlci5pbW1lZGlh dGVseUZpbmlzaEFuaW1hdGlvbigpOworICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbC5zaG93QW5j aG9yTG9jYXRpb24oYW5jaG9yKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJl dHVybiBmYWxzZTsKIH0KIAogV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdBc0ZyYWdtZW50ID0g ZnVuY3Rpb24oc3RyaW5nKQo=