130406 2014-03-18 10:44:29 -0700 Fix cue rendering test and include support for left/right alignment. 2014-03-19 12:00:55 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED https://codereview.chromium.org/25155003 P2 Normal --- 1 bfulgham bfulgham calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio oldest_to_newest 991733 0 bfulgham 2014-03-18 10:44:29 -0700 Merge Blink change https://codereview.chromium.org/25155003. 992190 1 227204 bfulgham 2014-03-19 11:29:36 -0700 Created attachment 227204 Patch 992191 2 227204 eric.carlson 2014-03-19 11:34:30 -0700 Comment on attachment 227204 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227204&action=review > Source/WebCore/html/track/VTTCue.cpp:618 > + } else { > + ASSERT_NOT_REACHED(); > } Nit: I don't think the braces are necessary. 992192 3 bfulgham 2014-03-19 11:37:12 -0700 (In reply to comment #2) > (From update of attachment 227204 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227204&action=review > > > Source/WebCore/html/track/VTTCue.cpp:618 > > + } else { > > + ASSERT_NOT_REACHED(); > > } > > Nit: I don't think the braces are necessary. OK. I'll remove! 992197 4 bfulgham 2014-03-19 12:00:55 -0700 Committed r165905: <http://trac.webkit.org/changeset/165905> 227204 2014-03-19 11:29:36 -0700 2014-03-19 11:34:30 -0700 Patch bug-130406-20140319112914.patch text/plain 23482 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTkwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTAzLTE5ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBjdWUgcmVuZGVyaW5n IHRlc3QgYW5kIGluY2x1ZGUgc3VwcG9ydCBmb3IgbGVmdC9yaWdodCBhbGlnbm1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDQwNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlZCBmcm9tIEJs aW5rIChwYXRjaCBieSB2Y2FyYnVuZUBjaHJvbWl1bS5vcmcpOgorICAgICAgICBodHRwczovL2No cm9taXVtLmdvb2dsZXNvdXJjZS5jb20vY2hyb21pdW0vYmxpbmsvKy9lNjk1NzAzY2I2MDM0MjFj NzQxZTU5YTU1N2E3OTg5MTEzYzEzYjk0CisgICAgICAgIGh0dHA6Ly9jcmJ1Zy5jb20vMjUxNTUw MDMKKworICAgICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgbWVkaWEvdHJhY2svdHJhY2st Y3VlLXJlbmRlcmluZy1zbmFwLXRvLWxpbmVzLW5vdC1zZXQuaHRtbC4KKworICAgICAgICAqIGh0 bWwvdHJhY2svVlRUQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxlZnRLZXl3b3JkKTogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpyaWdodEtleXdvcmQpOiBBZGRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlZUVEN1ZUJveDo6YXBwbHlDU1NQcm9wZXJ0aWVzKTogQWRkZWQuCisgICAgICAgIChX ZWJDb3JlOjpWVFRDdWU6OlZUVEN1ZSk6CisgICAgICAgIChXZWJDb3JlOjpWVFRDdWU6OmFsaWdu KTogSGFuZGxlIGxlZnQvcmlnaHQgYWxpZ25tZW50LgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3Vl OjpzZXRBbGlnbik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlOjpjYWxjdWxhdGVE aXNwbGF5UGFyYW1ldGVycyk6IFJlZmFjdG9yZWQgYW5kIHJldmlzZWQgZm9yIGxlZnQvcmlnaHQg dG9rZW5zLgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlOjpzZXRDdWVTZXR0aW5ncyk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlOjpnZXRDU1NBbGlnbm1lbnQpOiBBZGRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OlZUVEN1ZTo6Z2V0Q1NTV3JpdGluZ01vZGUpOiBBZGRlZC4KKyAgICAg ICAgKiBodG1sL3RyYWNrL1ZUVEN1ZS5oOgorCiAyMDE0LTAzLTE4ICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIG5ldyBmdW5jdGlvbmFsaXR5IHRo YXQgd2lsbCBiZSByZXF1aXJlZCBieSB0aGUgaGlzdG9yeSBpdGVtIGRlY29kaW5nCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC90cmFjay9WVFRDdWUuY3BwCShyZXZpc2lvbiAxNjU4OTgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNiAr MSw2IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEyLCAyMDEzIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMyBHb29nbGUg SW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE0IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucyBhcmUKQEAgLTU5LDYgKzU5LDE2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGlj IGNvbnN0IGludCB1bmRlZmluZWRQb3NpdGlvbiA9IC0xOwogCitzdGF0aWMgY29uc3QgQ1NTVmFs dWVJRCBkaXNwbGF5V3JpdGluZ01vZGVNYXBbXSA9IHsKKyAgICBDU1NWYWx1ZUhvcml6b250YWxU YiwgQ1NTVmFsdWVWZXJ0aWNhbFJsLCBDU1NWYWx1ZVZlcnRpY2FsTHIKK307CitDT01QSUxFX0FT U0VSVChXVEZfQVJSQVlfTEVOR1RIKGRpc3BsYXlXcml0aW5nTW9kZU1hcCkgPT0gVlRUQ3VlOjpO dW1iZXJPZldyaXRpbmdEaXJlY3Rpb25zLCBkaXNwbGF5V3JpdGluZ01vZGVNYXBfaGFzX3dyb25n X3NpemUpOworCitzdGF0aWMgY29uc3QgQ1NTVmFsdWVJRCBkaXNwbGF5QWxpZ25tZW50TWFwW10g PSB7CisgICAgQ1NTVmFsdWVTdGFydCwgQ1NTVmFsdWVDZW50ZXIsIENTU1ZhbHVlRW5kLCBDU1NW YWx1ZUxlZnQsIENTU1ZhbHVlUmlnaHQKK307CitDT01QSUxFX0FTU0VSVChXVEZfQVJSQVlfTEVO R1RIKGRpc3BsYXlBbGlnbm1lbnRNYXApID09IFZUVEN1ZTo6TnVtYmVyT2ZBbGlnbm1lbnRzLCBk aXNwbGF5QWxpZ25tZW50TWFwX2hhc193cm9uZ19zaXplKTsKKwogc3RhdGljIGNvbnN0IFN0cmlu ZyYgc3RhcnRLZXl3b3JkKCkKIHsKICAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo Y29uc3QgU3RyaW5nLCBzdGFydCwgKEFTQ0lJTGl0ZXJhbCgic3RhcnQiKSkpOwpAQCAtNzcsNiAr ODcsMTggQEAgc3RhdGljIGNvbnN0IFN0cmluZyYgZW5kS2V5d29yZCgpCiAgICAgcmV0dXJuIGVu ZDsKIH0KIAorc3RhdGljIGNvbnN0IFN0cmluZyYgbGVmdEtleXdvcmQoKQoreworICAgIERFUFJF Q0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIGxlZnQsICgibGVmdCIpKTsK KyAgICByZXR1cm4gbGVmdDsKK30KKworc3RhdGljIGNvbnN0IFN0cmluZyYgcmlnaHRLZXl3b3Jk KCkKK3sKKyAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBy aWdodCwgKCJyaWdodCIpKTsKKyAgICByZXR1cm4gcmlnaHQ7Cit9CisKIHN0YXRpYyBjb25zdCBT dHJpbmcmIGhvcml6b250YWxLZXl3b3JkKCkKIHsKICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsK QEAgLTE1MywxMiArMTc1LDcgQEAgdm9pZCBWVFRDdWVCb3g6OmFwcGx5Q1NTUHJvcGVydGllcyhj b25zdAogICAgIC8vIGJlIHNldCB0byB0aGUgdmFsdWUgaW4gdGhlIHNlY29uZCBjZWxsIG9mIHRo ZSByb3cgb2YgdGhlIHRhYmxlIGJlbG93CiAgICAgLy8gd2hvc2UgZmlyc3QgY2VsbCBpcyB0aGUg dmFsdWUgb2YgdGhlIGNvcnJlc3BvbmRpbmcgY3VlJ3MgdGV4dCB0cmFjayBjdWUKICAgICAvLyBh bGlnbm1lbnQ6Ci0gICAgaWYgKG1fY3VlLT5hbGlnbigpID09IHN0YXJ0S2V5d29yZCgpKQotICAg ICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VGV4dEFsaWduLCBDU1NWYWx1 ZVN0YXJ0KTsKLSAgICBlbHNlIGlmIChtX2N1ZS0+YWxpZ24oKSA9PSBlbmRLZXl3b3JkKCkpCi0g ICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlUZXh0QWxpZ24sIENTU1Zh bHVlRW5kKTsKLSAgICBlbHNlCi0gICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlUZXh0QWxpZ24sIENTU1ZhbHVlQ2VudGVyKTsKKyAgICBzZXRJbmxpbmVTdHlsZVByb3Bl cnR5KENTU1Byb3BlcnR5VGV4dEFsaWduLCBtX2N1ZS0+Z2V0Q1NTQWxpZ25tZW50KCkpOwogCiAg ICAgaWYgKCFtX2N1ZS0+c25hcFRvTGluZXMoKSkgewogICAgICAgICAvLyAxMC4xMy4xIFNldCB1 cCB4IGFuZCB5OgpAQCAtMjA1LDE4ICsyMjIsOSBAQCBWVFRDdWU6OlZUVEN1ZShTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjCiAgICAgLCBtX2N1ZUJhY2tncm91bmRCb3goSFRNTFNwYW5FbGVtZW50 OjpjcmVhdGUoc3BhblRhZywgdG9Eb2N1bWVudChjb250ZXh0KSkpCiAgICAgLCBtX2Rpc3BsYXlU cmVlU2hvdWxkQ2hhbmdlKHRydWUpCiAgICAgLCBtX2Rpc3BsYXlEaXJlY3Rpb24oQ1NTVmFsdWVM dHIpCi0gICAgLCBtX2Rpc3BsYXlXcml0aW5nTW9kZShDU1NWYWx1ZUluaGVyaXQpCiAgICAgLCBt X2Rpc3BsYXlTaXplKDApCiAgICAgLCBtX25vdGlmeVJlZ2lvbih0cnVlKQogewotICAgIC8vIDQu IElmIHRoZSB0ZXh0IHRyYWNrIGN1ZSB3cml0aW5nIGRpcmVjdGlvbiBpcyBob3Jpem9udGFsLCB0 aGVuIGxldAotICAgIC8vIHdyaXRpbmctbW9kZSBiZSAnaG9yaXpvbnRhbC10YicuIE90aGVyd2lz ZSwgaWYgdGhlIHRleHQgdHJhY2sgY3VlIHdyaXRpbmcKLSAgICAvLyBkaXJlY3Rpb24gaXMgdmVy dGljYWwgZ3Jvd2luZyBsZWZ0LCB0aGVuIGxldCB3cml0aW5nLW1vZGUgYmUKLSAgICAvLyAndmVy dGljYWwtcmwnLiBPdGhlcndpc2UsIHRoZSB0ZXh0IHRyYWNrIGN1ZSB3cml0aW5nIGRpcmVjdGlv biBpcwotICAgIC8vIHZlcnRpY2FsIGdyb3dpbmcgcmlnaHQ7IGxldCB3cml0aW5nLW1vZGUgYmUg J3ZlcnRpY2FsLWxyJy4KLSAgICBtX2Rpc3BsYXlXcml0aW5nTW9kZU1hcFtIb3Jpem9udGFsXSA9 IENTU1ZhbHVlSG9yaXpvbnRhbFRiOwotICAgIG1fZGlzcGxheVdyaXRpbmdNb2RlTWFwW1ZlcnRp Y2FsR3Jvd2luZ0xlZnRdID0gQ1NTVmFsdWVWZXJ0aWNhbFJsOwotICAgIG1fZGlzcGxheVdyaXRp bmdNb2RlTWFwW1ZlcnRpY2FsR3Jvd2luZ1JpZ2h0XSA9IENTU1ZhbHVlVmVydGljYWxMcjsKIH0K IAogVlRUQ3VlOjp+VlRUQ3VlKCkKQEAgLTM2Myw2ICszNzEsMTAgQEAgY29uc3QgU3RyaW5nJiBW VFRDdWU6OmFsaWduKCkgY29uc3QKICAgICAgICAgcmV0dXJuIG1pZGRsZUtleXdvcmQoKTsKICAg ICBjYXNlIEVuZDoKICAgICAgICAgcmV0dXJuIGVuZEtleXdvcmQoKTsKKyAgICBjYXNlIExlZnQ6 CisgICAgICAgIHJldHVybiBsZWZ0S2V5d29yZCgpOworICAgIGNhc2UgUmlnaHQ6CisgICAgICAg IHJldHVybiByaWdodEtleXdvcmQoKTsKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CkBAIC0zODQsNiArMzk2 LDEwIEBAIHZvaWQgVlRUQ3VlOjpzZXRBbGlnbihjb25zdCBTdHJpbmcmIHZhbHUKICAgICAgICAg YWxpZ25tZW50ID0gTWlkZGxlOwogICAgIGVsc2UgaWYgKHZhbHVlID09IGVuZEtleXdvcmQoKSkK ICAgICAgICAgYWxpZ25tZW50ID0gRW5kOworICAgIGVsc2UgaWYgKHZhbHVlID09IGxlZnRLZXl3 b3JkKCkpCisgICAgICAgIGFsaWdubWVudCA9IExlZnQ7CisgICAgZWxzZSBpZiAodmFsdWUgPT0g cmlnaHRLZXl3b3JkKCkpCisgICAgICAgIGFsaWdubWVudCA9IFJpZ2h0OwogICAgIGVsc2UKICAg ICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgIApAQCAtNTc2LDY0ICs1OTIsODAgQEAgdm9pZCBW VFRDdWU6OmNhbGN1bGF0ZURpc3BsYXlQYXJhbWV0ZXJzKAogICAgIC8vIHZlcnRpY2FsIGdyb3dp bmcgbGVmdCwgdGhlbiBsZXQgYmxvY2stZmxvdyBiZSAnbHInLiBPdGhlcndpc2UsIHRoZSB0ZXh0 CiAgICAgLy8gdHJhY2sgY3VlIHdyaXRpbmcgZGlyZWN0aW9uIGlzIHZlcnRpY2FsIGdyb3dpbmcg cmlnaHQ7IGxldCBibG9jay1mbG93IGJlCiAgICAgLy8gJ3JsJy4KLSAgICBtX2Rpc3BsYXlXcml0 aW5nTW9kZSA9IG1fZGlzcGxheVdyaXRpbmdNb2RlTWFwW21fd3JpdGluZ0RpcmVjdGlvbl07CisK KyAgICAvLyBUaGUgYWJvdmUgc3RlcCBpcyBkb25lIHRocm91Z2ggdGhlIHdyaXRpbmcgZGlyZWN0 aW9uIHN0YXRpYyBtYXAuCiAKICAgICAvLyAxMC41IERldGVybWluZSB0aGUgdmFsdWUgb2YgbWF4 aW11bSBzaXplIGZvciBjdWUgYXMgcGVyIHRoZSBhcHByb3ByaWF0ZQogICAgIC8vIHJ1bGVzIGZy b20gdGhlIGZvbGxvd2luZyBsaXN0OgogICAgIGludCBtYXhpbXVtU2l6ZSA9IG1fdGV4dFBvc2l0 aW9uOwogICAgIGlmICgobV93cml0aW5nRGlyZWN0aW9uID09IEhvcml6b250YWwgJiYgbV9jdWVB bGlnbm1lbnQgPT0gU3RhcnQgJiYgbV9kaXNwbGF5RGlyZWN0aW9uID09IENTU1ZhbHVlTHRyKQog ICAgICAgICB8fCAobV93cml0aW5nRGlyZWN0aW9uID09IEhvcml6b250YWwgJiYgbV9jdWVBbGln bm1lbnQgPT0gRW5kICYmIG1fZGlzcGxheURpcmVjdGlvbiA9PSBDU1NWYWx1ZVJ0bCkKLSAgICAg ICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdyb3dpbmdMZWZ0ICYmIG1fY3Vl QWxpZ25tZW50ID09IFN0YXJ0KQotICAgICAgICB8fCAobV93cml0aW5nRGlyZWN0aW9uID09IFZl cnRpY2FsR3Jvd2luZ1JpZ2h0ICYmIG1fY3VlQWxpZ25tZW50ID09IFN0YXJ0KSkgeworICAgICAg ICB8fCAobV93cml0aW5nRGlyZWN0aW9uID09IEhvcml6b250YWwgJiYgbV9jdWVBbGlnbm1lbnQg PT0gTGVmdCkKKyAgICAgICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdyb3dp bmdMZWZ0ICYmIChtX2N1ZUFsaWdubWVudCA9PSBTdGFydCB8fCBtX2N1ZUFsaWdubWVudCA9PSBM ZWZ0KSkKKyAgICAgICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdyb3dpbmdS aWdodCAmJiAobV9jdWVBbGlnbm1lbnQgPT0gU3RhcnQgfHwgbV9jdWVBbGlnbm1lbnQgPT0gTGVm dCkpKSB7CiAgICAgICAgIG1heGltdW1TaXplID0gMTAwIC0gbV90ZXh0UG9zaXRpb247CiAgICAg fSBlbHNlIGlmICgobV93cml0aW5nRGlyZWN0aW9uID09IEhvcml6b250YWwgJiYgbV9jdWVBbGln bm1lbnQgPT0gRW5kICYmIG1fZGlzcGxheURpcmVjdGlvbiA9PSBDU1NWYWx1ZUx0cikKICAgICAg ICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBIb3Jpem9udGFsICYmIG1fY3VlQWxpZ25tZW50 ID09IFN0YXJ0ICYmIG1fZGlzcGxheURpcmVjdGlvbiA9PSBDU1NWYWx1ZVJ0bCkKLSAgICAgICAg fHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdyb3dpbmdMZWZ0ICYmIG1fY3VlQWxp Z25tZW50ID09IEVuZCkKLSAgICAgICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNh bEdyb3dpbmdSaWdodCAmJiBtX2N1ZUFsaWdubWVudCA9PSBFbmQpKSB7CisgICAgICAgIHx8ICht X3dyaXRpbmdEaXJlY3Rpb24gPT0gSG9yaXpvbnRhbCAmJiBtX2N1ZUFsaWdubWVudCA9PSBSaWdo dCkKKyAgICAgICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdyb3dpbmdMZWZ0 ICYmIChtX2N1ZUFsaWdubWVudCA9PSBFbmQgfHwgbV9jdWVBbGlnbm1lbnQgPT0gUmlnaHQpKQor ICAgICAgICB8fCAobV93cml0aW5nRGlyZWN0aW9uID09IFZlcnRpY2FsR3Jvd2luZ1JpZ2h0ICYm IChtX2N1ZUFsaWdubWVudCA9PSBFbmQgfHwgbV9jdWVBbGlnbm1lbnQgPT0gUmlnaHQpKSkgewog ICAgICAgICBtYXhpbXVtU2l6ZSA9IG1fdGV4dFBvc2l0aW9uOwogICAgIH0gZWxzZSBpZiAobV9j dWVBbGlnbm1lbnQgPT0gTWlkZGxlKSB7CiAgICAgICAgIG1heGltdW1TaXplID0gbV90ZXh0UG9z aXRpb24gPD0gNTAgPyBtX3RleHRQb3NpdGlvbiA6ICgxMDAgLSBtX3RleHRQb3NpdGlvbik7CiAg ICAgICAgIG1heGltdW1TaXplID0gbWF4aW11bVNpemUgKiAyOworICAgIH0gZWxzZSB7CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAogICAgIC8vIDEwLjYgSWYgdGhlIHRl eHQgdHJhY2sgY3VlIHNpemUgaXMgbGVzcyB0aGFuIG1heGltdW0gc2l6ZSwgdGhlbiBsZXQgc2l6 ZQogICAgIC8vIGJlIHRleHQgdHJhY2sgY3VlIHNpemUuIE90aGVyd2lzZSwgbGV0IHNpemUgYmUg bWF4aW11bSBzaXplLgogICAgIG1fZGlzcGxheVNpemUgPSBzdGQ6Om1pbihtX2N1ZVNpemUsIG1h eGltdW1TaXplKTsKIAorICAgIC8vIEZJWE1FOiBVbmRlcnN0YW5kIHdoeSBzdGVwIDEwLjcgaXMg bWlzc2luZyAoanVzdCBhIGNvcHkvcGFzdGUgZXJyb3I/KQorICAgIC8vIENvdWxkIGJlIGRvbmUg d2l0aGluIGEgc3BlYyBpbXBsZW1lbnRhdGlvbiBjaGVjayAtIGh0dHA6Ly9jcmJ1Zy5jb20vMzAx NTgwCisKICAgICAvLyAxMC44IERldGVybWluZSB0aGUgdmFsdWUgb2YgeC1wb3NpdGlvbiBvciB5 LXBvc2l0aW9uIGZvciBjdWUgYXMgcGVyIHRoZQogICAgIC8vIGFwcHJvcHJpYXRlIHJ1bGVzIGZy b20gdGhlIGZvbGxvd2luZyBsaXN0OgogICAgIGlmIChtX3dyaXRpbmdEaXJlY3Rpb24gPT0gSG9y aXpvbnRhbCkgewotICAgICAgICBpZiAobV9jdWVBbGlnbm1lbnQgPT0gU3RhcnQpIHsKKyAgICAg ICAgc3dpdGNoIChtX2N1ZUFsaWdubWVudCkgeworICAgICAgICBjYXNlIFN0YXJ0OgogICAgICAg ICAgICAgaWYgKG1fZGlzcGxheURpcmVjdGlvbiA9PSBDU1NWYWx1ZUx0cikKICAgICAgICAgICAg ICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5maXJzdCA9IG1fdGV4dFBvc2l0aW9uOwogICAgICAgICAg ICAgZWxzZQogICAgICAgICAgICAgICAgIG1fZGlzcGxheVBvc2l0aW9uLmZpcnN0ID0gMTAwIC0g bV90ZXh0UG9zaXRpb24gLSBtX2Rpc3BsYXlTaXplOwotICAgICAgICB9IGVsc2UgaWYgKG1fY3Vl QWxpZ25tZW50ID09IEVuZCkgeworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRW5k OgogICAgICAgICAgICAgaWYgKG1fZGlzcGxheURpcmVjdGlvbiA9PSBDU1NWYWx1ZVJ0bCkKICAg ICAgICAgICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5maXJzdCA9IDEwMCAtIG1fdGV4dFBvc2l0 aW9uOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIG1fZGlzcGxheVBvc2l0aW9u LmZpcnN0ID0gbV90ZXh0UG9zaXRpb24gLSBtX2Rpc3BsYXlTaXplOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGNhc2UgTGVmdDoKKyAgICAgICAgICAgIGlmIChtX2Rpc3BsYXlEaXJlY3Rp b24gPT0gQ1NTVmFsdWVMdHIpCisgICAgICAgICAgICAgICAgbV9kaXNwbGF5UG9zaXRpb24uZmly c3QgPSBtX3RleHRQb3NpdGlvbjsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBt X2Rpc3BsYXlQb3NpdGlvbi5maXJzdCA9IDEwMCAtIG1fdGV4dFBvc2l0aW9uOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmlnaHQ6CisgICAgICAgICAgICBpZiAobV9kaXNwbGF5 RGlyZWN0aW9uID09IENTU1ZhbHVlTHRyKQorICAgICAgICAgICAgICAgIG1fZGlzcGxheVBvc2l0 aW9uLmZpcnN0ID0gbV90ZXh0UG9zaXRpb24gLSBtX2Rpc3BsYXlTaXplOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIG1fZGlzcGxheVBvc2l0aW9uLmZpcnN0ID0gMTAwIC0gbV90 ZXh0UG9zaXRpb24gLSBtX2Rpc3BsYXlTaXplOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg IGNhc2UgTWlkZGxlOgorICAgICAgICAgICAgaWYgKG1fZGlzcGxheURpcmVjdGlvbiA9PSBDU1NW YWx1ZUx0cikKKyAgICAgICAgICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5maXJzdCA9IG1fdGV4 dFBvc2l0aW9uIC0gbV9kaXNwbGF5U2l6ZSAvIDI7CisgICAgICAgICAgICBlbHNlCisgICAgICAg ICAgICAgICAgbV9kaXNwbGF5UG9zaXRpb24uZmlyc3QgPSAxMDAgLSBtX3RleHRQb3NpdGlvbiAt IG1fZGlzcGxheVNpemUgLyAyOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgTnVt YmVyT2ZBbGlnbm1lbnRzOgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIH0KICAgICB9CiAKLSAgICBpZiAoKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdy b3dpbmdMZWZ0ICYmIG1fY3VlQWxpZ25tZW50ID09IFN0YXJ0KQotICAgICAgICB8fCAobV93cml0 aW5nRGlyZWN0aW9uID09IFZlcnRpY2FsR3Jvd2luZ1JpZ2h0ICYmIG1fY3VlQWxpZ25tZW50ID09 IFN0YXJ0KSkgewotICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5zZWNvbmQgPSBtX3RleHRQb3Np dGlvbjsKLSAgICB9IGVsc2UgaWYgKChtX3dyaXRpbmdEaXJlY3Rpb24gPT0gVmVydGljYWxHcm93 aW5nTGVmdCAmJiBtX2N1ZUFsaWdubWVudCA9PSBFbmQpCi0gICAgICAgIHx8IChtX3dyaXRpbmdE aXJlY3Rpb24gPT0gVmVydGljYWxHcm93aW5nUmlnaHQgJiYgbV9jdWVBbGlnbm1lbnQgPT0gRW5k KSkgewotICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5zZWNvbmQgPSAxMDAgLSBtX3RleHRQb3Np dGlvbjsKLSAgICB9Ci0KLSAgICBpZiAobV93cml0aW5nRGlyZWN0aW9uID09IEhvcml6b250YWwg JiYgbV9jdWVBbGlnbm1lbnQgPT0gTWlkZGxlKSB7Ci0gICAgICAgIGlmIChtX2Rpc3BsYXlEaXJl Y3Rpb24gPT0gQ1NTVmFsdWVMdHIpCi0gICAgICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5maXJz dCA9IG1fdGV4dFBvc2l0aW9uIC0gbV9kaXNwbGF5U2l6ZSAvIDI7Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgICAgIG1fZGlzcGxheVBvc2l0aW9uLmZpcnN0ID0gMTAwIC0gbV90ZXh0UG9zaXRpb24g LSBtX2Rpc3BsYXlTaXplIC8gMjsKLSAgICB9Ci0KLSAgICBpZiAoKG1fd3JpdGluZ0RpcmVjdGlv biA9PSBWZXJ0aWNhbEdyb3dpbmdMZWZ0ICYmIG1fY3VlQWxpZ25tZW50ID09IE1pZGRsZSkKLSAg ICAgICAgfHwgKG1fd3JpdGluZ0RpcmVjdGlvbiA9PSBWZXJ0aWNhbEdyb3dpbmdSaWdodCAmJiBt X2N1ZUFsaWdubWVudCA9PSBNaWRkbGUpKQotICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5zZWNv bmQgPSBtX3RleHRQb3NpdGlvbiAtIG1fZGlzcGxheVNpemUgLyAyOworICAgIC8vIEEgdGV4dCB0 cmFjayBjdWUgaGFzIGEgdGV4dCB0cmFjayBjdWUgY29tcHV0ZWQgbGluZSBwb3NpdGlvbiB3aG9z ZSB2YWx1ZQorICAgIC8vIGlzIGRlZmluZWQgaW4gdGVybXMgb2YgdGhlIG90aGVyIGFzcGVjdHMg b2YgdGhlIGN1ZS4KKyAgICBtX2NvbXB1dGVkTGluZVBvc2l0aW9uID0gY2FsY3VsYXRlQ29tcHV0 ZWRMaW5lUG9zaXRpb24oKTsKIAogICAgIC8vIDEwLjkgRGV0ZXJtaW5lIHRoZSB2YWx1ZSBvZiB3 aGljaGV2ZXIgb2YgeC1wb3NpdGlvbiBvciB5LXBvc2l0aW9uIGlzIG5vdAogICAgIC8vIHlldCBj YWxjdWxhdGVkIGZvciBjdWUgYXMgcGVyIHRoZSBhcHByb3ByaWF0ZSBydWxlcyBmcm9tIHRoZSBm b2xsb3dpbmcKQEAgLTY1MCwxMCArNjgyLDYgQEAgdm9pZCBWVFRDdWU6OmNhbGN1bGF0ZURpc3Bs YXlQYXJhbWV0ZXJzKAogCiAgICAgaWYgKCFtX3NuYXBUb0xpbmVzICYmIChtX3dyaXRpbmdEaXJl Y3Rpb24gPT0gVmVydGljYWxHcm93aW5nTGVmdCB8fCBtX3dyaXRpbmdEaXJlY3Rpb24gPT0gVmVy dGljYWxHcm93aW5nUmlnaHQpKQogICAgICAgICBtX2Rpc3BsYXlQb3NpdGlvbi5maXJzdCA9IG1f Y29tcHV0ZWRMaW5lUG9zaXRpb247Ci0KLSAgICAvLyBBIHRleHQgdHJhY2sgY3VlIGhhcyBhIHRl eHQgdHJhY2sgY3VlIGNvbXB1dGVkIGxpbmUgcG9zaXRpb24gd2hvc2UgdmFsdWUKLSAgICAvLyBp cyBkZWZpbmVkIGluIHRlcm1zIG9mIHRoZSBvdGhlciBhc3BlY3RzIG9mIHRoZSBjdWUuCi0gICAg bV9jb21wdXRlZExpbmVQb3NpdGlvbiA9IGNhbGN1bGF0ZUNvbXB1dGVkTGluZVBvc2l0aW9uKCk7 CiB9CiAgICAgCiB2b2lkIFZUVEN1ZTo6bWFya0Z1dHVyZUFuZFBhc3ROb2RlcyhDb250YWluZXJO b2RlKiByb290LCBkb3VibGUgcHJldmlvdXNUaW1lc3RhbXAsIGRvdWJsZSBtb3ZpZVRpbWUpCkBA IC0xMDIwLDYgKzEwNDgsMTQgQEAgdm9pZCBWVFRDdWU6OnNldEN1ZVNldHRpbmdzKGNvbnN0IFN0 cmluZwogICAgICAgICAgICAgLy8gMy4gSWYgdmFsdWUgaXMgYSBjYXNlLXNlbnNpdGl2ZSBtYXRj aCBmb3IgdGhlIHN0cmluZyAiZW5kIiwgdGhlbiBsZXQgY3VlJ3MgdGV4dCB0cmFjayBjdWUgYWxp Z25tZW50IGJlIGVuZCBhbGlnbm1lbnQuCiAgICAgICAgICAgICBlbHNlIGlmIChjdWVBbGlnbm1l bnQgPT0gZW5kS2V5d29yZCgpKQogICAgICAgICAgICAgICAgIG1fY3VlQWxpZ25tZW50ID0gRW5k OworCisgICAgICAgICAgICAvLyA0LiBJZiB2YWx1ZSBpcyBhIGNhc2Utc2Vuc2l0aXZlIG1hdGNo IGZvciB0aGUgc3RyaW5nICJsZWZ0IiwgdGhlbiBsZXQgY3VlJ3MgdGV4dCB0cmFjayBjdWUgYWxp Z25tZW50IGJlIGxlZnQgYWxpZ25tZW50LgorICAgICAgICAgICAgZWxzZSBpZiAoY3VlQWxpZ25t ZW50ID09IGxlZnRLZXl3b3JkKCkpCisgICAgICAgICAgICAgICAgbV9jdWVBbGlnbm1lbnQgPSBM ZWZ0OworCisgICAgICAgICAgICAvLyA1LiBJZiB2YWx1ZSBpcyBhIGNhc2Utc2Vuc2l0aXZlIG1h dGNoIGZvciB0aGUgc3RyaW5nICJyaWdodCIsIHRoZW4gbGV0IGN1ZSdzIHRleHQgdHJhY2sgY3Vl IGFsaWdubWVudCBiZSByaWdodCBhbGlnbm1lbnQuCisgICAgICAgICAgICBlbHNlIGlmIChjdWVB bGlnbm1lbnQgPT0gcmlnaHRLZXl3b3JkKCkpCisgICAgICAgICAgICAgICAgbV9jdWVBbGlnbm1l bnQgPSBSaWdodDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogI2lmIEVOQUJM RShXRUJWVFRfUkVHSU9OUykKQEAgLTEwNDYsNiArMTA4MiwxMSBAQCBOZXh0U2V0dGluZzoKICNl bmRpZgogfQogCitDU1NWYWx1ZUlEIFZUVEN1ZTo6Z2V0Q1NTQWxpZ25tZW50KCkgY29uc3QKK3sK KyAgICByZXR1cm4gZGlzcGxheUFsaWdubWVudE1hcFttX2N1ZUFsaWdubWVudF07Cit9CisKIENT U1ZhbHVlSUQgVlRUQ3VlOjpnZXRDU1NXcml0aW5nRGlyZWN0aW9uKCkgY29uc3QKIHsKICAgICBy ZXR1cm4gbV9kaXNwbGF5RGlyZWN0aW9uOwpAQCAtMTA1Myw3ICsxMDk0LDcgQEAgQ1NTVmFsdWVJ RCBWVFRDdWU6OmdldENTU1dyaXRpbmdEaXJlY3RpbwogCiBDU1NWYWx1ZUlEIFZUVEN1ZTo6Z2V0 Q1NTV3JpdGluZ01vZGUoKSBjb25zdAogewotICAgIHJldHVybiBtX2Rpc3BsYXlXcml0aW5nTW9k ZTsKKyAgICByZXR1cm4gZGlzcGxheVdyaXRpbmdNb2RlTWFwW21fd3JpdGluZ0RpcmVjdGlvbl07 CiB9CiAKIGludCBWVFRDdWU6OmdldENTU1NpemUoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC90cmFjay9WVFRDdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L3RyYWNrL1ZUVEN1ZS5oCShyZXZpc2lvbiAxNjU4OTgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L3RyYWNrL1ZUVEN1ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENv cHlyaWdodCAoQykgMjAxMiwgMjAxMyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEzIEdvb2dsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyLTIwMTQgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTEyNywxMiAr MTI3LDEzIEBAIHB1YmxpYzoKIAogICAgIHN0ZDo6cGFpcjxkb3VibGUsIGRvdWJsZT4gZ2V0Q1NT UG9zaXRpb24oKSBjb25zdDsKIAorICAgIENTU1ZhbHVlSUQgZ2V0Q1NTQWxpZ25tZW50KCkgY29u c3Q7CiAgICAgaW50IGdldENTU1NpemUoKSBjb25zdDsKICAgICBDU1NWYWx1ZUlEIGdldENTU1dy aXRpbmdEaXJlY3Rpb24oKSBjb25zdDsKICAgICBDU1NWYWx1ZUlEIGdldENTU1dyaXRpbmdNb2Rl KCkgY29uc3Q7CiAKICAgICBlbnVtIFdyaXRpbmdEaXJlY3Rpb24gewotICAgICAgICBIb3Jpem9u dGFsLAorICAgICAgICBIb3Jpem9udGFsID0gMCwKICAgICAgICAgVmVydGljYWxHcm93aW5nTGVm dCwKICAgICAgICAgVmVydGljYWxHcm93aW5nUmlnaHQsCiAgICAgICAgIE51bWJlck9mV3JpdGlu Z0RpcmVjdGlvbnMKQEAgLTE0MCw5ICsxNDEsMTIgQEAgcHVibGljOgogICAgIFdyaXRpbmdEaXJl Y3Rpb24gZ2V0V3JpdGluZ0RpcmVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fd3JpdGluZ0RpcmVj dGlvbjsgfQogCiAgICAgZW51bSBDdWVBbGlnbm1lbnQgewotICAgICAgICBTdGFydCwKKyAgICAg ICAgU3RhcnQgPSAwLAogICAgICAgICBNaWRkbGUsCi0gICAgICAgIEVuZAorICAgICAgICBFbmQs CisgICAgICAgIExlZnQsCisgICAgICAgIFJpZ2h0LAorICAgICAgICBOdW1iZXJPZkFsaWdubWVu dHMKICAgICB9OwogICAgIEN1ZUFsaWdubWVudCBnZXRBbGlnbm1lbnQoKSBjb25zdCB7IHJldHVy biBtX2N1ZUFsaWdubWVudDsgfQogCkBAIC0yMDgsOSArMjEyLDYgQEAgcHJpdmF0ZToKIAogICAg IENTU1ZhbHVlSUQgbV9kaXNwbGF5RGlyZWN0aW9uOwogCi0gICAgQ1NTVmFsdWVJRCBtX2Rpc3Bs YXlXcml0aW5nTW9kZU1hcFtOdW1iZXJPZldyaXRpbmdEaXJlY3Rpb25zXTsKLSAgICBDU1NWYWx1 ZUlEIG1fZGlzcGxheVdyaXRpbmdNb2RlOwotCiAgICAgaW50IG1fZGlzcGxheVNpemU7CiAKICAg ICBzdGQ6OnBhaXI8ZmxvYXQsIGZsb2F0PiBtX2Rpc3BsYXlQb3NpdGlvbjsKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2NTkwMykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBw bGUuY29tPgorCisgICAgICAgIEZpeCBjdWUgcmVuZGVyaW5nIHRlc3QgYW5kIGluY2x1ZGUgc3Vw cG9ydCBmb3IgbGVmdC9yaWdodCBhbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDQwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlZCBmcm9tIEJsaW5rIChwYXRjaCBieSB2Y2FyYnVu ZUBjaHJvbWl1bS5vcmcpOgorICAgICAgICBodHRwczovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5j b20vY2hyb21pdW0vYmxpbmsvKy9lNjk1NzAzY2I2MDM0MjFjNzQxZTU5YTU1N2E3OTg5MTEzYzEz Yjk0CisgICAgICAgIGh0dHA6Ly9jcmJ1Zy5jb20vMjUxNTUwMDMKKworICAgICAgICAqIG1lZGlh L3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9jYXB0aW9ucy1zbmFwLXRvLWxpbmVzLW5vdC1zZXQudnR0 OiBSZXZpc2VkIGZvciBsZWZ0L3JpZ2h0IGFsaWdubWVudCB0YWdzLgorICAgICAgICAqIG1lZGlh L3RyYWNrL3RyYWNrLWN1ZS1yZW5kZXJpbmctc25hcC10by1saW5lcy1ub3Qtc2V0LWV4cGVjdGVk LnR4dDogRGl0dG8uCisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3VlLXJlbmRlcmluZy1z bmFwLXRvLWxpbmVzLW5vdC1zZXQuaHRtbDogRGl0dG8uCisKIDIwMTQtMDMtMTkgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCB0ZXN0IHN5 c3RlbSBmaXguCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jdWUtcmVuZGVy aW5nLXNuYXAtdG8tbGluZXMtbm90LXNldC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3VlLXJlbmRlcmluZy1zbmFwLXRvLWxpbmVzLW5v dC1zZXQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxNjU4OTgpCisrKyBMYXlvdXRUZXN0cy9tZWRp YS90cmFjay90cmFjay1jdWUtcmVuZGVyaW5nLXNuYXAtdG8tbGluZXMtbm90LXNldC1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTIsMTggKzIsMTUgQEAKIFRlc3QgdGhhdCBUZXh0VHJh Y2sncyBjdWVzIGFyZSByZW5kZXJlZCBjb3JyZWN0bHkgd2hlbiB0aGUgc25hcCB0byBsaW5lcyBm bGFnIGlzIG5vdCBzZXQuCiBFVkVOVChjYW5wbGF5dGhyb3VnaCkKIAotVGhlIHRyYWNrIGNvbnRh aW5lciBhbmQgdGhlIG1lZGlhIGNvbnRyb2xzIHNob3VsZCBjb21wbGV0ZWx5IGNvdmVyIHRoZSB2 aWRlbyBlbGVtZW50Ci1FWFBFQ1RFRCAoY3VlRGlzcGxheUNvbnRhaW5lci5vZmZzZXRIZWlnaHQg KyBjb250cm9sc1BhbmVsRWxlbWVudC5vZmZzZXRIZWlnaHQgPT0gdmlkZW8udmlkZW9IZWlnaHQg PT0gJ3RydWUnKSBPSwotRVhQRUNURUQgKGN1ZURpc3BsYXlDb250YWluZXIub2Zmc2V0V2lkdGgg PT0gdmlkZW8udmlkZW9XaWR0aCA9PSAndHJ1ZScpIE9LCi0KICoqIERlZmF1bHQgKioKIEVWRU5U KHNlZWtlZCkKIEFjdGl2ZSBjdWVzOiAxCiAKICogQ3VlIDAgKgogRVhQRUNURUQgKGN1ZURpc3Bs YXlFbGVtZW50LmlubmVyVGV4dCA9PSAnVGhpcyBpcyBhIGRlbW8gdHJhY2sgdG8gaWxsdXN0cmF0 ZSBwb3NpdGlvbmluZyBmZWF0dXJlcyBvZiBjdWVzLicpIE9LCi1DdWUgbGVmdCBwb3NpdGlvbiAo cGVyY2VudGFnZSk6IDAKLUN1ZSB0b3AgcG9zaXRpb24gKHBlcmNlbnRhZ2UpOiA4NworQ3VlIGFs aWdubWVudCAoZGVmYXVsdCBvciBhcyBzcGVjaWZpZWQpOiBtaWRkbGUKK0N1ZSBsZWZ0IHBvc2l0 aW9uIChwZXJjZW50YWdlKTogNTAKK0N1ZSB0b3AgcG9zaXRpb24gKHBlcmNlbnRhZ2UpOiAxMDAK IAogKiogQ2VudGVyICoqCiBFVkVOVChzZWVrZWQpCkBAIC0yMSw2ICsxOCw3IEBAIEFjdGl2ZSBj dWVzOiAxCiAKICogQ3VlIDAgKgogRVhQRUNURUQgKGN1ZURpc3BsYXlFbGVtZW50LmlubmVyVGV4 dCA9PSAnVXNpbmcgSFRNTDUgY2FwdGlvbnMsIHlvdSBjYW4gcG9zaXRpb24gdGhlIGN1ZXMgYW55 d2hlcmUuJykgT0sKK0N1ZSBhbGlnbm1lbnQgKGRlZmF1bHQgb3IgYXMgc3BlY2lmaWVkKTogbWlk ZGxlCiBDdWUgbGVmdCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDUwCiBDdWUgdG9wIHBvc2l0aW9u IChwZXJjZW50YWdlKTogNTAKIApAQCAtMzAsNiArMjgsNyBAQCBBY3RpdmUgY3VlczogMQogCiAq IEN1ZSAwICoKIEVYUEVDVEVEIChjdWVEaXNwbGF5RWxlbWVudC5pbm5lclRleHQgPT0gJ0ZvciBl eGFtcGxlLCBoZXJlIGlzIGEgY3VlIG9uIHRoZSB0b3AgbGVmdC1jb3JuZXIuJykgT0sKK0N1ZSBh bGlnbm1lbnQgKGRlZmF1bHQgb3IgYXMgc3BlY2lmaWVkKTogc3RhcnQKIEN1ZSBsZWZ0IHBvc2l0 aW9uIChwZXJjZW50YWdlKTogMAogQ3VlIHRvcCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDAKIApA QCAtMzksNiArMzgsNyBAQCBBY3RpdmUgY3VlczogMQogCiAqIEN1ZSAwICoKIEVYUEVDVEVEIChj dWVEaXNwbGF5RWxlbWVudC5pbm5lclRleHQgPT0gJ09yIG9uIHRoZSB0b3AtcmlnaHQgY29ybmVy LicpIE9LCitDdWUgYWxpZ25tZW50IChkZWZhdWx0IG9yIGFzIHNwZWNpZmllZCk6IGVuZAogQ3Vl IGxlZnQgcG9zaXRpb24gKHBlcmNlbnRhZ2UpOiAxMDAKIEN1ZSB0b3AgcG9zaXRpb24gKHBlcmNl bnRhZ2UpOiAwCiAKQEAgLTQ4LDYgKzQ4LDcgQEAgQWN0aXZlIGN1ZXM6IDEKIAogKiBDdWUgMCAq CiBFWFBFQ1RFRCAoY3VlRGlzcGxheUVsZW1lbnQuaW5uZXJUZXh0ID09ICdCb3R0b20tcmlnaHQg Y29ybmVyLicpIE9LCitDdWUgYWxpZ25tZW50IChkZWZhdWx0IG9yIGFzIHNwZWNpZmllZCk6IHJp Z2h0CiBDdWUgbGVmdCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDEwMAogQ3VlIHRvcCBwb3NpdGlv biAocGVyY2VudGFnZSk6IDEwMAogCkBAIC01Nyw2ICs1OCw3IEBAIEFjdGl2ZSBjdWVzOiAxCiAK ICogQ3VlIDAgKgogRVhQRUNURUQgKGN1ZURpc3BsYXlFbGVtZW50LmlubmVyVGV4dCA9PSAnQW5k LCBhcyB5b3UgbWlnaHQgZXhwZWN0LCB0aGUgYm90dG9tLWxlZnQgb25lLicpIE9LCitDdWUgYWxp Z25tZW50IChkZWZhdWx0IG9yIGFzIHNwZWNpZmllZCk6IGxlZnQKIEN1ZSBsZWZ0IHBvc2l0aW9u IChwZXJjZW50YWdlKTogMAogQ3VlIHRvcCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDEwMAogCkBA IC02Niw2ICs2OCw3IEBAIEFjdGl2ZSBjdWVzOiAxCiAKICogQ3VlIDAgKgogRVhQRUNURUQgKGN1 ZURpc3BsYXlFbGVtZW50LmlubmVyVGV4dCA9PSAnQ3VlcyBhcmUgaW1wbGljaXRseSBkaXNwbGF5 ZWQgd2l0aGluIHRoZSB2aWV3cG9ydCBhcmVhLicpIE9LCitDdWUgYWxpZ25tZW50IChkZWZhdWx0 IG9yIGFzIHNwZWNpZmllZCk6IG1pZGRsZQogQ3VlIGxlZnQgcG9zaXRpb24gKHBlcmNlbnRhZ2Up OiA1MAogQ3VlIHRvcCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDUwCiAKQEAgLTc1LDM2ICs3OCw0 MyBAQCBBY3RpdmUgY3VlczogNwogCiAqIEN1ZSAwICoKIEVYUEVDVEVEIChjdWVEaXNwbGF5RWxl bWVudC5pbm5lclRleHQgPT0gJ1lvdSBtYXkgZXZlbiBoYXZlIG11bHRpcGxlIGN1ZXMgaW4gdGhl IHNhbWUgdGltZS4nKSBPSworQ3VlIGFsaWdubWVudCAoZGVmYXVsdCBvciBhcyBzcGVjaWZpZWQp OiBtaWRkbGUKIEN1ZSBsZWZ0IHBvc2l0aW9uIChwZXJjZW50YWdlKTogNTAKIEN1ZSB0b3AgcG9z aXRpb24gKHBlcmNlbnRhZ2UpOiA1MAogCiAqIEN1ZSAxICoKIEVYUEVDVEVEIChjdWVEaXNwbGF5 RWxlbWVudC5pbm5lclRleHQgPT0gJ1RvcC1sZWZ0IGN1ZS4nKSBPSworQ3VlIGFsaWdubWVudCAo ZGVmYXVsdCBvciBhcyBzcGVjaWZpZWQpOiBzdGFydAogQ3VlIGxlZnQgcG9zaXRpb24gKHBlcmNl bnRhZ2UpOiAwCiBDdWUgdG9wIHBvc2l0aW9uIChwZXJjZW50YWdlKTogMAogCiAqIEN1ZSAyICoK IEVYUEVDVEVEIChjdWVEaXNwbGF5RWxlbWVudC5pbm5lclRleHQgPT0gJ1RvcC1yaWdodCBjdWUu JykgT0sKK0N1ZSBhbGlnbm1lbnQgKGRlZmF1bHQgb3IgYXMgc3BlY2lmaWVkKTogZW5kCiBDdWUg bGVmdCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDEwMAogQ3VlIHRvcCBwb3NpdGlvbiAocGVyY2Vu dGFnZSk6IDcKIAogKiBDdWUgMyAqCiBFWFBFQ1RFRCAoY3VlRGlzcGxheUVsZW1lbnQuaW5uZXJU ZXh0ID09ICdCb3R0b20gY3VlLicpIE9LCitDdWUgYWxpZ25tZW50IChkZWZhdWx0IG9yIGFzIHNw ZWNpZmllZCk6IG1pZGRsZQogQ3VlIGxlZnQgcG9zaXRpb24gKHBlcmNlbnRhZ2UpOiA1MAogQ3Vl IHRvcCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDEwMAogCiAqIEN1ZSA0ICoKIEVYUEVDVEVEIChj dWVEaXNwbGF5RWxlbWVudC5pbm5lclRleHQgPT0gJ1JhbmRvbSBjdWUgMS4nKSBPSworQ3VlIGFs aWdubWVudCAoZGVmYXVsdCBvciBhcyBzcGVjaWZpZWQpOiBlbmQKIEN1ZSBsZWZ0IHBvc2l0aW9u IChwZXJjZW50YWdlKTogMTAwCiBDdWUgdG9wIHBvc2l0aW9uIChwZXJjZW50YWdlKTogMjUKIAog KiBDdWUgNSAqCiBFWFBFQ1RFRCAoY3VlRGlzcGxheUVsZW1lbnQuaW5uZXJUZXh0ID09ICdSYW5k b20gY3VlIDIuJykgT0sKK0N1ZSBhbGlnbm1lbnQgKGRlZmF1bHQgb3IgYXMgc3BlY2lmaWVkKTog c3RhcnQKIEN1ZSBsZWZ0IHBvc2l0aW9uIChwZXJjZW50YWdlKTogNDQKIEN1ZSB0b3AgcG9zaXRp b24gKHBlcmNlbnRhZ2UpOiAzMwogCiAqIEN1ZSA2ICoKIEVYUEVDVEVEIChjdWVEaXNwbGF5RWxl bWVudC5pbm5lclRleHQgPT0gJ1JhbmRvbSBjdWUgMy4nKSBPSworQ3VlIGFsaWdubWVudCAoZGVm YXVsdCBvciBhcyBzcGVjaWZpZWQpOiBzdGFydAogQ3VlIGxlZnQgcG9zaXRpb24gKHBlcmNlbnRh Z2UpOiAyMwogQ3VlIHRvcCBwb3NpdGlvbiAocGVyY2VudGFnZSk6IDQzCiBFTkQgT0YgVEVTVApJ bmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3VlLXJlbmRlcmluZy1zbmFwLXRv LWxpbmVzLW5vdC1zZXQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFj ay90cmFjay1jdWUtcmVuZGVyaW5nLXNuYXAtdG8tbGluZXMtbm90LXNldC5odG1sCShyZXZpc2lv biAxNjU4OTgpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jdWUtcmVuZGVyaW5n LXNuYXAtdG8tbGluZXMtbm90LXNldC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC00NCwxMiArNDQs MTIgQEAKICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiQWN0aXZlIGN1ZXM6ICIgKyB0ZXN0VHJh Y2sudHJhY2suYWN0aXZlQ3Vlcy5sZW5ndGgpOwogCiAgICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IHRlc3RUcmFjay50cmFjay5hY3RpdmVDdWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAg ICAgICAgICAgCiAgICAgICAgICAgICAgICAgY3VlRGlzcGxheUVsZW1lbnQgPSB0ZXh0VHJhY2tE aXNwbGF5RWxlbWVudCh2aWRlbywgJ2Rpc3BsYXknLCBpKTsKIAogICAgICAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgiIik7CiAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqIEN1ZSAiICsg aSArICIgKiIpOwogICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiY3VlRGlzcGxheUVsZW1l bnQuaW5uZXJUZXh0IiwgdGVzdFRyYWNrLnRyYWNrLmFjdGl2ZUN1ZXNbaV0udGV4dCk7CisgICAg ICAgICAgICAgICAgY29uc29sZVdyaXRlKCJDdWUgYWxpZ25tZW50IChkZWZhdWx0IG9yIGFzIHNw ZWNpZmllZCk6ICIgKyB0ZXN0VHJhY2sudHJhY2suYWN0aXZlQ3Vlc1tpXS5hbGlnbik7CiAKICAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIkN1ZSBsZWZ0IHBvc2l0aW9uIChwZXJjZW50YWdl KTogIiArIE1hdGgucm91bmQoY3VlRGlzcGxheUVsZW1lbnQub2Zmc2V0TGVmdCAvIGN1ZURpc3Bs YXlDb250YWluZXIub2Zmc2V0V2lkdGggKiAxMDApKTsKICAgICAgICAgICAgICAgICBjb25zb2xl V3JpdGUoIkN1ZSB0b3AgcG9zaXRpb24gKHBlcmNlbnRhZ2UpOiAiICsgTWF0aC5yb3VuZChjdWVE aXNwbGF5RWxlbWVudC5vZmZzZXRUb3AgLyBjdWVEaXNwbGF5Q29udGFpbmVyLm9mZnNldEhlaWdo dCAqIDEwMCkpOwpAQCAtNzQsMTQgKzc0LDYgQEAKICAgICAgICAgICAgIGN1cnJlbnRUZXN0Q2Fz ZSsrOwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gdGVzdEluaXRpYWxDb250YWluZXIo KQotICAgICAgICB7Ci0gICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwotICAgICAgICAgICAg Y29uc29sZVdyaXRlKCJUaGUgdHJhY2sgY29udGFpbmVyIGFuZCB0aGUgbWVkaWEgY29udHJvbHMg c2hvdWxkIGNvbXBsZXRlbHkgY292ZXIgdGhlIHZpZGVvIGVsZW1lbnQiKTsKLSAgICAgICAgICAg IHRlc3RFeHBlY3RlZCgiY3VlRGlzcGxheUNvbnRhaW5lci5vZmZzZXRIZWlnaHQgKyBjb250cm9s c1BhbmVsRWxlbWVudC5vZmZzZXRIZWlnaHQgPT0gdmlkZW8udmlkZW9IZWlnaHQiLCB0cnVlKTsK LSAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiY3VlRGlzcGxheUNvbnRhaW5lci5vZmZzZXRXaWR0 aCA9PSB2aWRlby52aWRlb1dpZHRoIiwgdHJ1ZSk7Ci0gICAgICAgIH0KLQogICAgICAgICBmdW5j dGlvbiBsb2FkZWQoKQogICAgICAgICB7CiAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIlRlc3Qg dGhhdCBUZXh0VHJhY2sncyBjdWVzIGFyZSByZW5kZXJlZCBjb3JyZWN0bHkgd2hlbiB0aGUgc25h cCB0byBsaW5lcyBmbGFnIGlzIG5vdCBzZXQuIik7CkBAIC05Myw3ICs4NSw2IEBACiAKICAgICAg ICAgICAgIHdhaXRGb3JFdmVudCgnY2FucGxheXRocm91Z2gnLCBmdW5jdGlvbigpIHsKICAgICAg ICAgICAgICAgICBjdWVEaXNwbGF5Q29udGFpbmVyID0gdGV4dFRyYWNrRGlzcGxheUVsZW1lbnQo dmlkZW8pOwotICAgICAgICAgICAgICAgIHRlc3RJbml0aWFsQ29udGFpbmVyKCk7CiAgICAgICAg ICAgICAgICAgcnVuTmV4dFRlc3RDYXNlKCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQpJ bmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2NhcHRpb25zLXNu YXAtdG8tbGluZXMtbm90LXNldC52dHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEv dHJhY2svY2FwdGlvbnMtd2VidnR0L2NhcHRpb25zLXNuYXAtdG8tbGluZXMtbm90LXNldC52dHQJ KHJldmlzaW9uIDE2NTg5OCkKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdl YnZ0dC9jYXB0aW9ucy1zbmFwLXRvLWxpbmVzLW5vdC1zZXQudnR0CSh3b3JraW5nIGNvcHkpCkBA IC0xLDcgKzEsNyBAQAogV0VCVlRUIEZJTEUKIAogMQotMDA6MDA6MDAuMDAwIC0tPiAwMDowMDow MC41MDAKKzAwOjAwOjAwLjAwMCAtLT4gMDA6MDA6MDAuNTAwIGxpbmU6MTAwJSBwb3NpdGlvbjo1 MCUKIFRoaXMgaXMgYSBkZW1vIHRyYWNrIHRvIGlsbHVzdHJhdGUgcG9zaXRpb25pbmcgZmVhdHVy ZXMgb2YgY3Vlcy4KIAogMgpAQCAtMTcsMTEgKzE3LDExIEBAIEZvciBleGFtcGxlLCBoZXJlIGlz IGEgY3VlIG9uIHRoZSB0b3AgbGUKIE9yIG9uIHRoZSB0b3AtcmlnaHQgY29ybmVyLgogCiA1Ci0w MDowMDowMi4wMDAgLS0+IDAwOjAwOjAyLjUwMCBsaW5lOjEwMCUgcG9zaXRpb246MTAwJSBhbGln bjplbmQKKzAwOjAwOjAyLjAwMCAtLT4gMDA6MDA6MDIuNTAwIGxpbmU6MTAwJSBwb3NpdGlvbjox MDAlIGFsaWduOnJpZ2h0CiBCb3R0b20tcmlnaHQgY29ybmVyLgogCiA2Ci0wMDowMDowMi41MDAg LS0+IDAwOjAwOjAzLjAwMCBsaW5lOjEwMCUgcG9zaXRpb246MCUgYWxpZ246c3RhcnQKKzAwOjAw OjAyLjUwMCAtLT4gMDA6MDA6MDMuMDAwIGxpbmU6MTAwJSBwb3NpdGlvbjowJSBhbGlnbjpsZWZ0 CiBBbmQsIGFzIHlvdSBtaWdodCBleHBlY3QsIHRoZSBib3R0b20tbGVmdCBvbmUuCiAKIDcKQEAg LTI5LDcgKzI5LDcgQEAgQW5kLCBhcyB5b3UgbWlnaHQgZXhwZWN0LCB0aGUgYm90dG9tLWxlZgog Q3VlcyBhcmUgaW1wbGljaXRseSBkaXNwbGF5ZWQgd2l0aGluIHRoZSB2aWV3cG9ydCBhcmVhLgog CiA4Ci0wMDowMDowMy41MDAgLS0+IDAwOjAwOjA0LjAwMCBsaW5lOjEwMCUgcG9zaXRpb246NTAl CiswMDowMDowMy41MDAgLS0+IDAwOjAwOjA0LjAwMCBsaW5lOjEwMCUgcG9zaXRpb246NTAlIGFs aWduOm1pZGRsZQogQW5kIGFsd2F5cyBvbiB0b3Agb2YgdGhlIGNvbnRyb2xzLCBpZiB0aGVzZSBh cmUgdmlzaWJsZS4KIAogOQpAQCAtNTMsOSArNTMsOSBAQCBCb3R0b20gY3VlLgogUmFuZG9tIGN1 ZSAxLgogCiAxNAotMDA6MDA6MDQuMDAwIC0tPiAwMDowMDowNS4wMDAgbGluZTozMyUgcG9zaXRp b246NDQlCiswMDowMDowNC4wMDAgLS0+IDAwOjAwOjA1LjAwMCBsaW5lOjMzJSBwb3NpdGlvbjo0 NCUgYWxpZ246c3RhcnQKIFJhbmRvbSBjdWUgMi4KIAogMTUKLTAwOjAwOjA0LjAwMCAtLT4gMDA6 MDA6MDUuMDAwIGxpbmU6NTUlIHBvc2l0aW9uOjIzJQorMDA6MDA6MDQuMDAwIC0tPiAwMDowMDow NS4wMDAgbGluZTo1NSUgcG9zaXRpb246MjMlIGFsaWduOnN0YXJ0CiBSYW5kb20gY3VlIDMuCg==