69345 2011-10-04 10:04:34 -0700 Web Inspector: make SourceFrame compile. 2011-10-04 10:18:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 477668 0 pfeldman 2011-10-04 10:04:34 -0700 Patch to follow. 477671 1 109636 pfeldman 2011-10-04 10:07:07 -0700 Created attachment 109636 Patch 477684 2 pfeldman 2011-10-04 10:18:14 -0700 Committed r96604: <http://trac.webkit.org/changeset/96604> 109636 2011-10-04 10:07:07 -0700 2011-10-04 10:10:58 -0700 Patch bug-69345-20111004210705.patch text/plain 19387 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY1OTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNzE4YjE4YjEwNTQzMDQ4 ZjBhMTYyMDQwMTZjZjRhMzVhYzY2YTZhLi41ODY1ZGI0ZGQ3NTIyN2NmMDFmMDBmOTY4Njg0ZjU5 YzYxZDEwMmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTIgQEAKIDIwMTEtMTAtMDQgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG1ha2UgU291cmNlRnJhbWUgY29tcGlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY5MzQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5ET01BZ2VudC5wcm90b3R5cGUuaW5zcGVjdEVsZW1lbnQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTURpc3BhdGNoZXIucHJvdG90eXBlLmluc3BlY3RFbGVtZW50UmVxdWVzdGVkKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX2luc3BlY3RFbGVtZW50UmVx dWVzdGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNT ZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5VHJlZUVsZW1l bnQucHJvdG90eXBlLl9jb250ZXh0TWVudUV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk9iamVjdFByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnN0YXJ0RWRpdGluZyk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2FwcGx5RGlmZk1hcmt1cCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX29uU2hvd1BvcG92ZXIuc2hvd09i amVjdFBvcG92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlw ZS5fb25TaG93UG9wb3Zlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlLl9lZGl0QnJlYWtwb2ludENvbmRpdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUucHJvdG90eXBlLnN0YXJ0RWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmNvbW1pdEVkaXRpbmcuZGlkRWRpdENvbnRlbnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5jb21taXRFZGl0aW5n KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlwZS5y ZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0 ZS5wcm90b3R5cGUuZGVidWdnaW5nU3VwcG9ydGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlwZS5zZXRCcmVha3BvaW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlwZS5yZW1vdmVCcmVha3BvaW50 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlwZS51 cGRhdGVCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVn YXRlLnByb3RvdHlwZS5maW5kQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGUuY29udGludWVUb0xpbmUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlLmNhbkVkaXRTY3JpcHRTb3Vy Y2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBl LnNldFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZS5wcm90b3R5cGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGUuZGVidWdnZXJQYXVzZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlLmV2 YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNl RnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGUucmVsZWFzZUV2YWx1YXRpb25SZXN1bHQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlLnN1Z2dlc3RlZEZp bGVOYW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IubG9nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5sb2cubG9nTWVzc2FnZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IubG9nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3V0 aWxpdGllcy5qczoKKyAgICAgICAgKCk6CisKKzIwMTEtMTAtMDQgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbXBpbGUgdGV4 dCBlZGl0b3IuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02OTMzOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1m cm9udC1lbmQuc2ggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQu c2gKaW5kZXggNzFmZDkxYTI4NDczMTZkYmNmN2UwMzQwNWJhZjBhZDU1OGFmZTFkZC4uNGNmMDlj ZTVhOTk0ZDMwM2Q3ZjkyMWUzNTZmMTMyMjIyMmI2YWIyMSAxMDA3NTUKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaApAQCAtOTMsOCArOTMsMTAgQEAgamF2YSAt amFyIH4vY2xvc3VyZS9jb21waWxlci5qYXIgLS1jb21waWxhdGlvbl9sZXZlbCBTSU1QTEVfT1BU SU1JWkFUSU9OUyAtLXdhcm4KICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Rvb2xiYXIuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVUlVdGlscy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9WaWV3LmpzIFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV9pbnNw ZWN0b3I6NDpqc21vZHVsZV9zZGssanNtb2R1bGVfdWkgXAorICAgIC0tbW9kdWxlIGpzbW9kdWxl X2luc3BlY3Rvcjo2OmpzbW9kdWxlX3Nkayxqc21vZHVsZV91aSBcCiAgICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcyBcCiAgICAg ICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q cyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZh U2NyaXB0Q29udGV4dE1hbmFnZXIuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMgXAorICAgICAgICAt LWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgXAog ICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVN YW5hZ2VyLmpzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RPTUFnZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2Vu dC5qcwppbmRleCA2YjZmYzg5MTM0ZTQyYTBlM2Y4Y2RhOWY5ZjRlMWJlYWJhNGM0OTM0Li5mMzky N2IwZWQxZTkyNTE1MWI0Mzg0N2RlMDk2NGNmZmI3OWYwNjQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAgLTYxNyw3ICs2MTcsNyBAQCBX ZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlID0gewogICAgICAgICBkZWxldGUgdGhpcy5f aWRUb0RPTU5vZGVbbm9kZUlkXTsKICAgICB9LAogCi0gICAgX2luc3BlY3RFbGVtZW50UmVxdWVz dGVkOiBmdW5jdGlvbihub2RlSWQpCisgICAgaW5zcGVjdEVsZW1lbnQ6IGZ1bmN0aW9uKG5vZGVJ ZCkKICAgICB7CiAgICAgICAgIHZhciBub2RlID0gdGhpcy5faWRUb0RPTU5vZGVbbm9kZUlkXTsK ICAgICAgICAgaWYgKG5vZGUpCkBAIC03MDYsNyArNzA2LDcgQEAgV2ViSW5zcGVjdG9yLkRPTURp c3BhdGNoZXIucHJvdG90eXBlID0gewogCiAgICAgaW5zcGVjdEVsZW1lbnRSZXF1ZXN0ZWQ6IGZ1 bmN0aW9uKG5vZGVJZCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2RvbUFnZW50Ll9pbnNwZWN0RWxl bWVudFJlcXVlc3RlZChub2RlSWQpOworICAgICAgICB0aGlzLl9kb21BZ2VudC5pbnNwZWN0RWxl bWVudChub2RlSWQpOwogICAgIH0sCiAKICAgICBzZWFyY2hSZXN1bHRzOiBmdW5jdGlvbihub2Rl SWRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVt ZW50c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzCmluZGV4IDM0OGI2MTFmNDZjMDdlYTkyNGM4MDUyZDM4ZTg4OThhYTA2YTMzYjAu Ljc0OGRlYzQyNjQ4YmYwYWJkYmQ2MjNkMjI2MWY1ZjhiYTIyNWY3NTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKQEAgLTQ0 Niw4ICs0NDYsOSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB0cmVlRWxlbWVudC5oYXNDaGlsZHJlbiA9IGV2ZW50LmRhdGEuaGFzQ2hpbGRO b2RlcygpOwogICAgIH0sCiAKLSAgICBfaW5zcGVjdEVsZW1lbnRSZXF1ZXN0ZWQ6IGZ1bmN0aW9u KG5vZGUpCisgICAgX2luc3BlY3RFbGVtZW50UmVxdWVzdGVkOiBmdW5jdGlvbihldmVudCkKICAg ICB7CisgICAgICAgIHZhciBub2RlID0gZXZlbnQuZGF0YTsKICAgICAgICAgV2ViSW5zcGVjdG9y LnVwZGF0ZUZvY3VzZWROb2RlKG5vZGUuaWQpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0 aW9uLmpzCmluZGV4IDk2MjZjNzY5Yzg3YzhlODcxMjQwMzA2NTIwMGVjYjZlZjE5NTRhNjguLmNk MTJjOTY4OGI1NzhlNjc5NzJlN2JkYjRmN2Y5ZDgwZjIxZWM1ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVz U2VjdGlvbi5qcwpAQCAtMjQsNiArMjQsMTYgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLyoq CisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuUHJvcGVydGllc1Nl Y3Rpb259CisgKiBAcGFyYW0ge3N0cmluZz19IHRpdGxlCisgKiBAcGFyYW0ge3N0cmluZz19IHN1 YnRpdGxlCisgKiBAcGFyYW0ge3N0cmluZz19IGVtcHR5UGxhY2Vob2xkZXIKKyAqIEBwYXJhbSB7 c3RyaW5nPX0gaWdub3JlSGFzT3duUHJvcGVydHkKKyAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3Bl Y3Rvci5SZW1vdGVPYmplY3RQcm9wZXJ0eT49fSBleHRyYVByb3BlcnRpZXMKKyAqIEBwYXJhbSB7 ZnVuY3Rpb24oKT19IHRyZWVFbGVtZW50Q29uc3RydWN0b3IKKyAqLwogV2ViSW5zcGVjdG9yLk9i amVjdFByb3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24ob2JqZWN0LCB0aXRsZSwgc3VidGl0bGUs IGVtcHR5UGxhY2Vob2xkZXIsIGlnbm9yZUhhc093blByb3BlcnR5LCBleHRyYVByb3BlcnRpZXMs IHRyZWVFbGVtZW50Q29uc3RydWN0b3IpCiB7CiAgICAgdGhpcy5lbXB0eVBsYWNlaG9sZGVyID0g KGVtcHR5UGxhY2Vob2xkZXIgfHwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJObyBQcm9wZXJ0aWVz IikpOwpAQCAtMTM1LDYgKzE0NSwxMCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1Nl Y3Rpb24uQ29tcGFyZVByb3BlcnRpZXMgPSBmdW5jdGlvbihwcm9wZXJ0eUEsIHBybwogICAgIHJl dHVybiBkaWZmOwogfQogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1RyZWVF bGVtZW50fQorICovCiBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudCA9IGZ1 bmN0aW9uKHByb3BlcnR5KQogewogICAgIHRoaXMucHJvcGVydHkgPSBwcm9wZXJ0eTsKQEAgLTIy MCwxMyArMjM0LDEyIEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IHRoaXMucHJvcGVydHkudmFs dWUuaGFzQ2hpbGRyZW4gJiYgIXRoaXMucHJvcGVydHkud2FzVGhyb3duOwogICAgIH0sCiAKLSAg ICBfY29udGV4dE1lbnVFdmVudEZpcmVkOiBmdW5jdGlvbigpCisgICAgX2NvbnRleHRNZW51RXZl bnRGaXJlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBmdW5jdGlvbiBzZWxlY3RO b2RlKG5vZGVJZCkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKG5vZGVJZCkgewotICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuc3dpdGNoVG9BbmRGb2N1cyhX ZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKG5vZGVJZCkpOwotICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKG5vZGVJZCkKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9t QWdlbnQuaW5zcGVjdEVsZW1lbnQobm9kZUlkKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0 aW9uIHJldmVhbEVsZW1lbnQoKQpAQCAtMjYzLDExICsyNzYsMTEgQEAgV2ViSW5zcGVjdG9yLk9i amVjdFByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAodHlwZW9m IHRoaXMudmFsdWVFbGVtZW50Ll9vcmlnaW5hbFRleHRDb250ZW50ID09PSAic3RyaW5nIikKICAg ICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy52YWx1ZUVsZW1l bnQuX29yaWdpbmFsVGV4dENvbnRlbnQ7CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLnN0YXJ0RWRp dGluZyh0aGlzLnZhbHVlRWxlbWVudCwgewotICAgICAgICAgICAgY29udGV4dDogY29udGV4dCwK LSAgICAgICAgICAgIGNvbW1pdEhhbmRsZXI6IHRoaXMuZWRpdGluZ0NvbW1pdHRlZC5iaW5kKHRo aXMpLAotICAgICAgICAgICAgY2FuY2VsSGFuZGxlcjogdGhpcy5lZGl0aW5nQ2FuY2VsbGVkLmJp bmQodGhpcykKLSAgICAgICAgfSk7CisgICAgICAgIHZhciBjb25maWcgPSBuZXcgV2ViSW5zcGVj dG9yLkVkaXRpbmdDb25maWcoKTsKKyAgICAgICAgY29uZmlnLnNldENvbnRleHQoY29udGV4dCk7 CisgICAgICAgIGNvbmZpZy5zZXRDb21taXRIYW5kbGVyKHRoaXMuZWRpdGluZ0NvbW1pdHRlZC5i aW5kKHRoaXMpKTsKKyAgICAgICAgY29uZmlnLnNldENhbmNlbEhhbmRsZXIodGhpcy5lZGl0aW5n Q2FuY2VsbGVkLmJpbmQodGhpcykpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5n KHRoaXMudmFsdWVFbGVtZW50LCBjb25maWcpOwogICAgIH0sCiAKICAgICBlZGl0aW5nRW5kZWQ6 IGZ1bmN0aW9uKGNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCBjZDIxYTBiYWQyOThiYzY3NTMzZmQzNTkw OTc3N2JmZWUxOTZjNTA5Li4yY2E5ZDAxYzlkMzc2MTc0Yzc0NmUwY2YwZjFkYWQ1MzUwNTdmNTUz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VzUGFuZWwuanMKQEAgLTQwNywzMCArNDA3LDkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBfYXBwbHlEaWZmTWFy a3VwOiBmdW5jdGlvbih2aWV3LCBiYXNlQ29udGVudCwgbmV3Q29udGVudCkgewotICAgICAgICB2 YXIgb2xkTGluZXMgPSBiYXNlQ29udGVudC5zcGxpdCgvXHI/XG4vKTsKLSAgICAgICAgdmFyIG5l d0xpbmVzID0gbmV3Q29udGVudC5zcGxpdCgvXHI/XG4vKTsKLQotICAgICAgICB2YXIgZGlmZiA9 IEFycmF5LmRpZmYob2xkTGluZXMsIG5ld0xpbmVzKTsKLQotICAgICAgICB2YXIgZGlmZkRhdGEg PSB7fTsKLSAgICAgICAgZGlmZkRhdGEuYWRkZWQgPSBbXTsKLSAgICAgICAgZGlmZkRhdGEucmVt b3ZlZCA9IFtdOwotICAgICAgICBkaWZmRGF0YS5jaGFuZ2VkID0gW107Ci0KLSAgICAgICAgdmFy IG9mZnNldCA9IDA7Ci0gICAgICAgIHZhciByaWdodCA9IGRpZmYucmlnaHQ7Ci0gICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgcmlnaHQubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGlmICh0 eXBlb2YgcmlnaHRbaV0gPT09ICJzdHJpbmciKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHJpZ2h0 Lmxlbmd0aCA+IGkgKyAxICYmIHJpZ2h0W2kgKyAxXS5yb3cgPT09IGkgKyAxIC0gb2Zmc2V0KQot ICAgICAgICAgICAgICAgICAgICBkaWZmRGF0YS5jaGFuZ2VkLnB1c2goaSk7Ci0gICAgICAgICAg ICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIGRpZmZEYXRhLmFkZGVkLnB1c2goaSk7 Ci0gICAgICAgICAgICAgICAgICAgIG9mZnNldCsrOwotICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgIG9mZnNldCA9IGkgLSByaWdodFtpXS5yb3c7 Ci0gICAgICAgIH0KKyAgICBfYXBwbHlEaWZmTWFya3VwOiBmdW5jdGlvbih2aWV3LCBiYXNlQ29u dGVudCwgbmV3Q29udGVudCkKKyAgICB7CisgICAgICAgIHZhciBkaWZmRGF0YSA9IFRleHREaWZm LmNvbXB1dGUoYmFzZUNvbnRlbnQsIG5ld0NvbnRlbnQpOwogICAgICAgICB2aWV3Lm1hcmtEaWZm KGRpZmZEYXRhKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCBkNmQyNGIwNTU0ZTJlNmJmYWU1ZjZhZGY5NTU0 Y2M1YzM1MzI2ZjI3Li42NmJjZTgzNDU0MTAyMjk1ZjllNGIxYmNhYWY1NzA3MDU1OGU3OGJjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1l LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMKQEAgLTI4LDYgKzI4LDEwIEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgorICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKGRlbGVnYXRlLCB1cmwpCiB7CiAgICAgV2ViSW5z cGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKQEAgLTEyNyw2ICsxMzEsOSBAQCBXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5yZXF1ZXN0 Q29udGVudChjYWxsYmFjayk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7VGV4 dERpZmZ9IGRpZmZEYXRhCisgICAgICovCiAgICAgbWFya0RpZmY6IGZ1bmN0aW9uKGRpZmZEYXRh KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2RpZmZMaW5lcyAmJiB0aGlzLmxvYWRlZCkKQEAg LTQ0Miw2ICs0NDksOSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewog ICAgICAgICByZXR1cm4gcmFuZ2VzOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e2Jvb2xlYW49fSBza2lwUmV2ZWFsTGluZQorICAgICAqLwogICAgIHNldEV4ZWN1dGlvbkxpbmU6 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIHNraXBSZXZlYWxMaW5lKQogICAgIHsKICAgICAgICAgdGhp cy5fZXhlY3V0aW9uTGluZU51bWJlciA9IGxpbmVOdW1iZXI7CkBAIC03NjEsNyArNzcxLDcgQEAg V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAg ICAgcG9wb3ZlckNvbnRlbnRFbGVtZW50LnRleHRDb250ZW50ID0gIlwiIiArIHBvcG92ZXJDb250 ZW50RWxlbWVudC50ZXh0Q29udGVudCArICJcIiI7CiAgICAgICAgICAgICAgICAgcG9wb3Zlci5z aG93KHBvcG92ZXJDb250ZW50RWxlbWVudCwgZWxlbWVudCk7CiAgICAgICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgICAgIHZhciBwb3BvdmVyQ29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKIAogICAgICAgICAgICAgICAgIHZh ciB0aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAg ICAgICAgICB0aXRsZUVsZW1lbnQuY2xhc3NOYW1lID0gInNvdXJjZS1mcmFtZS1wb3BvdmVyLXRp dGxlIG1vbm9zcGFjZSI7CkBAIC03OTcsMTEgKzgwNywxMCBAQCBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FsbGJhY2soY29tbWl0dGVkLCBuZXdU ZXh0KTsKICAgICAgICAgfQogCi0gICAgICAgIFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcodGhp cy5fY29uZGl0aW9uRWRpdG9yRWxlbWVudCwgewotICAgICAgICAgICAgY29udGV4dDogbnVsbCwK LSAgICAgICAgICAgIGNvbW1pdEhhbmRsZXI6IGZpbmlzaEVkaXRpbmcuYmluZCh0aGlzLCB0cnVl KSwKLSAgICAgICAgICAgIGNhbmNlbEhhbmRsZXI6IGZpbmlzaEVkaXRpbmcuYmluZCh0aGlzLCBm YWxzZSkKLSAgICAgICAgfSk7CisgICAgICAgIHZhciBjb25maWcgPSBuZXcgV2ViSW5zcGVjdG9y LkVkaXRpbmdDb25maWcoKTsKKyAgICAgICAgY29uZmlnLnNldENvbW1pdEhhbmRsZXIoZmluaXNo RWRpdGluZy5iaW5kKHRoaXMsIHRydWUpKTsKKyAgICAgICAgY29uZmlnLnNldENhbmNlbEhhbmRs ZXIoZmluaXNoRWRpdGluZy5iaW5kKHRoaXMsIGZhbHNlKSk7CisgICAgICAgIFdlYkluc3BlY3Rv ci5zdGFydEVkaXRpbmcodGhpcy5fY29uZGl0aW9uRWRpdG9yRWxlbWVudCwgY29uZmlnKTsKICAg ICAgICAgdGhpcy5fY29uZGl0aW9uRWRpdG9yRWxlbWVudC52YWx1ZSA9IGNvbmRpdGlvbjsKICAg ICAgICAgdGhpcy5fY29uZGl0aW9uRWRpdG9yRWxlbWVudC5zZWxlY3QoKTsKICAgICB9LApAQCAt ODQ5LDcgKzg1OCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiB0aGlzLl9kZWxlZ2F0ZS5jYW5FZGl0U2NyaXB0U291cmNlKCk7CiAgICAg fSwKIAotICAgIHN0YXJ0RWRpdGluZzogZnVuY3Rpb24obGluZU51bWJlcikKKyAgICBzdGFydEVk aXRpbmc6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5jYW5FZGl0U291cmNl KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC04NzUsMTAgKzg4NCw4IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90ZXh0 Vmlld2VyLnJlYWRPbmx5ID0gZmFsc2U7CiAKICAgICAgICAgICAgIGlmIChlcnJvcikgewotICAg ICAgICAgICAgICAgIGlmIChlcnJvci5tZXNzYWdlKSB7Ci0gICAgICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5sb2coZXJyb3IubWVzc2FnZSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VMZXZlbC5FcnJvcik7Ci0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5z aG93Q29uc29sZSgpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAoZXJy b3IubWVzc2FnZSkKKyAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhlcnJvci5t ZXNzYWdlLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yLCB0 cnVlKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKQEAgLTkzMiw2 ICs5MzksMTAgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZp ZXcucHJvdG90eXBlOwogCiAKKy8qKgorICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5UZXh0 Vmlld2VyRGVsZWdhdGV9CisgKiBAY29uc3RydWN0b3IKKyAqLwogV2ViSW5zcGVjdG9yLlRleHRW aWV3ZXJEZWxlZ2F0ZUZvclNvdXJjZUZyYW1lID0gZnVuY3Rpb24oc291cmNlRnJhbWUpCiB7CiAg ICAgdGhpcy5fc291cmNlRnJhbWUgPSBzb3VyY2VGcmFtZTsKQEAgLTk3Nyw4MyArOTg4LDQ0IEBA IFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyRGVsZWdhdGVGb3JTb3VyY2VGcmFtZS5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRnJhbWUuc3VnZ2VzdGVkRmls ZU5hbWUoKTsKICAgICB9Ci19OworfQogCiBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRl Rm9yU291cmNlRnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyRGVsZWdhdGUucHJvdG90eXBlOwogCiAKKy8qKgorICogQGludGVyZmFjZQorICovCiBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZSA9IGZ1bmN0aW9uKCkKIHsKIH0KIAogV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlID0gewotICAgIHJlcXVlc3RDb250 ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIC8vIFNob3VsZCBiZSBpbXBs ZW1lbnRlZCBieSBzdWJjbGFzc2VzLgotICAgIH0sCisgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0 aW9uKGNhbGxiYWNrKSB7IH0sCiAKLSAgICBkZWJ1Z2dpbmdTdXBwb3J0ZWQ6IGZ1bmN0aW9uKCkK LSAgICB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9LAorICAgIGRlYnVnZ2luZ1N1cHBv cnRlZDogZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfSwKIAotICAgIHNldEJyZWFrcG9pbnQ6 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKLSAgICB7Ci0gICAgICAg IC8vIFNob3VsZCBiZSBpbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgotICAgIH0sCisgICAgc2V0 QnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKSB7IH0s CiAKLSAgICByZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKQotICAgIHsKLSAg ICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCi0gICAgfSwKKyAg ICByZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKSB7IH0sCiAKLSAgICB1cGRh dGVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCi0g ICAgewotICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KLSAg ICB9LAorICAgIHVwZGF0ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlv biwgZW5hYmxlZCkgeyB9LAogCi0gICAgZmluZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIpCi0gICAgewotICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nl cy4KLSAgICB9LAorICAgIGZpbmRCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKSB7IH0s CiAKLSAgICBjb250aW51ZVRvTGluZTogZnVuY3Rpb24obGluZU51bWJlcikKLSAgICB7Ci0gICAg ICAgIC8vIFNob3VsZCBiZSBpbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgotICAgIH0sCisgICAg Y29udGludWVUb0xpbmU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpIHsgfSwKIAotICAgIGNhbkVkaXRT Y3JpcHRTb3VyY2U6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICB9LAorICAgIGNhbkVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKCkgeyByZXR1cm4gZmFsc2U7 IH0sCiAKLSAgICBzZXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHRleHQsIGNhbGxiYWNrKQotICAg IHsKLSAgICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCi0gICAg fSwKKyAgICBzZXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHRleHQsIGNhbGxiYWNrKSB7IH0sCiAK LSAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbihpbkVkaXRNb2RlKQot ICAgIHsKLSAgICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCi0g ICAgfSwKKyAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbihpbkVkaXRN b2RlKSB7IH0sCiAKLSAgICBkZWJ1Z2dlclBhdXNlZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAg ICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCi0gICAgfSwKKyAgICBk ZWJ1Z2dlclBhdXNlZDogZnVuY3Rpb24oKSB7IH0sCiAKLSAgICBldmFsdWF0ZUluU2VsZWN0ZWRD YWxsRnJhbWU6IGZ1bmN0aW9uKHN0cmluZykKLSAgICB7Ci0gICAgICAgIC8vIFNob3VsZCBiZSBp bXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgotICAgIH0sCisgICAgZXZhbHVhdGVJblNlbGVjdGVk Q2FsbEZyYW1lOiBmdW5jdGlvbihzdHJpbmcpIHsgfSwKIAotICAgIHJlbGVhc2VFdmFsdWF0aW9u UmVzdWx0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50 ZWQgYnkgc3ViY2xhc3Nlcy4KLSAgICB9LAorICAgIHJlbGVhc2VFdmFsdWF0aW9uUmVzdWx0OiBm dW5jdGlvbigpIHsgfSwKIAotICAgIHN1Z2dlc3RlZEZpbGVOYW1lOiBmdW5jdGlvbigpCi0gICAg ewotICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KLSAgICB9 CisgICAgc3VnZ2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkgeyB9CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKaW5kZXggYTkzZGZkZWY5NmIyYmVm NDcxNWRiNmFkZGNmMTM4YjkxZWFmMDJkZC4uNzgzNDZkMDU2NWRlNDk2Zjc3NDMwZGRiYmIxMDNh OGFiNDExZGNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9leHRlcm5zLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0 ZXJucy5qcwpAQCAtMTA1LDE0ICsxMDUsNiBAQCBXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbCA9IHsKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKLSAqLwotV2ViSW5zcGVjdG9y Lk9iamVjdFByb3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24ob2JqLCB0aXRsZSkKLXsKLSAgICB0 aGlzLmVsZW1lbnQgPSBudWxsOwotfQotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVu ZHMge1RyZWVPdXRsaW5lfQogICovCiBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZSA9 IGZ1bmN0aW9uKCkKQEAgLTIwMCwzICsxOTIsOSBAQCBFdmVudC5wcm90b3R5cGUuaXNNZXRhT3JD dHJsRm9yVGVzdCA9IGZhbHNlOwogICogQHBhcmFtIHsuLi4qfSB2YXJhcmcKICAqLwogRXZlbnQu cHJvdG90eXBlLmluaXRXZWJLaXRXaGVlbEV2ZW50ID0gZnVuY3Rpb24odmFyYXJnKSB7fQorCisv KioKKyAqIEBwYXJhbSB7c3RyaW5nPX0gbWVzc2FnZUxldmVsCisgKiBAcGFyYW0ge2Jvb2xlYW49 fSBzaG93Q29uc29sZQorICovCitXZWJJbnNwZWN0b3IubG9nID0gZnVuY3Rpb24obWVzc2FnZSwg bWVzc2FnZUxldmVsLCBzaG93Q29uc29sZSkge30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMWNlOWU5OTE3NjhmMWJkNTU1NWRlZWJj ZjRkYTdmZDM1ZDcxNTZhYi4uNmFjZTcxZWNiNTMwYzJlMWYwOWQ1YWNiNmZiYzQ5MGUxZTE1ODIw NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKQEAgLTk1Nyw3ICs5NTcsMTEgQEAgV2ViSW5zcGVjdG9yLmRpZERlc3Ryb3lXb3JrZXIgPSBm dW5jdGlvbigpCiAgICAgICAgIHdvcmtlcnNQYW5lLnJlbW92ZVdvcmtlci5hcHBseSh3b3JrZXJz UGFuZSwgYXJndW1lbnRzKTsKIH0KIAotV2ViSW5zcGVjdG9yLmxvZyA9IGZ1bmN0aW9uKG1lc3Nh Z2UsIG1lc3NhZ2VMZXZlbCkKKy8qKgorICogQHBhcmFtIHtzdHJpbmc9fSBtZXNzYWdlTGV2ZWwK KyAqIEBwYXJhbSB7Ym9vbGVhbj19IHNob3dDb25zb2xlCisgKi8KK1dlYkluc3BlY3Rvci5sb2cg PSBmdW5jdGlvbihtZXNzYWdlLCBtZXNzYWdlTGV2ZWwsIHNob3dDb25zb2xlKQogewogICAgIC8v IHJlbWVtYmVyICd0aGlzJyBmb3Igc2V0SW50ZXJ2YWwoKSBjYWxsYmFjawogICAgIHZhciBzZWxm ID0gdGhpczsKQEAgLTEwMjAsNiArMTAyNCw4IEBAIFdlYkluc3BlY3Rvci5sb2cgPSBmdW5jdGlv bihtZXNzYWdlLCBtZXNzYWdlTGV2ZWwpCiAgICAgICAgICAgICBudWxsKTsKIAogICAgICAgICBz ZWxmLmNvbnNvbGUuYWRkTWVzc2FnZShtc2cpOworICAgICAgICBpZiAoc2hvd0NvbnNvbGUpCisg ICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGUoKTsKICAgICB9CiAKICAgICAvLyBp ZiB3ZSBjYW4ndCBsb2cgdGhlIG1lc3NhZ2UsIHF1ZXVlIGl0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCmluZGV4IDUwNWJmOTdkMGVmOWZlNjVh ZGM3NzFkN2MyNzhhOTYzYTZlNDAxMmIuLmZlYTUwZTA2ZGU2MDNlMThjMzc5ZDk3NzBmYWUxN2U0 ZWZmZGQ0MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv dXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRp bGl0aWVzLmpzCkBAIC05NjksNiArOTY5LDkgQEAgZnVuY3Rpb24gcmV2ZXJ0RG9tQ2hhbmdlcyhk b21DaGFuZ2VzKQogICAgIH0KIH0KIAorLyoqCisgKiBAcGFyYW0ge3N0cmluZz19IGV4dHJhRmxh Z3MKKyAqLwogZnVuY3Rpb24gY3JlYXRlU2VhcmNoUmVnZXgocXVlcnksIGV4dHJhRmxhZ3MpCiB7 CiAgICAgLy8gVGhpcyBzaG91bGQgYmUga2VwdCB0aGUgc2FtZSBhcyB0aGUgb25lIGluIENvbnRl bnRTZWFyY2hVdGlscy5jcHAuCkBAIC05OTUsMyArOTk4LDQzIEBAIGZ1bmN0aW9uIGNvdW50UmVn ZXhNYXRjaGVzKHJlZ2V4LCBjb250ZW50KQogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQor CisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCitmdW5jdGlvbiBUZXh0RGlmZigpCit7CisgICAg dGhpcy5hZGRlZCA9IFtdOworICAgIHRoaXMucmVtb3ZlZCA9IFtdOworICAgIHRoaXMuY2hhbmdl ZCA9IFtdOworfSAKKworLyoqCisgKiBAcGFyYW0ge3N0cmluZ30gYmFzZUNvbnRlbnQKKyAqIEBw YXJhbSB7c3RyaW5nfSBuZXdDb250ZW50CisgKiBAcmV0dXJuIHtUZXh0RGlmZn0KKyAqLworVGV4 dERpZmYuY29tcHV0ZSA9IGZ1bmN0aW9uKGJhc2VDb250ZW50LCBuZXdDb250ZW50KQoreworICAg IHZhciBvbGRMaW5lcyA9IGJhc2VDb250ZW50LnNwbGl0KC9ccj9cbi8pOworICAgIHZhciBuZXdM aW5lcyA9IG5ld0NvbnRlbnQuc3BsaXQoL1xyP1xuLyk7CisKKyAgICB2YXIgZGlmZiA9IEFycmF5 LmRpZmYob2xkTGluZXMsIG5ld0xpbmVzKTsKKworICAgIHZhciBkaWZmRGF0YSA9IG5ldyBUZXh0 RGlmZigpOworCisgICAgdmFyIG9mZnNldCA9IDA7CisgICAgdmFyIHJpZ2h0ID0gZGlmZi5yaWdo dDsKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJpZ2h0Lmxlbmd0aDsgKytpKSB7CisgICAgICAg IGlmICh0eXBlb2YgcmlnaHRbaV0gPT09ICJzdHJpbmciKSB7CisgICAgICAgICAgICBpZiAocmln aHQubGVuZ3RoID4gaSArIDEgJiYgcmlnaHRbaSArIDFdLnJvdyA9PT0gaSArIDEgLSBvZmZzZXQp CisgICAgICAgICAgICAgICAgZGlmZkRhdGEuY2hhbmdlZC5wdXNoKGkpOworICAgICAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICAgICAgZGlmZkRhdGEuYWRkZWQucHVzaChpKTsKKyAgICAgICAg ICAgICAgICBvZmZzZXQrKzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlCisgICAgICAg ICAgICBvZmZzZXQgPSBpIC0gcmlnaHRbaV0ucm93OworICAgIH0KKyAgICByZXR1cm4gZGlmZkRh dGE7Cit9Cg==