151168 2015-11-11 16:48:19 -0800 Rename handle.*Event to dispatch.*Event 2015-11-14 14:06:41 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren cdumez commit-queue darin esprehn+autocc japhet kangil.han oldest_to_newest 1141285 0 ggaren 2015-11-11 16:48:19 -0800 Rename handle.*Event to dispatch.*Event 1141286 1 265336 ggaren 2015-11-11 16:49:38 -0800 Created attachment 265336 Patch 1141289 2 265336 cdumez 2015-11-11 16:50:54 -0800 Comment on attachment 265336 Patch r=me 1141295 3 265336 ggaren 2015-11-11 16:59:44 -0800 Comment on attachment 265336 Patch Go go Gadget Commit Queue. 1141316 4 265336 commit-queue 2015-11-11 17:48:28 -0800 Comment on attachment 265336 Patch Clearing flags on attachment: 265336 Committed r192342: <http://trac.webkit.org/changeset/192342> 1141317 5 commit-queue 2015-11-11 17:48:33 -0800 All reviewed patches have been landed. Closing bug. 1142067 6 265336 darin 2015-11-14 14:06:41 -0800 Comment on attachment 265336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265336&action=review > Source/WebCore/loader/DocumentLoader.h:142 > + void dispatchOnloadEvents(); > + bool wasOnloadDispatched() { return m_wasOnloadDispatched; } These are not good function names. The events are “load” events. There is no standard “onload” event, although a webpage could create and dispatch an event with that name, although there would be no point. There are some attributes named "onload" that set up handlers for "load" events. I’m also unclear why “event” here is plural. Maybe there is more than one load event that gets dispatched? > Source/WebCore/loader/DocumentLoader.h:391 > + bool m_wasOnloadDispatched; Ditto. > Source/WebCore/loader/EmptyClients.h:274 > + virtual void dispatchDidDispatchOnloadEvents() override { } Ditto. > Source/WebCore/loader/FrameLoader.h:215 > + void dispatchOnloadEvents(); Ditto. > Source/WebCore/loader/FrameLoaderClient.h:155 > + virtual void dispatchDidDispatchOnloadEvents() = 0; Ditto. 265336 2015-11-11 16:49:38 -0800 2015-11-11 17:48:28 -0800 Patch bug-151168-20151111164933.patch text/plain 19851 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MjMzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDE1LTExLTExICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIGhhbmRsZS4qRXZl bnQgdG8gZGlzcGF0Y2guKkV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTExNjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudDo6aW1wbGljaXRDbG9zZSk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAg ICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 TG9hZGVyOjpEb2N1bWVudExvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRl cjo6Z2V0SWNvbkRhdGFGb3JJY29uVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9h ZGVyOjpkaXNwYXRjaE9ubG9hZEV2ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExv YWRlcjo6aGFuZGxlZE9ubG9hZEV2ZW50cyk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL0Rv Y3VtZW50TG9hZGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6aXNDbGll bnRSZWRpcmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6c2V0SXNDbGll bnRSZWRpcmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6d2FzT25sb2Fk RGlzcGF0Y2hlZCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6b3ZlcnJpZGVF bmNvZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6d2FzT25sb2FkSGFu ZGxlZCk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAgICAg ICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6c3VibWl0Rm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c3RvcExvYWRp bmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnVzZXJBZ2VudCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hPbmxvYWRFdmVudHMpOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OmZyYW1lRGV0YWNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVMb2FkZXI6OnNob3VsZENsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy OjpkaXNwYXRjaFVubG9hZEV2ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 ZGlzcGF0Y2hCZWZvcmVVbmxvYWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6aGFuZGxlZE9ubG9hZEV2ZW50cyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6aGFuZGxlVW5sb2FkRXZlbnRzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyOjpoYW5kbGVCZWZvcmVVbmxvYWRFdmVudCk6IERlbGV0ZWQuCisgICAgICAg ICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xp ZW50Lmg6CisgICAgICAgICogbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TmF2aWdhdGlvblNjaGVkdWxlcjo6bXVzdExvY2tCYWNrRm9yd2FyZExpc3Qp OgorCiAyMDE1LTExLTEwICBKb24gSG9uZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CiAK ICAgICAgICAgQ3Jhc2ggbG9hZGluZyBCbGluayBsYXlvdXQgdGVzdCBmYXN0L3BhcnNlci9zdHJp cC1zY3JpcHQtYXR0cnMtb24taW5wdXQuaHRtbApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CShyZXZpc2lvbiAxOTIzMzIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNjY2LDcgKzI2NjYsNyBAQCB2b2lkIERvY3VtZW50OjppbXBsaWNp dENsb3NlKCkKICAgICAgICAgZW5xdWV1ZVBvcHN0YXRlRXZlbnQobV9wZW5kaW5nU3RhdGVPYmpl Y3QucmVsZWFzZSgpKTsKICAgICAKICAgICBpZiAoZikKLSAgICAgICAgZi0+bG9hZGVyKCkuaGFu ZGxlZE9ubG9hZEV2ZW50cygpOworICAgICAgICBmLT5sb2FkZXIoKS5kaXNwYXRjaE9ubG9hZEV2 ZW50cygpOwogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBpZiAoIW93 bmVyRWxlbWVudCgpKQogICAgICAgICBwcmludGYoIm9ubG9hZCBmaXJlZCBhdCAlbGxkXG4iLCBl bGFwc2VkVGltZSgpLmNvdW50KCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHJldmlzaW9u IDE5MjMzMikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkp CkBAIC0xNTIyLDcgKzE1MjIsNyBAQCBwcml2YXRlOgogCiAgICAgLy8gRklYTUU6IE1lcmdlIHRo ZXNlIDIgdmFyaWFibGVzIGludG8gYW4gZW51bS4gQWxzbywgRnJhbWVMb2FkZXI6Om1fZGlkQ2Fs bEltcGxpY2l0Q2xvc2UKICAgICAvLyBpcyBhbG1vc3QgYSBkdXBsaWNhdGlvbiBvZiB0aGlzIGRh dGEsIHNvIHRoYXQgc2hvdWxkIHByb2JhYmx5IGdldCBtZXJnZWQgaW4gdG9vLgotICAgIC8vIEZJ WE1FOiBEb2N1bWVudDo6bV9wcm9jZXNzaW5nTG9hZEV2ZW50IGFuZCBEb2N1bWVudExvYWRlcjo6 bV93YXNPbmxvYWRIYW5kbGVkIGFyZSByb3VnaGx5IHRoZSBzYW1lCisgICAgLy8gRklYTUU6IERv Y3VtZW50OjptX3Byb2Nlc3NpbmdMb2FkRXZlbnQgYW5kIERvY3VtZW50TG9hZGVyOjptX3dhc09u bG9hZERpc3BhdGNoZWQgYXJlIHJvdWdobHkgdGhlIHNhbWUKICAgICAvLyBhbmQgc2hvdWxkIGJl IG1lcmdlZC4KICAgICBib29sIG1fcHJvY2Vzc2luZ0xvYWRFdmVudDsKICAgICBib29sIG1fbG9h ZEV2ZW50RmluaXNoZWQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5jcHAJKHJldmlzaW9uIDE5MjMzMikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNCw3ICsxMzQsNyBAQCBEb2N1bWVudExv YWRlcjo6RG9jdW1lbnRMb2FkZXIoY29uc3QgUmVzCiAgICAgLCBtX2dvdEZpcnN0Qnl0ZShmYWxz ZSkKICAgICAsIG1faXNDbGllbnRSZWRpcmVjdChmYWxzZSkKICAgICAsIG1faXNMb2FkaW5nTXVs dGlwYXJ0Q29udGVudChmYWxzZSkKLSAgICAsIG1fd2FzT25sb2FkSGFuZGxlZChmYWxzZSkKKyAg ICAsIG1fd2FzT25sb2FkRGlzcGF0Y2hlZChmYWxzZSkKICAgICAsIG1fc3RvcFJlY29yZGluZ1Jl c3BvbnNlcyhmYWxzZSkKICAgICAsIG1fc3Vic3RpdHV0ZVJlc291cmNlRGVsaXZlcnlUaW1lcigq dGhpcywgJkRvY3VtZW50TG9hZGVyOjpzdWJzdGl0dXRlUmVzb3VyY2VEZWxpdmVyeVRpbWVyRmly ZWQpCiAgICAgLCBtX2RpZENyZWF0ZUdsb2JhbEhpc3RvcnlFbnRyeShmYWxzZSkKQEAgLTE1OTMs OSArMTU5Myw5IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmdldEljb25EYXRhRm9ySWNvblUKICAg ICBpY29uRGF0YWJhc2UoKS5pY29uRGF0YUZvckljb25VUkwodXJsU3RyaW5nLCBtX2ljb25EYXRh Q2FsbGJhY2spOwogfQogCi12b2lkIERvY3VtZW50TG9hZGVyOjpoYW5kbGVkT25sb2FkRXZlbnRz KCkKK3ZvaWQgRG9jdW1lbnRMb2FkZXI6OmRpc3BhdGNoT25sb2FkRXZlbnRzKCkKIHsKLSAgICBt X3dhc09ubG9hZEhhbmRsZWQgPSB0cnVlOworICAgIG1fd2FzT25sb2FkRGlzcGF0Y2hlZCA9IHRy dWU7CiAgICAgYXBwbGljYXRpb25DYWNoZUhvc3QoKS0+c3RvcERlZmVycmluZ0V2ZW50cygpOwog fQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24g MTkyMzMyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTEzOCw4ICsxMzgsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAg ICAgYm9vbCBpc0NsaWVudFJlZGlyZWN0KCkgY29uc3QgeyByZXR1cm4gbV9pc0NsaWVudFJlZGly ZWN0OyB9CiAgICAgICAgIHZvaWQgc2V0SXNDbGllbnRSZWRpcmVjdChib29sIGlzQ2xpZW50UmVk aXJlY3QpIHsgbV9pc0NsaWVudFJlZGlyZWN0ID0gaXNDbGllbnRSZWRpcmVjdDsgfQotICAgICAg ICB2b2lkIGhhbmRsZWRPbmxvYWRFdmVudHMoKTsKLSAgICAgICAgYm9vbCB3YXNPbmxvYWRIYW5k bGVkKCkgeyByZXR1cm4gbV93YXNPbmxvYWRIYW5kbGVkOyB9CisgICAgICAgIHZvaWQgZGlzcGF0 Y2hPbmxvYWRFdmVudHMoKTsKKyAgICAgICAgYm9vbCB3YXNPbmxvYWREaXNwYXRjaGVkKCkgeyBy ZXR1cm4gbV93YXNPbmxvYWREaXNwYXRjaGVkOyB9CiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIGJv b2wgaXNMb2FkaW5nSW5BUElTZW5zZSgpIGNvbnN0OwogICAgICAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHNldFRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKTsKICAgICAgICAgY29uc3Qg U3RyaW5nJiBvdmVycmlkZUVuY29kaW5nKCkgY29uc3QgeyByZXR1cm4gbV9vdmVycmlkZUVuY29k aW5nOyB9CkBAIC0zODYsOSArMzg2LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBi b29sIG1faXNDbGllbnRSZWRpcmVjdDsKICAgICAgICAgYm9vbCBtX2lzTG9hZGluZ011bHRpcGFy dENvbnRlbnQ7CiAKLSAgICAgICAgLy8gRklYTUU6IERvY3VtZW50OjptX3Byb2Nlc3NpbmdMb2Fk RXZlbnQgYW5kIERvY3VtZW50TG9hZGVyOjptX3dhc09ubG9hZEhhbmRsZWQgYXJlIHJvdWdobHkg dGhlIHNhbWUKKyAgICAgICAgLy8gRklYTUU6IERvY3VtZW50OjptX3Byb2Nlc3NpbmdMb2FkRXZl bnQgYW5kIERvY3VtZW50TG9hZGVyOjptX3dhc09ubG9hZERpc3BhdGNoZWQgYXJlIHJvdWdobHkg dGhlIHNhbWUKICAgICAgICAgLy8gYW5kIHNob3VsZCBiZSBtZXJnZWQuCi0gICAgICAgIGJvb2wg bV93YXNPbmxvYWRIYW5kbGVkOworICAgICAgICBib29sIG1fd2FzT25sb2FkRGlzcGF0Y2hlZDsK IAogICAgICAgICBTdHJpbmdXaXRoRGlyZWN0aW9uIG1fcGFnZVRpdGxlOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCShyZXZpc2lvbiAxOTIzMzIpCisrKyBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3MSw3ICsy NzEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkRmFpbExvYWRpbmco RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nLCBjb25zdCBSZXNvdXJjZUVycm9yJikgb3Zl cnJpZGUgeyB9CiAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRGlkTG9hZFJlc291cmNlRnJvbU1l bW9yeUNhY2hlKERvY3VtZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYsIGludCkgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KIAotICAg IHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEhhbmRsZU9ubG9hZEV2ZW50cygpIG92ZXJyaWRlIHsg fQorICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZERpc3BhdGNoT25sb2FkRXZlbnRzKCkgb3Zl cnJpZGUgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVNlcnZlclJlZGly ZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGUgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRp c3BhdGNoRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoKSBvdmVycmlkZSB7IH0KICAgICB2aXJ0dWFs IHZvaWQgZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0IFVSTCYsIGRvdWJs ZSwgZG91YmxlKSBvdmVycmlkZSB7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAkocmV2aXNpb24gMTkyMzMyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEwLDcgKzQxMCw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnN1Ym1pdEZvcm0oUGFzc1JlZlB0cjwKIAogICAgIC8vIFdlIGRvIG5vdCB3YW50IHRv IHN1Ym1pdCBtb3JlIHRoYW4gb25lIGZvcm0gZnJvbSB0aGUgc2FtZSBwYWdlLCBub3IgZG8gd2Ug d2FudCB0byBzdWJtaXQgYSBzaW5nbGUKICAgICAvLyBmb3JtIG1vcmUgdGhhbiBvbmNlLiBUaGlz IGZsYWcgcHJldmVudHMgdGhlc2UgZnJvbSBoYXBwZW5pbmc7IG5vdCBzdXJlIGhvdyBvdGhlciBi cm93c2VycyBwcmV2ZW50IHRoaXMuCi0gICAgLy8gVGhlIGZsYWcgaXMgcmVzZXQgaW4gZWFjaCB0 aW1lIHdlIHN0YXJ0IGhhbmRsZSBhIG5ldyBtb3VzZSBvciBrZXkgZG93biBldmVudCwgYW5kCisg ICAgLy8gVGhlIGZsYWcgaXMgcmVzZXQgaW4gZWFjaCB0aW1lIHdlIHN0YXJ0IGRpc3BhdGNoaW5n IGEgbmV3IG1vdXNlIG9yIGtleSBkb3duIGV2ZW50LCBhbmQKICAgICAvLyBhbHNvIGluIHNldFZp ZXcgc2luY2UgdGhpcyBwYXJ0IG1heSBnZXQgcmV1c2VkIGZvciBhIHBhZ2UgZnJvbSB0aGUgYmFj ay9mb3J3YXJkIGNhY2hlLgogICAgIC8vIFRoZSBmb3JtIG11bHRpLXN1Ym1pdCBsb2dpYyBoZXJl IGlzIG9ubHkgbmVlZGVkIHdoZW4gd2UgYXJlIHN1Ym1pdHRpbmcgYSBmb3JtIHRoYXQgYWZmZWN0 cyB0aGlzIGZyYW1lLgogCkBAIC00MzcsNyArNDM3LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3Rv cExvYWRpbmcoVW5sb2FkRXZlbgogICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPnBhcnNlcigp LT5zdG9wUGFyc2luZygpOwogCiAgICAgaWYgKHVubG9hZEV2ZW50UG9saWN5ICE9IFVubG9hZEV2 ZW50UG9saWN5Tm9uZSkKLSAgICAgICAgaGFuZGxlVW5sb2FkRXZlbnRzKHVubG9hZEV2ZW50UG9s aWN5KTsKKyAgICAgICAgZGlzcGF0Y2hVbmxvYWRFdmVudHModW5sb2FkRXZlbnRQb2xpY3kpOwog CiAgICAgbV9pc0NvbXBsZXRlID0gdHJ1ZTsgLy8gdG8gYXZvaWQgY2FsbGluZyBjb21wbGV0ZWQo KSBpbiBmaW5pc2hlZFBhcnNpbmcoKQogICAgIG1fZGlkQ2FsbEltcGxpY2l0Q2xvc2UgPSB0cnVl OyAvLyBkb24ndCB3YW50IHRoYXQgb25lIGVpdGhlcgpAQCAtMjQ1MSwxMiArMjQ1MSwxMiBAQCBT dHJpbmcgRnJhbWVMb2FkZXI6OnVzZXJBZ2VudChjb25zdCBVUkwmCiAgICAgcmV0dXJuIG1fY2xp ZW50LnVzZXJBZ2VudCh1cmwpOwogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpoYW5kbGVkT25sb2Fk RXZlbnRzKCkKK3ZvaWQgRnJhbWVMb2FkZXI6OmRpc3BhdGNoT25sb2FkRXZlbnRzKCkKIHsKLSAg ICBtX2NsaWVudC5kaXNwYXRjaERpZEhhbmRsZU9ubG9hZEV2ZW50cygpOworICAgIG1fY2xpZW50 LmRpc3BhdGNoRGlkRGlzcGF0Y2hPbmxvYWRFdmVudHMoKTsKIAogICAgIGlmIChkb2N1bWVudExv YWRlcigpKQotICAgICAgICBkb2N1bWVudExvYWRlcigpLT5oYW5kbGVkT25sb2FkRXZlbnRzKCk7 CisgICAgICAgIGRvY3VtZW50TG9hZGVyKCktPmRpc3BhdGNoT25sb2FkRXZlbnRzKCk7CiB9CiAK IHZvaWQgRnJhbWVMb2FkZXI6OmZyYW1lRGV0YWNoZWQoKQpAQCAtMjgyMiw3ICsyODIyLDcgQEAg Ym9vbCBGcmFtZUxvYWRlcjo6c2hvdWxkQ2xvc2UoKQogICAgICAgICBmb3IgKGkgPSAwOyBpIDwg dGFyZ2V0RnJhbWVzLnNpemUoKTsgaSsrKSB7CiAgICAgICAgICAgICBpZiAoIXRhcmdldEZyYW1l c1tpXS0+dHJlZSgpLmlzRGVzY2VuZGFudE9mKCZtX2ZyYW1lKSkKICAgICAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgICAgIGlmICghdGFyZ2V0RnJhbWVzW2ldLT5sb2FkZXIoKS5oYW5k bGVCZWZvcmVVbmxvYWRFdmVudChwYWdlLT5jaHJvbWUoKSwgdGhpcykpCisgICAgICAgICAgICBp ZiAoIXRhcmdldEZyYW1lc1tpXS0+bG9hZGVyKCkuZGlzcGF0Y2hCZWZvcmVVbmxvYWRFdmVudChw YWdlLT5jaHJvbWUoKSwgdGhpcykpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K IApAQCAtMjgzNyw3ICsyODM3LDcgQEAgYm9vbCBGcmFtZUxvYWRlcjo6c2hvdWxkQ2xvc2UoKQog ICAgIHJldHVybiBzaG91bGRDbG9zZTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6aGFuZGxlVW5s b2FkRXZlbnRzKFVubG9hZEV2ZW50UG9saWN5IHVubG9hZEV2ZW50UG9saWN5KQordm9pZCBGcmFt ZUxvYWRlcjo6ZGlzcGF0Y2hVbmxvYWRFdmVudHMoVW5sb2FkRXZlbnRQb2xpY3kgdW5sb2FkRXZl bnRQb2xpY3kpCiB7CiAgICAgaWYgKCFtX2ZyYW1lLmRvY3VtZW50KCkpCiAgICAgICAgIHJldHVy bjsKQEAgLTI4OTUsNyArMjg5NSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmhhbmRsZVVubG9hZEV2 ZW50cyhVbmwKICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5yZW1vdmVBbGxFdmVudExpc3Rl bmVycygpOwogfQogCi1ib29sIEZyYW1lTG9hZGVyOjpoYW5kbGVCZWZvcmVVbmxvYWRFdmVudChD aHJvbWUmIGNocm9tZSwgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyQmVpbmdOYXZpZ2F0ZWQpCiti b29sIEZyYW1lTG9hZGVyOjpkaXNwYXRjaEJlZm9yZVVubG9hZEV2ZW50KENocm9tZSYgY2hyb21l LCBGcmFtZUxvYWRlciogZnJhbWVMb2FkZXJCZWluZ05hdmlnYXRlZCkKIHsKICAgICBET01XaW5k b3cqIGRvbVdpbmRvdyA9IG1fZnJhbWUuZG9jdW1lbnQoKS0+ZG9tV2luZG93KCk7CiAgICAgaWYg KCFkb21XaW5kb3cpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkocmV2aXNp b24gMTkyMzMyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTIxMiw3ICsyMTIsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlY2VpdmVk Rmlyc3REYXRhKCk7CiAKLSAgICB2b2lkIGhhbmRsZWRPbmxvYWRFdmVudHMoKTsKKyAgICB2b2lk IGRpc3BhdGNoT25sb2FkRXZlbnRzKCk7CiAgICAgU3RyaW5nIHVzZXJBZ2VudChjb25zdCBVUkwm KSBjb25zdDsKIAogICAgIHZvaWQgZGlzcGF0Y2hEaWRDbGVhcldpbmRvd09iamVjdEluV29ybGQo RE9NV3JhcHBlcldvcmxkJik7CkBAIC0zMjAsOCArMzIwLDggQEAgcHJpdmF0ZToKIAogICAgIFN1 YnN0aXR1dGVEYXRhIGRlZmF1bHRTdWJzdGl0dXRlRGF0YUZvclVSTChjb25zdCBVUkwmKTsKIAot ICAgIGJvb2wgaGFuZGxlQmVmb3JlVW5sb2FkRXZlbnQoQ2hyb21lJiwgRnJhbWVMb2FkZXIqIGZy YW1lTG9hZGVyQmVpbmdOYXZpZ2F0ZWQpOwotICAgIHZvaWQgaGFuZGxlVW5sb2FkRXZlbnRzKFVu bG9hZEV2ZW50UG9saWN5KTsKKyAgICBib29sIGRpc3BhdGNoQmVmb3JlVW5sb2FkRXZlbnQoQ2hy b21lJiwgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyQmVpbmdOYXZpZ2F0ZWQpOworICAgIHZvaWQg ZGlzcGF0Y2hVbmxvYWRFdmVudHMoVW5sb2FkRXZlbnRQb2xpY3kpOwogCiAgICAgdm9pZCBjb250 aW51ZUxvYWRBZnRlck5hdmlnYXRpb25Qb2xpY3koY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFz c1JlZlB0cjxGb3JtU3RhdGU+LCBib29sIHNob3VsZENvbnRpbnVlLCBBbGxvd05hdmlnYXRpb25U b0ludmFsaWRVUkwpOwogICAgIHZvaWQgY29udGludWVMb2FkQWZ0ZXJOZXdXaW5kb3dQb2xpY3ko Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+LCBjb25zdCBTdHJp bmcmIGZyYW1lTmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYsIGJvb2wgc2hvdWxkQ29udGlu dWUsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgTmV3RnJhbWVPcGVuZXJQb2xpY3kpOwpJ bmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9u IDE5MjMzMikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTIsNyArMTUyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRGYWlsTG9hZGluZyhEb2N1bWVudExvYWRlcios IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VFcnJvciYpID0gMDsKICAg ICAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hl KERvY3VtZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYsIGludCBsZW5ndGgpID0gMDsKIAotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0 Y2hEaWRIYW5kbGVPbmxvYWRFdmVudHMoKSA9IDA7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNw YXRjaERpZERpc3BhdGNoT25sb2FkRXZlbnRzKCkgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQg ZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWQoKSA9IDA7 CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENoYW5nZVByb3Zpc2lvbmFsVVJMKCkg eyB9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNlbENsaWVudFJlZGlyZWN0 KCkgPSAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1 bGVyLmNwcAkocmV2aXNpb24gMTkyMzMyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmln YXRpb25TY2hlZHVsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODAsNyArMzgwLDcgQEAgTG9j a0JhY2tGb3J3YXJkTGlzdCBOYXZpZ2F0aW9uU2NoZWR1bGVyOgogewogICAgIC8vIE5vbi11c2Vy IG5hdmlnYXRpb24gYmVmb3JlIHRoZSBwYWdlIGhhcyBmaW5pc2hlZCBmaXJpbmcgb25sb2FkIHNo b3VsZCBub3QgY3JlYXRlIGEgbmV3IGJhY2svZm9yd2FyZCBpdGVtLgogICAgIC8vIFNlZSBodHRw czovL3dlYmtpdC5vcmcvYi80Mjg2MSBmb3IgdGhlIG9yaWdpbmFsIG1vdGl2YXRpb24gZm9yIHRo aXMuICAgIAotICAgIGlmICghU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJl KCkgJiYgdGFyZ2V0RnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSAmJiAhdGFyZ2V0RnJh bWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+d2FzT25sb2FkSGFuZGxlZCgpKQorICAgIGlm ICghU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkgJiYgdGFyZ2V0RnJh bWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSAmJiAhdGFyZ2V0RnJhbWUubG9hZGVyKCkuZG9j dW1lbnRMb2FkZXIoKS0+d2FzT25sb2FkRGlzcGF0Y2hlZCgpKQogICAgICAgICByZXR1cm4gTG9j a0JhY2tGb3J3YXJkTGlzdDo6WWVzOwogICAgIAogICAgIC8vIE5hdmlnYXRpb24gb2YgYSBzdWJm cmFtZSBkdXJpbmcgbG9hZGluZyBvZiBhbiBhbmNlc3RvciBmcmFtZSBkb2VzIG5vdCBjcmVhdGUg YSBuZXcgYmFjay9mb3J3YXJkIGl0ZW0uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTIzMzIp CisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NiBAQAorMjAxNS0xMS0xMSAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgorCisg ICAgICAgIFJlbmFtZSBoYW5kbGUuKkV2ZW50IHRvIGRpc3BhdGNoLipFdmVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMTY4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hl KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRGlz cGF0Y2hPbmxvYWRFdmVudHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRIYW5kbGVPbmxvYWRFdmVudHMpOiBEZWxldGVkLgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKwogMjAxNS0x MS0xMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZW1vdmUgYW4gdW5uZWNlc3NhcnkgemVyby1kZWxheSB0aW1lciBmcm9tIHN3aXBlIHNuYXBzaG90 IHJlbW92YWwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lv biAxOTIzMzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYyLDcgKzI2Miw3IEBA IGJvb2wgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkTG8KICAgICByZXR1cm4gZmFs c2U7CiB9CiAKLXZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkSGFuZGxlT25s b2FkRXZlbnRzKCkKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRGlzcGF0 Y2hPbmxvYWRFdmVudHMoKQogewogICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdl KCk7CiAgICAgaWYgKCF3ZWJQYWdlKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu aAkocmV2aXNpb24gMTkyMzMyKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw3ICs3 OCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkRmFpbExvYWRpbmco V2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgZGlz cGF0Y2hEaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoV2ViQ29yZTo6RG9jdW1lbnRMb2Fk ZXIqLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlJiwgaW50IGxlbmd0aCkgb3ZlcnJpZGU7CiAgICAgCi0gICAgdmlydHVhbCB2 b2lkIGRpc3BhdGNoRGlkSGFuZGxlT25sb2FkRXZlbnRzKCkgb3ZlcnJpZGU7CisgICAgdmlydHVh bCB2b2lkIGRpc3BhdGNoRGlkRGlzcGF0Y2hPbmxvYWRFdmVudHMoKSBvdmVycmlkZTsKICAgICB2 aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25h bExvYWQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VQcm92 aXNpb25hbFVSTCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNl bENsaWVudFJlZGlyZWN0KCkgb3ZlcnJpZGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lv biAxOTIzMzUpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNiBAQAorMjAxNS0xMS0xMSAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBw bGUuY29tPgorCisgICAgICAgIFJlbmFtZSBoYW5kbGUuKkV2ZW50IHRvIGRpc3BhdGNoLipFdmVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMTY4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGlkRmFpbExvYWRpbmcpOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGlkRGlzcGF0Y2hPbmxvYWRFdmVudHMpOgorICAgICAgICAoV2ViRnJhbWVM b2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkSGFuZGxlT25sb2FkRXZlbnRzKTogRGVsZXRlZC4KKwog MjAxNS0xMS0xMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbW92ZSBtb3JlIGRlYWQgY29udGV4dCBtZW51IGNvZGUKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu aAkocmV2aXNpb24gMTkyMzMyKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtOTUsNyArOTUsNyBAQCBw cml2YXRlOgogCiAgICAgdmlydHVhbCBOU0NhY2hlZFVSTFJlc3BvbnNlKiB3aWxsQ2FjaGVSZXNw b25zZShXZWJDb3JlOjpEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg TlNDYWNoZWRVUkxSZXNwb25zZSopIGNvbnN0IG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCB2b2lk IGRpc3BhdGNoRGlkSGFuZGxlT25sb2FkRXZlbnRzKCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2 b2lkIGRpc3BhdGNoRGlkRGlzcGF0Y2hPbmxvYWRFdmVudHMoKSBvdmVycmlkZTsKICAgICB2aXJ0 dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExv YWQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxDbGllbnRS ZWRpcmVjdCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaFdpbGxQZXJmb3Jt Q2xpZW50UmVkaXJlY3QoY29uc3QgV2ViQ29yZTo6VVJMJiwgZG91YmxlIGludGVydmFsLCBkb3Vi bGUgZmlyZURhdGUpIG92ZXJyaWRlOwpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0JKHJldmlzaW9uIDE5 MjMzMikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01NzEsNyArNTcxLDcgQEAgdm9pZCBXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGYQogICAgIHN0YXRpY19jYXN0PFdlYkRvY3VtZW50 TG9hZGVyTWFjKj4obG9hZGVyKS0+ZGVjcmVhc2VMb2FkQ291bnQoaWRlbnRpZmllcik7CiB9CiAK LXZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkSGFuZGxlT25sb2FkRXZlbnRz KCkKK3ZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRGlzcGF0Y2hPbmxvYWRF dmVudHMoKQogewogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBnZXRXZWJWaWV3KG1fd2ViRnJhbWUu Z2V0KCkpOwogICAgIFdlYkZyYW1lTG9hZERlbGVnYXRlSW1wbGVtZW50YXRpb25DYWNoZSogaW1w bGVtZW50YXRpb25zID0gV2ViVmlld0dldEZyYW1lTG9hZERlbGVnYXRlSW1wbGVtZW50YXRpb25z KHdlYlZpZXcpOwpJbmRleDogU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMTkyMzMyKQorKysgU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTUtMTEtMTEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZW5hbWUgaGFuZGxlLipFdmVudCB0byBkaXNwYXRjaC4qRXZlbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTE2OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNob3Vs ZENhY2hlUmVzcG9uc2UpOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo RGlkRGlzcGF0Y2hPbmxvYWRFdmVudHMpOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OmRpc3BhdGNoRGlkSGFuZGxlT25sb2FkRXZlbnRzKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDE1LTExLTExICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxlIGN1c3RvbSBt ZW51IGl0ZW1zIGluIFdlYktpdCBpbnN0ZWFkIG9mIFdlYkNvcmUgb24gV2luZG93cwpJbmRleDog U291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gMTkyMzMyKQorKysgU291cmNlL1dlYktpdC93aW4v V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMjMsNyArMzIzLDcgQEAgYm9vbCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2hvdWxkQ2FjaGVS ZQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERpZEhhbmRsZU9ubG9hZEV2ZW50cygpCit2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpk aXNwYXRjaERpZERpc3BhdGNoT25sb2FkRXZlbnRzKCkKIHsKICAgICBXZWJWaWV3KiB3ZWJWaWV3 ID0gbV93ZWJGcmFtZS0+d2ViVmlldygpOwogICAgIENPTVB0cjxJV2ViRnJhbWVMb2FkRGVsZWdh dGVQcml2YXRlPiBmcmFtZUxvYWREZWxlZ2F0ZVByaXY7CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJKHJl dmlzaW9uIDE5MjMzMikKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTc2LDcgKzc2LDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZhaWxMb2FkaW5nKFdlYkNvcmU6OkRvY3Vt ZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yJikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIHNob3VsZENhY2hlUmVzcG9u c2UoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25zdCB1bnNpZ25lZCBjaGFyKiBkYXRh LCB1bnNpZ25lZCBsb25nIGxvbmcgbGVuZ3RoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRj aERpZEhhbmRsZU9ubG9hZEV2ZW50cygpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBkaXNw YXRjaERpZERpc3BhdGNoT25sb2FkRXZlbnRzKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lk IGRpc3BhdGNoRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCkgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3Qo KSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0KGNvbnN0IFdlYkNvcmU6OlVSTCYsIGRvdWJsZSBpbnRlcnZhbCwgZG91YmxlIGZpcmVE YXRlKSBvdmVycmlkZTsK