40669 2010-06-16 04:03:27 -0700 Web Inspector: one time breakpoint can be persisted in inspector settings. 2010-12-30 11:27:51 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 podivilov webkit-unassigned pfeldman yurys oldest_to_newest 238776 0 podivilov 2010-06-16 04:03:27 -0700 One time breakpoints are send to backend the same way as normal ones, and therefore will be persisted if not hit. 244362 1 60036 podivilov 2010-06-29 10:31:46 -0700 Created attachment 60036 Proposed patch. 60036 2010-06-29 10:31:46 -0700 2010-06-30 05:47:35 -0700 Proposed patch. br_ref.diff text/plain 19049 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjNlNzhmYS4uZDVlYjIyOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMC0wNi0yOSAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBEbyBub3QgcGVyc2lzdCBvbmUgdGltZSBicmVha3BvaW50 cyBpbiBpbnNwZWN0b3Igc2V0dGluZ3MuCisgICAgICAgIEFkZCBzZXRCcmVha3BvaW50VG9TZXR0 aW5ncyBhbmQgcmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0aW5ncyBtZXRob2RzIHRvIEluc3BlY3Rv ckJhY2tlbmQKKyAgICAgICAgYW5kIHVzZSB0aGVtIHRvIG1hbmFnZSBwZXJzaXN0ZWQgYnJlYWtw b2ludHMgZXhwbGljaXRseSBmcm9tIGZyb250ZW5kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA2NjkKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJhY2tlbmQ6OnNl dEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQmFja2VuZDo6cmVtb3Zl QnJlYWtwb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYWNrZW5kOjpzZXRCcmVh a3BvaW50VG9TZXR0aW5ncyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYWNrZW5kOjpy ZW1vdmVCcmVha3BvaW50RnJvbVNldHRpbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yQmFja2VuZC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbDoK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzZXRCcmVha3BvaW50VG9TZXR0aW5ncyk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpyZW1vdmVCcmVha3BvaW50RnJv bVNldHRpbmdzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFBh cnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JGcm9udGVuZDo6cmVzdG9yZWRCcmVha3BvaW50KToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyLnByb3RvdHlwZS5zZXRPbmVUaW1lQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLnJlc3RvcmVkQnJlYWtwb2ludCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLnJlbW92 ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnBy b3RvdHlwZS5fc2V0QnJlYWtwb2ludE9uQmFja2VuZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9JbnNwZWN0b3JCYWNrZW5kU3R1Yi5qczoKKyAgICAgICAgKC5XZWJJbnNwZWN0b3Iu SW5zcGVjdG9yQmFja2VuZFN0dWIucHJvdG90eXBlLnJlbW92ZUJyZWFrcG9pbnQpOgorICAgICAg ICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUuc2V0QnJlYWtw b2ludFRvU2V0dGluZ3MpOgorICAgICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JCYWNrZW5k U3R1Yi5wcm90b3R5cGUucmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0aW5ncyk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu cmVzdG9yZWRCcmVha3BvaW50KToKKwogMjAxMC0wNi0yOSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8 bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmNwcCBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuY3BwCmluZGV4IGU4ODY2YzIuLmE3YTYy ZDcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuY3BwCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuY3BwCkBAIC0xODAsMTQgKzE4 MCwzMSBAQCB2b2lkIEluc3BlY3RvckJhY2tlbmQ6OmRpc2FibGVEZWJ1Z2dlcihib29sIGFsd2F5 cykKIAogdm9pZCBJbnNwZWN0b3JCYWNrZW5kOjpzZXRCcmVha3BvaW50KGxvbmcgY2FsbElkLCBj b25zdCBTdHJpbmcmIHNvdXJjZUlELCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBib29sIGVuYWJsZWQs IGNvbnN0IFN0cmluZyYgY29uZGl0aW9uKQogewotICAgIGlmIChtX2luc3BlY3RvckNvbnRyb2xs ZXIpCi0gICAgICAgIG1faW5zcGVjdG9yQ29udHJvbGxlci0+c2V0QnJlYWtwb2ludChjYWxsSWQs IHNvdXJjZUlELCBsaW5lTnVtYmVyLCBlbmFibGVkLCBjb25kaXRpb24pOworICAgIEluc3BlY3Rv ckZyb250ZW5kKiBmcm9udGVuZCA9IGluc3BlY3RvckZyb250ZW5kKCk7CisgICAgaWYgKCFmcm9u dGVuZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgU2NyaXB0QnJlYWtwb2ludCBicmVha3BvaW50 KGVuYWJsZWQsIGNvbmRpdGlvbik7CisgICAgdW5zaWduZWQgYWN0dWFsTGluZU51bWJlciA9IDA7 CisgICAgYm9vbCBzdWNjZXNzID0gU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLnNldEJyZWFr cG9pbnQoc291cmNlSUQsIGJyZWFrcG9pbnQsIGxpbmVOdW1iZXIsICZhY3R1YWxMaW5lTnVtYmVy KTsKKyAgICBmcm9udGVuZC0+ZGlkU2V0QnJlYWtwb2ludChjYWxsSWQsIHN1Y2Nlc3MsIGFjdHVh bExpbmVOdW1iZXIpOwogfQogCiB2b2lkIEluc3BlY3RvckJhY2tlbmQ6OnJlbW92ZUJyZWFrcG9p bnQoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgdW5zaWduZWQgbGluZU51bWJlcikKIHsKKyAgICBT Y3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkucmVtb3ZlQnJlYWtwb2ludChzb3VyY2VJRCwgbGlu ZU51bWJlcik7Cit9CisKK3ZvaWQgSW5zcGVjdG9yQmFja2VuZDo6c2V0QnJlYWtwb2ludFRvU2V0 dGluZ3MoY29uc3QgU3RyaW5nJiB1cmwsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGJvb2wgZW5hYmxl ZCwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24pCit7CisgICAgaWYgKG1faW5zcGVjdG9yQ29udHJv bGxlcikKKyAgICAgICAgbV9pbnNwZWN0b3JDb250cm9sbGVyLT5zZXRCcmVha3BvaW50VG9TZXR0 aW5ncyh1cmwsIGxpbmVOdW1iZXIsIGVuYWJsZWQsIGNvbmRpdGlvbik7Cit9CisKK3ZvaWQgSW5z cGVjdG9yQmFja2VuZDo6cmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0aW5ncyhjb25zdCBTdHJpbmcm IHVybCwgdW5zaWduZWQgbGluZU51bWJlcikKK3sKICAgICBpZiAobV9pbnNwZWN0b3JDb250cm9s bGVyKQotICAgICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPnJlbW92ZUJyZWFrcG9pbnQoc291 cmNlSUQsIGxpbmVOdW1iZXIpOworICAgICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPnJlbW92 ZUJyZWFrcG9pbnRGcm9tU2V0dGluZ3ModXJsLCBsaW5lTnVtYmVyKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JCYWNrZW5kOjphY3RpdmF0ZUJyZWFrcG9pbnRzKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckJhY2tlbmQuaAppbmRleCAwMzVhYmY2Li43ODEyZGEzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQmFja2VuZC5oCkBAIC04Miw2ICs4Miw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0QnJl YWtwb2ludChsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgdW5zaWduZWQgbGlu ZU51bWJlciwgYm9vbCBlbmFibGVkLCBjb25zdCBTdHJpbmcmIGNvbmRpdGlvbik7CiAgICAgdm9p ZCByZW1vdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgc291cmNlSUQsIHVuc2lnbmVkIGxpbmVO dW1iZXIpOworICAgIHZvaWQgc2V0QnJlYWtwb2ludFRvU2V0dGluZ3MoY29uc3QgU3RyaW5nJiB1 cmwsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGJvb2wgZW5hYmxlZCwgY29uc3QgU3RyaW5nJiBjb25k aXRpb24pOworICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0aW5ncyhjb25zdCBTdHJp bmcmIHVybCwgdW5zaWduZWQgbGluZU51bWJlcik7CiAgICAgdm9pZCBhY3RpdmF0ZUJyZWFrcG9p bnRzKCk7CiAgICAgdm9pZCBkZWFjdGl2YXRlQnJlYWtwb2ludHMoKTsKIApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5pZGwgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JCYWNrZW5kLmlkbAppbmRleCBiNGE2OGNmLi5jZWNiMTEyIDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbApAQCAtNTcsNiArNTcsOCBAQCBtb2R1bGUgY29y ZSB7CiAKICAgICAgICAgdm9pZCBzZXRCcmVha3BvaW50KGluIGxvbmcgY2FsbElkLCBpbiBET01T dHJpbmcgc291cmNlSUQsIGluIHVuc2lnbmVkIGxvbmcgbGluZU51bWJlciwgaW4gYm9vbGVhbiBl bmFibGVkLCBpbiBET01TdHJpbmcgY29uZGl0aW9uKTsKICAgICAgICAgdm9pZCByZW1vdmVCcmVh a3BvaW50KGluIERPTVN0cmluZyBzb3VyY2VJRCwgaW4gdW5zaWduZWQgbG9uZyBsaW5lTnVtYmVy KTsKKyAgICAgICAgdm9pZCBzZXRCcmVha3BvaW50VG9TZXR0aW5ncyhpbiBET01TdHJpbmcgdXJs LCBpbiB1bnNpZ25lZCBsb25nIGxpbmVOdW1iZXIsIGluIGJvb2xlYW4gZW5hYmxlZCwgaW4gRE9N U3RyaW5nIGNvbmRpdGlvbik7CisgICAgICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0 aW5ncyhpbiBET01TdHJpbmcgdXJsLCBpbiB1bnNpZ25lZCBsb25nIGxpbmVOdW1iZXIpOwogICAg ICAgICB2b2lkIGFjdGl2YXRlQnJlYWtwb2ludHMoKTsKICAgICAgICAgdm9pZCBkZWFjdGl2YXRl QnJlYWtwb2ludHMoKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAppbmRleCAyMjU2MDQxLi43YmZhZDUyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcApAQCAtMTc0MSw1MCArMTc0MSwyMiBAQCBQYXNzUmVmUHRyPFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZT4gSW5zcGVjdG9yQ29udHJvbGxlcjo6Y3VycmVudENhbGxGcmFtZXMoKQog ICAgIHJldHVybiBpbmplY3RlZFNjcmlwdC5jYWxsRnJhbWVzKCk7CiB9CiAKLXZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6c2V0QnJlYWtwb2ludChsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBz b3VyY2VJRCwgdW5zaWduZWQgbGluZU51bWJlciwgYm9vbCBlbmFibGVkLCBjb25zdCBTdHJpbmcm IGNvbmRpdGlvbikKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0QnJlYWtwb2ludFRvU2V0 dGluZ3MoY29uc3QgU3RyaW5nJiB1cmwsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGJvb2wgZW5hYmxl ZCwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24pCiB7Ci0gICAgU2NyaXB0QnJlYWtwb2ludCBicmVh a3BvaW50KGVuYWJsZWQsIGNvbmRpdGlvbik7Ci0gICAgdW5zaWduZWQgYWN0dWFsTGluZU51bWJl ciA9IDA7Ci0gICAgYm9vbCBzdWNjZXNzID0gU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLnNl dEJyZWFrcG9pbnQoc291cmNlSUQsIGJyZWFrcG9pbnQsIGxpbmVOdW1iZXIsICZhY3R1YWxMaW5l TnVtYmVyKTsKLSAgICBtX2Zyb250ZW5kLT5kaWRTZXRCcmVha3BvaW50KGNhbGxJZCwgc3VjY2Vz cywgYWN0dWFsTGluZU51bWJlcik7Ci0gICAgaWYgKCFzdWNjZXNzKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBTdHJpbmcgdXJsID0gbV9zb3VyY2VJRFRvVVJMLmdldChzb3VyY2VJRCk7Ci0gICAg aWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIFN0cmluZyBicmVha3Bv aW50SWQgPSBmb3JtYXRCcmVha3BvaW50SWQoc291cmNlSUQsIGFjdHVhbExpbmVOdW1iZXIpOwot ICAgIG1fYnJlYWtwb2ludHNNYXBwaW5nLnNldChicmVha3BvaW50SWQsIGFjdHVhbExpbmVOdW1i ZXIpOwotCiAgICAgU3RyaW5nIGtleSA9IG1kNUJhc2UxNih1cmwpOwogICAgIEhhc2hNYXA8U3Ry aW5nLCBTb3VyY2VCcmVha3BvaW50cz46Oml0ZXJhdG9yIGl0ID0gbV9zdGlja3lCcmVha3BvaW50 cy5maW5kKGtleSk7CiAgICAgaWYgKGl0ID09IG1fc3RpY2t5QnJlYWtwb2ludHMuZW5kKCkpCiAg ICAgICAgIGl0ID0gbV9zdGlja3lCcmVha3BvaW50cy5zZXQoa2V5LCBTb3VyY2VCcmVha3BvaW50 cygpKS5maXJzdDsKLSAgICBpdC0+c2Vjb25kLnNldChhY3R1YWxMaW5lTnVtYmVyLCBicmVha3Bv aW50KTsKKyAgICBpdC0+c2Vjb25kLnNldChsaW5lTnVtYmVyLCBTY3JpcHRCcmVha3BvaW50KGVu YWJsZWQsIGNvbmRpdGlvbikpOwogICAgIHNhdmVCcmVha3BvaW50cygpOwogfQogCi12b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OnJlbW92ZUJyZWFrcG9pbnQoY29uc3QgU3RyaW5nJiBzb3VyY2VJ RCwgdW5zaWduZWQgbGluZU51bWJlcikKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVtb3Zl QnJlYWtwb2ludEZyb21TZXR0aW5ncyhjb25zdCBTdHJpbmcmIHVybCwgdW5zaWduZWQgbGluZU51 bWJlcikKIHsKLSAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkucmVtb3ZlQnJlYWtwb2lu dChzb3VyY2VJRCwgbGluZU51bWJlcik7Ci0KLSAgICBTdHJpbmcgdXJsID0gbV9zb3VyY2VJRFRv VVJMLmdldChzb3VyY2VJRCk7Ci0gICAgaWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVy bjsKLQotICAgIFN0cmluZyBicmVha3BvaW50SWQgPSBmb3JtYXRCcmVha3BvaW50SWQoc291cmNl SUQsIGxpbmVOdW1iZXIpOwotICAgIEhhc2hNYXA8U3RyaW5nLCB1bnNpZ25lZD46Oml0ZXJhdG9y IG1hcHBpbmdJdCA9IG1fYnJlYWtwb2ludHNNYXBwaW5nLmZpbmQoYnJlYWtwb2ludElkKTsKLSAg ICBpZiAobWFwcGluZ0l0ID09IG1fYnJlYWtwb2ludHNNYXBwaW5nLmVuZCgpKQotICAgICAgICBy ZXR1cm47Ci0gICAgdW5zaWduZWQgc3RpY2t5TGluZSA9IG1hcHBpbmdJdC0+c2Vjb25kOwotICAg IG1fYnJlYWtwb2ludHNNYXBwaW5nLnJlbW92ZShtYXBwaW5nSXQpOwotCiAgICAgSGFzaE1hcDxT dHJpbmcsIFNvdXJjZUJyZWFrcG9pbnRzPjo6aXRlcmF0b3IgaXQgPSBtX3N0aWNreUJyZWFrcG9p bnRzLmZpbmQobWQ1QmFzZTE2KHVybCkpOwogICAgIGlmIChpdCA9PSBtX3N0aWNreUJyZWFrcG9p bnRzLmVuZCgpKQogICAgICAgICByZXR1cm47Ci0KLSAgICBpdC0+c2Vjb25kLnJlbW92ZShzdGlj a3lMaW5lKTsKKyAgICBpdC0+c2Vjb25kLnJlbW92ZShsaW5lTnVtYmVyKTsKICAgICBzYXZlQnJl YWtwb2ludHMoKTsKIH0KIApAQCAtMTgwMiwyMSArMTc3NCwxOCBAQCB2b2lkIEluc3BlY3RvckNv bnRyb2xsZXI6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0 cmluZyYgdQogCiAgICAgbG9hZEJyZWFrcG9pbnRzKCk7CiAgICAgSGFzaE1hcDxTdHJpbmcsIFNv dXJjZUJyZWFrcG9pbnRzPjo6aXRlcmF0b3IgaXQgPSBtX3N0aWNreUJyZWFrcG9pbnRzLmZpbmQo bWQ1QmFzZTE2KHVybCkpOwotICAgIGlmIChpdCAhPSBtX3N0aWNreUJyZWFrcG9pbnRzLmVuZCgp KSB7Ci0gICAgICAgIGZvciAoU291cmNlQnJlYWtwb2ludHM6Oml0ZXJhdG9yIGJyZWFrcG9pbnRJ dCA9IGl0LT5zZWNvbmQuYmVnaW4oKTsgYnJlYWtwb2ludEl0ICE9IGl0LT5zZWNvbmQuZW5kKCk7 ICsrYnJlYWtwb2ludEl0KSB7Ci0gICAgICAgICAgICBpbnQgbGluZU51bWJlciA9IGJyZWFrcG9p bnRJdC0+Zmlyc3Q7Ci0gICAgICAgICAgICBpZiAoZmlyc3RMaW5lID4gbGluZU51bWJlcikKLSAg ICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGFjdHVhbExpbmVO dW1iZXIgPSAwOwotICAgICAgICAgICAgYm9vbCBzdWNjZXNzID0gU2NyaXB0RGVidWdTZXJ2ZXI6 OnNoYXJlZCgpLnNldEJyZWFrcG9pbnQoc291cmNlSUQsIGJyZWFrcG9pbnRJdC0+c2Vjb25kLCBs aW5lTnVtYmVyLCAmYWN0dWFsTGluZU51bWJlcik7Ci0gICAgICAgICAgICBpZiAoIXN1Y2Nlc3Mp Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBtX2Zyb250ZW5kLT5yZXN0 b3JlZEJyZWFrcG9pbnQoc291cmNlSUQsIHVybCwgYWN0dWFsTGluZU51bWJlciwgYnJlYWtwb2lu dEl0LT5zZWNvbmQuZW5hYmxlZCwgYnJlYWtwb2ludEl0LT5zZWNvbmQuY29uZGl0aW9uKTsKLSAg ICAgICAgICAgIFN0cmluZyBicmVha3BvaW50SWQgPSBmb3JtYXRCcmVha3BvaW50SWQoc291cmNl SUQsIGFjdHVhbExpbmVOdW1iZXIpOwotICAgICAgICAgICAgbV9icmVha3BvaW50c01hcHBpbmcu c2V0KGJyZWFrcG9pbnRJZCwgbGluZU51bWJlcik7Ci0gICAgICAgIH0KKyAgICBpZiAoaXQgPT0g bV9zdGlja3lCcmVha3BvaW50cy5lbmQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGZvciAoU291 cmNlQnJlYWtwb2ludHM6Oml0ZXJhdG9yIGJyZWFrcG9pbnRJdCA9IGl0LT5zZWNvbmQuYmVnaW4o KTsgYnJlYWtwb2ludEl0ICE9IGl0LT5zZWNvbmQuZW5kKCk7ICsrYnJlYWtwb2ludEl0KSB7Cisg ICAgICAgIGludCBsaW5lTnVtYmVyID0gYnJlYWtwb2ludEl0LT5maXJzdDsKKyAgICAgICAgaWYg KGZpcnN0TGluZSA+IGxpbmVOdW1iZXIpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg dW5zaWduZWQgYWN0dWFsTGluZU51bWJlciA9IDA7CisgICAgICAgIGJvb2wgc3VjY2VzcyA9IFNj cmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5zZXRCcmVha3BvaW50KHNvdXJjZUlELCBicmVha3Bv aW50SXQtPnNlY29uZCwgbGluZU51bWJlciwgJmFjdHVhbExpbmVOdW1iZXIpOworICAgICAgICBp ZiAoIXN1Y2Nlc3MpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgbV9mcm9udGVuZC0+ cmVzdG9yZWRCcmVha3BvaW50KHVybCwgbGluZU51bWJlciwgc291cmNlSUQsIGFjdHVhbExpbmVO dW1iZXIsIGJyZWFrcG9pbnRJdC0+c2Vjb25kLmVuYWJsZWQsIGJyZWFrcG9pbnRJdC0+c2Vjb25k LmNvbmRpdGlvbik7CiAgICAgfQotICAgIG1fc291cmNlSURUb1VSTC5zZXQoc291cmNlSUQsIHVy bCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZmFpbGVkVG9QYXJzZVNvdXJjZShj b25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgZmlyc3RMaW5lLCBpbnQg ZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCA0Yzk0ZDZkLi4wNTJlMzRkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0yODksOCArMjg5LDggQEAgcHJpdmF0ZToK ICAgICB2b2lkIGRlbGV0ZUNvb2tpZShjb25zdCBTdHJpbmcmIGNvb2tpZU5hbWUsIGNvbnN0IFN0 cmluZyYgZG9tYWluKTsKIAogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQotICAgIHZv aWQgc2V0QnJlYWtwb2ludChsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgdW5z aWduZWQgbGluZU51bWJlciwgYm9vbCBlbmFibGVkLCBjb25zdCBTdHJpbmcmIGNvbmRpdGlvbik7 Ci0gICAgdm9pZCByZW1vdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgc291cmNlSUQsIHVuc2ln bmVkIGxpbmVOdW1iZXIpOworICAgIHZvaWQgc2V0QnJlYWtwb2ludFRvU2V0dGluZ3MoY29uc3Qg U3RyaW5nJiB1cmwsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGJvb2wgZW5hYmxlZCwgY29uc3QgU3Ry aW5nJiBjb25kaXRpb24pOworICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0aW5ncyhj b25zdCBTdHJpbmcmIHVybCwgdW5zaWduZWQgbGluZU51bWJlcik7CiAKICAgICB0eXBlZGVmIEhh c2hNYXA8dW5zaWduZWQgaW50LCBSZWZQdHI8U2NyaXB0UHJvZmlsZT4gPiBQcm9maWxlc01hcDsK IApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCmluZGV4IGZlZTQ2MzAuLmVi MzdkMTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNw cAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKQEAgLTM0Mywx MyArMzQzLDE0IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnBhcnNlZFNjcmlwdFNvdXJjZShj b25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmCiAgICAgZnVuY3Rpb24uY2FsbCgp OwogfQogCi12b2lkIEluc3BlY3RvckZyb250ZW5kOjpyZXN0b3JlZEJyZWFrcG9pbnQoY29uc3Qg U3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lLCBib29sIGVuYWJs ZWQsIGNvbnN0IFN0cmluZyYgY29uZGl0aW9uKQordm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6cmVz dG9yZWRCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgb3JpZ2luVVJMLCB1bnNpZ25lZCBvcmlnaW5M aW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBi b29sIGVuYWJsZWQsIGNvbnN0IFN0cmluZyYgY29uZGl0aW9uKQogewogICAgIFNjcmlwdEZ1bmN0 aW9uQ2FsbCBmdW5jdGlvbihtX3dlYkluc3BlY3RvciwgImRpc3BhdGNoIik7CiAgICAgZnVuY3Rp b24uYXBwZW5kQXJndW1lbnQoInJlc3RvcmVkQnJlYWtwb2ludCIpOworICAgIGZ1bmN0aW9uLmFw cGVuZEFyZ3VtZW50KG9yaWdpblVSTCk7CisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQob3Jp Z2luTGluZU51bWJlcik7CiAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoc291cmNlSUQpOwot ICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KHVybCk7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJn dW1lbnQobGluZSk7CisgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQobGluZU51bWJlcik7CiAg ICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoZW5hYmxlZCk7CiAgICAgZnVuY3Rpb24uYXBwZW5k QXJndW1lbnQoY29uZGl0aW9uKTsKICAgICBmdW5jdGlvbi5jYWxsKCk7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmQuaAppbmRleCBlMDJiNjYxLi4yNTM0Y2Q4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kLmgKQEAgLTEwNCw3ICsxMDQsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIHZvaWQgZGlkU2V0QnJlYWtwb2ludChsb25nIGNhbGxJZCwgYm9vbCBz dWNjZXNzLCB1bnNpZ25lZCBsaW5lKTsKIAogICAgICAgICB2b2lkIHBhcnNlZFNjcmlwdFNvdXJj ZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5n JiBkYXRhLCBpbnQgZmlyc3RMaW5lLCBpbnQgc2NyaXB0V29ybGRUeXBlKTsKLSAgICAgICAgdm9p ZCByZXN0b3JlZEJyZWFrcG9pbnQoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5n JiB1cmwsIGludCBsaW5lLCBib29sIGVuYWJsZWQsIGNvbnN0IFN0cmluZyYgY29uZGl0aW9uKTsK KyAgICAgICAgdm9pZCByZXN0b3JlZEJyZWFrcG9pbnQoY29uc3QgU3RyaW5nJiBvcmlnaW5VUkws IHVuc2lnbmVkIG9yaWdpbkxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlSUQsIHVuc2ln bmVkIGxpbmVOdW1iZXIsIGJvb2wgZW5hYmxlZCwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24pOwog ICAgICAgICB2b2lkIGZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3Qg U3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgICAgICB2b2lkIHBhdXNlZFNjcmlwdChTZXJpYWxp emVkU2NyaXB0VmFsdWUqIGNhbGxGcmFtZXMpOwogICAgICAgICB2b2lkIHJlc3VtZWRTY3JpcHQo KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFu YWdlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5q cwppbmRleCA3MDlhOWMyLi5jMWFkNzQ5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCkBAIC0zOCw3ICszOCw2IEBAIFdlYkluc3BlY3Rv ci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9vbmVU aW1lQnJlYWtwb2ludCkKICAgICAgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVtb3ZlQnJlYWtw b2ludCh0aGlzLl9vbmVUaW1lQnJlYWtwb2ludC5zb3VyY2VJRCwgdGhpcy5fb25lVGltZUJyZWFr cG9pbnQubGluZSk7CiAgICAgICAgIHRoaXMuX29uZVRpbWVCcmVha3BvaW50ID0gYnJlYWtwb2lu dDsKLSAgICAgICAgLy8gRklYTUUoNDA2NjkpOiBvbmUgdGltZSBicmVha3BvaW50IHdpbGwgYmUg cGVyc2lzdGVkIGluIGluc3BlY3RvciBzZXR0aW5ncyBpZiBub3QgaGl0LgogICAgICAgICB0aGlz Ll9zZXRCcmVha3BvaW50T25CYWNrZW5kKGJyZWFrcG9pbnQsIHRydWUpOwogICAgIH0sCiAKQEAg LTU3LDE1ICs1NiwxOCBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGhpcy5fc2V0QnJlYWtwb2ludE9uQmFja2VuZChicmVha3BvaW50 KTsKICAgICB9LAogCi0gICAgcmVzdG9yZWRCcmVha3BvaW50OiBmdW5jdGlvbihzb3VyY2VJRCwg c291cmNlVVJMLCBsaW5lLCBlbmFibGVkLCBjb25kaXRpb24pCisgICAgcmVzdG9yZWRCcmVha3Bv aW50OiBmdW5jdGlvbihvcmlnaW5VUkwsIG9yaWdpbkxpbmVOdW1iZXIsIHNvdXJjZUlELCBhY3R1 YWxMaW5lTnVtYmVyLCBlbmFibGVkLCBjb25kaXRpb24pCiAgICAgewotICAgICAgICB0aGlzLl9z ZXRCcmVha3BvaW50KHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmUsIGVuYWJsZWQsIGNvbmRpdGlv bik7CisgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5fc2V0QnJlYWtwb2ludChzb3VyY2VJ RCwgb3JpZ2luVVJMLCBhY3R1YWxMaW5lTnVtYmVyLCBlbmFibGVkLCBjb25kaXRpb24pOworICAg ICAgICBicmVha3BvaW50Lm9yaWdpbiA9IHsgdXJsOiBvcmlnaW5VUkwsIGxpbmU6IG9yaWdpbkxp bmVOdW1iZXIgfTsKICAgICB9LAogCiAgICAgcmVtb3ZlQnJlYWtwb2ludDogZnVuY3Rpb24oYnJl YWtwb2ludCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9yZW1vdmVCcmVha3BvaW50KGJyZWFr cG9pbnQpKQogICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZW1vdmVCcmVha3BvaW50KGJy ZWFrcG9pbnQuc291cmNlSUQsIGJyZWFrcG9pbnQubGluZSk7CisgICAgICAgIGlmICgnb3JpZ2lu JyBpbiBicmVha3BvaW50KQorICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZW1vdmVCcmVh a3BvaW50RnJvbVNldHRpbmdzKGJyZWFrcG9pbnQub3JpZ2luLnVybCwgYnJlYWtwb2ludC5vcmln aW4ubGluZSk7CiAgICAgfSwKIAogICAgIGJyZWFrcG9pbnRzRm9yU291cmNlSUQ6IGZ1bmN0aW9u KHNvdXJjZUlEKQpAQCAtMTIxLDE3ICsxMjMsMjIgQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRN YW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIGRpZFNldEJyZWFr cG9pbnQoc3VjY2VzcywgbGluZSkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKHN1Y2Nlc3Mg JiYgbGluZSA9PSBicmVha3BvaW50LmxpbmUpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICAgICAgaWYgKGlzT25lVGltZSkgewotICAgICAgICAgICAgICAgIGlmIChzdWNjZXNzKQor ICAgICAgICAgICAgaWYgKHN1Y2Nlc3MpIHsKKyAgICAgICAgICAgICAgICBpZiAoaXNPbmVUaW1l KSB7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX29uZVRpbWVCcmVha3BvaW50LmxpbmUgPSBs aW5lOwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgZGVsZXRlIHRo aXMuX29uZVRpbWVCcmVha3BvaW50OworICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICAgICAgICAgIGlmIChsaW5lICE9IGJyZWFrcG9pbnQubGluZSkgeworICAgICAgICAgICAg ICAgICAgICAgICAgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50KTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGJyZWFrcG9pbnQgPSB0aGlzLl9zZXRCcmVha3BvaW50KGJyZWFrcG9p bnQuc291cmNlSUQsIGJyZWFrcG9pbnQudXJsLCBsaW5lLCBicmVha3BvaW50LmVuYWJsZWQsIGJy ZWFrcG9pbnQuY29uZGl0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgICAgICBicmVha3BvaW50Lm9yaWdpbiA9IHsgdXJsOiBicmVha3BvaW50LnVybCwgbGluZTog bGluZSB9OworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnNldEJyZWFrcG9p bnRUb1NldHRpbmdzKGJyZWFrcG9pbnQub3JpZ2luLnVybCwgYnJlYWtwb2ludC5vcmlnaW4ubGlu ZSwgYnJlYWtwb2ludC5lbmFibGVkLCBicmVha3BvaW50LmNvbmRpdGlvbik7CisgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9yZW1v dmVCcmVha3BvaW50KGJyZWFrcG9pbnQpOwotICAgICAgICAgICAgICAgIGlmIChzdWNjZXNzKQot ICAgICAgICAgICAgICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50KGJyZWFrcG9pbnQuc291cmNl SUQsIGJyZWFrcG9pbnQuc291cmNlVVJMLCBsaW5lLCBicmVha3BvaW50LmVuYWJsZWQsIGJyZWFr cG9pbnQuY29uZGl0aW9uKTsKKyAgICAgICAgICAgICAgICBpZiAoaXNPbmVUaW1lKQorICAgICAg ICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fb25lVGltZUJyZWFrcG9pbnQ7CisgICAgICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50KGJy ZWFrcG9pbnQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHZhciBjYWxsYmFj a0lkID0gV2ViSW5zcGVjdG9yLkNhbGxiYWNrLndyYXAoZGlkU2V0QnJlYWtwb2ludC5iaW5kKHRo aXMpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JC YWNrZW5kU3R1Yi5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JCYWNr ZW5kU3R1Yi5qcwppbmRleCA3NjFlODc2Li41NjUwODMyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yQmFja2VuZFN0dWIuanMKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmRTdHViLmpzCkBAIC0xNzAsNyArMTcw LDE1IEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUgPSB7CiAg ICAgICAgIFdlYkluc3BlY3Rvci5kaWRTZXRCcmVha3BvaW50KGNhbGxJZCwgdHJ1ZSwgbGluZSk7 CiAgICAgfSwKIAotICAgIHJlbW92ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHNvdXJjZUlELCBsaW5l KQorICAgIHJlbW92ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgfSwKKworICAg IHNldEJyZWFrcG9pbnRUb1NldHRpbmdzOiBmdW5jdGlvbigpCisgICAgeworICAgIH0sCisKKyAg ICByZW1vdmVCcmVha3BvaW50RnJvbVNldHRpbmdzOiBmdW5jdGlvbigpCiAgICAgewogICAgIH0s CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDNiYjQxODAu LmI5N2YzMDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAt MTM0Miw5ICsxMzQyLDkgQEAgV2ViSW5zcGVjdG9yLnBhcnNlZFNjcmlwdFNvdXJjZSA9IGZ1bmN0 aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmcKICAgICB0aGlzLnBhbmVs cy5zY3JpcHRzLmFkZFNjcmlwdChzb3VyY2VJRCwgc291cmNlVVJMLCBzb3VyY2UsIHN0YXJ0aW5n TGluZSwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHNjcmlwdFdvcmxkVHlwZSk7CiB9CiAKLVdlYklu c3BlY3Rvci5yZXN0b3JlZEJyZWFrcG9pbnQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJM LCBsaW5lLCBlbmFibGVkLCBjb25kaXRpb24pCitXZWJJbnNwZWN0b3IucmVzdG9yZWRCcmVha3Bv aW50ID0gZnVuY3Rpb24ob3JpZ2luVVJMLCBvcmlnaW5MaW5lTnVtYmVyLCBzb3VyY2VJRCwgYWN0 dWFsTGluZU51bWJlciwgZW5hYmxlZCwgY29uZGl0aW9uKQogewotICAgIHRoaXMuYnJlYWtwb2lu dE1hbmFnZXIucmVzdG9yZWRCcmVha3BvaW50KHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmUsIGVu YWJsZWQsIGNvbmRpdGlvbik7CisgICAgdGhpcy5icmVha3BvaW50TWFuYWdlci5yZXN0b3JlZEJy ZWFrcG9pbnQob3JpZ2luVVJMLCBvcmlnaW5MaW5lTnVtYmVyLCBzb3VyY2VJRCwgYWN0dWFsTGlu ZU51bWJlciwgZW5hYmxlZCwgY29uZGl0aW9uKTsKIH0KIAogV2ViSW5zcGVjdG9yLmZhaWxlZFRv UGFyc2VTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbihzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmdM aW5lLCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGI1ZTZlNTUuLmEz NTQ2ZDkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEwLTA2LTI5ICBQYXZlbCBQ b2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIG5vdCBwZXJzaXN0IG9uZSB0aW1lIGJyZWFr cG9pbnRzIGluIGluc3BlY3RvciBzZXR0aW5ncy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNjY5CisKKworICAgICAgICAqIHNyYy9qcy9JbnNwZWN0 b3JDb250cm9sbGVySW1wbC5qczoKKyAgICAgICAgKGRldnRvb2xzLkluc3BlY3RvckJhY2tlbmRJ bXBsKToKKworMjAxMC0wNi0yOSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVt Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IHJldHVybiBsaW5lIG51bWJlciB3aGVyZSBicmVha3BvaW50IHdhcyBh Y3R1YWxseSBzZXQgYnkgdjggZnJvbSBzZXRCcmVha3BvaW50IGZ1bmN0aW9uLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9JbnNwZWN0b3JDb250cm9sbGVySW1wbC5qcyBiL1dl YktpdC9jaHJvbWl1bS9zcmMvanMvSW5zcGVjdG9yQ29udHJvbGxlckltcGwuanMKaW5kZXggY2Jl NjA3ZC4uMzhiYWVhMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9JbnNwZWN0 b3JDb250cm9sbGVySW1wbC5qcworKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0luc3BlY3Rv ckNvbnRyb2xsZXJJbXBsLmpzCkBAIC0xMDksNiArMTA5LDggQEAgZGV2dG9vbHMuSW5zcGVjdG9y QmFja2VuZEltcGwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5pbnN0YWxsSW5zcGVjdG9yQ29udHJv bGxlckRlbGVnYXRlXygiZW5hYmxlRGVidWdnZXIiKTsKICAgICB0aGlzLmluc3RhbGxJbnNwZWN0 b3JDb250cm9sbGVyRGVsZWdhdGVfKCJzZXRCcmVha3BvaW50Iik7CiAgICAgdGhpcy5pbnN0YWxs SW5zcGVjdG9yQ29udHJvbGxlckRlbGVnYXRlXygicmVtb3ZlQnJlYWtwb2ludCIpOworICAgIHRo aXMuaW5zdGFsbEluc3BlY3RvckNvbnRyb2xsZXJEZWxlZ2F0ZV8oInNldEJyZWFrcG9pbnRUb1Nl dHRpbmdzIik7CisgICAgdGhpcy5pbnN0YWxsSW5zcGVjdG9yQ29udHJvbGxlckRlbGVnYXRlXygi cmVtb3ZlQnJlYWtwb2ludEZyb21TZXR0aW5ncyIpOwogICAgIHRoaXMuaW5zdGFsbEluc3BlY3Rv ckNvbnRyb2xsZXJEZWxlZ2F0ZV8oImFjdGl2YXRlQnJlYWtwb2ludHMiKTsKICAgICB0aGlzLmlu c3RhbGxJbnNwZWN0b3JDb250cm9sbGVyRGVsZWdhdGVfKCJkZWFjdGl2YXRlQnJlYWtwb2ludHMi KTsKICAgICB0aGlzLmluc3RhbGxJbnNwZWN0b3JDb250cm9sbGVyRGVsZWdhdGVfKCJyZXN1bWVE ZWJ1Z2dlciIpOwo=