192500 2018-12-07 10:14:10 -0800 [LFC] Rename formattingContext() to createFormattingContext() 2018-12-07 11:26:44 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1486022 0 koivisto 2018-12-07 10:14:10 -0800 It is not an accessor. 1486023 1 356818 koivisto 2018-12-07 10:16:21 -0800 Created attachment 356818 patch 1486024 2 356818 zalan 2018-12-07 10:17:20 -0800 Comment on attachment 356818 patch View in context: https://bugs.webkit.org/attachment.cgi?id=356818&action=review > Source/WebCore/layout/FormattingState.h:49 > + virtual std::unique_ptr<FormattingContext> createFormattingContext(const Box& formattingContextRoot) = 0; Very nice. I wonder who reviewed this originally. 1486026 3 koivisto 2018-12-07 10:22:29 -0800 > Very nice. I wonder who reviewed this originally. Probably someone using a watch for reviews. 1486027 4 356819 koivisto 2018-12-07 10:26:38 -0800 Created attachment 356819 patch 1486083 5 commit-queue 2018-12-07 11:19:03 -0800 The commit-queue encountered the following flaky tests while processing attachment 356819: imported/w3c/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.worker.html bug 192505 The commit-queue is continuing to process your patch. 1486086 6 commit-queue 2018-12-07 11:19:10 -0800 The commit-queue encountered the following flaky tests while processing attachment 356819: imported/w3c/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-3.htm bug 192506 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1486088 7 356819 commit-queue 2018-12-07 11:25:53 -0800 Comment on attachment 356819 patch Clearing flags on attachment: 356819 Committed r238961: <https://trac.webkit.org/changeset/238961> 1486089 8 commit-queue 2018-12-07 11:25:54 -0800 All reviewed patches have been landed. Closing bug. 1486091 9 webkit-bug-importer 2018-12-07 11:26:44 -0800 <rdar://problem/46559821> 356818 2018-12-07 10:16:21 -0800 2018-12-07 10:26:38 -0800 patch formattingcontext-rename.patch text/plain 6572 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzODk1MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEyLTA3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXSBSZW5hbWUgZm9ybWF0 dGluZ0NvbnRleHQoKSB0byBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dCgpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI1MDAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29u dGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRPdXRPZkZsb3dEZXNjZW5kYW50cyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L0Zvcm1h dHRpbmdTdGF0ZS5oOgorICAgICAgICAqIGxheW91dC9MYXlvdXRGb3JtYXR0aW5nU3RhdGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMYXlvdXRTdGF0ZTo6bGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRTdWJ0cmVlKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nU3RhdGU6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nU3RhdGU6OmZvcm1hdHRpbmdDb250ZXh0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRl Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290IGNvbnN0KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaDoKKwogMjAxOC0xMi0w NyAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T XSBEb24ndCB1cGRhdGUgQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBjdXJyZW50VGltZSB3aGlsZSBz Y3J1YmJpbmcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0 LmNwcAkocmV2aXNpb24gMjM4ODU5KQorKysgU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU0LDcgKzE1NCw3IEBAIHZvaWQgRm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0QKICAgICAgICAgY29tcHV0ZUJvcmRlckFu ZFBhZGRpbmcobGF5b3V0Qm94KTsKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd0hvcml6b250YWxH ZW9tZXRyeShsYXlvdXRCb3gpOwogCi0gICAgICAgIGxheW91dFN0YXRlLmNyZWF0ZUZvcm1hdHRp bmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5b3V0Qm94KS5mb3JtYXR0aW5nQ29u dGV4dChsYXlvdXRCb3gpLT5sYXlvdXQoKTsKKyAgICAgICAgbGF5b3V0U3RhdGUuY3JlYXRlRm9y bWF0dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChsYXlvdXRCb3gpLmNyZWF0ZUZv cm1hdHRpbmdDb250ZXh0KGxheW91dEJveCktPmxheW91dCgpOwogCiAgICAgICAgIGNvbXB1dGVP dXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KGxheW91dEJveCk7CiAgICAgICAgIGxheW91dE91dE9m Rmxvd0Rlc2NlbmRhbnRzKGxheW91dEJveCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Rm9ybWF0dGluZ1N0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdTdGF0ZS5oCShyZXZpc2lvbiAyMzg4NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ1N0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgY2xh c3MgRm9ybWF0dGluZ1N0YXRlIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5Gb3JtYXR0aW5nU3Rh dGUoKTsKIAotICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PmZv cm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSA9IDA7Cisg ICAgdmlydHVhbCBzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IGNyZWF0ZUZvcm1h dHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSA9IDA7CiAKICAg ICBGbG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9mbG9hdGlu Z1N0YXRlOyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRGb3JtYXR0aW5n U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRGb3Jt YXR0aW5nU3RhdGUuY3BwCShyZXZpc2lvbiAyMzg4NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sYXlv dXQvTGF5b3V0Rm9ybWF0dGluZ1N0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzgsNyArNzgs NyBAQCB2b2lkIExheW91dFN0YXRlOjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4CiB7CiAgICAgUkVM RUFTRV9BU1NFUlQobGF5b3V0Um9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwog ICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1h dHRpbmdSb290SWZOZWVkZWQobGF5b3V0Um9vdCk7Ci0gICAgYXV0byBmb3JtYXR0aW5nQ29udGV4 dCA9IGZvcm1hdHRpbmdTdGF0ZS5mb3JtYXR0aW5nQ29udGV4dChsYXlvdXRSb290KTsKKyAgICBh dXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gZm9ybWF0dGluZ1N0YXRlLmNyZWF0ZUZvcm1hdHRpbmdD b250ZXh0KGxheW91dFJvb3QpOwogICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXQoKTsKICAg ICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMobGF5b3V0Um9v dCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ1N0YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmNwcAkocmV2aXNpb24gMjM4ODU5 KQorKysgU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdTdGF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgQmxvY2tGb3JtYXR0 aW5nU3RhdGU6On5CbG9ja0Zvcm1hdHRpbmdTdAogewogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Rm9y bWF0dGluZ0NvbnRleHQ+IEJsb2NrRm9ybWF0dGluZ1N0YXRlOjpmb3JtYXR0aW5nQ29udGV4dChj b25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkKK3N0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0 aW5nQ29udGV4dD4gQmxvY2tGb3JtYXR0aW5nU3RhdGU6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0 KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KQogewogICAgIEFTU0VSVChmb3JtYXR0 aW5nQ29udGV4dFJvb3QuZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogICAg IHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ+KGZvcm1hdHRp bmdDb250ZXh0Um9vdCwgKnRoaXMpOwpJbmRleDogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuaAkocmV2 aXNpb24gMjM4ODU5KQorKysgU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw3IEBAIHB1 YmxpYzoKICAgICBCbG9ja0Zvcm1hdHRpbmdTdGF0ZShSZWY8RmxvYXRpbmdTdGF0ZT4mJiwgTGF5 b3V0U3RhdGUmKTsKICAgICB2aXJ0dWFsIH5CbG9ja0Zvcm1hdHRpbmdTdGF0ZSgpOwogCi0gICAg c3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBmb3JtYXR0aW5nQ29udGV4dChjb25z dCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgb3ZlcnJpZGU7CisgICAgc3RkOjp1bmlxdWVf cHRyPEZvcm1hdHRpbmdDb250ZXh0PiBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gm IGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgb3ZlcnJpZGU7CiB9OwogCiB9CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiAyMzg4NTkpCisrKyBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTM3Myw3ICszNzMsNyBAQCB2b2lkIElubGluZUZvcm1hdHRp bmdDb250ZXh0OjpsYXlvdXRGb3JtCiAgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcocm9vdCk7 CiAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKHJvb3QpOwogICAgIC8vIFN3aWNoIG92ZXIgdG8g dGhlIG5ldyBmb3JtYXR0aW5nIGNvbnRleHQgKHRoZSBvbmUgdGhhdCB0aGUgcm9vdCBjcmVhdGVz KS4KLSAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gbGF5b3V0U3RhdGUoKS5jcmVhdGVGb3Jt YXR0aW5nU3RhdGVGb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkKHJvb3QpLmZvcm1hdHRpbmdDb250 ZXh0KHJvb3QpOworICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBsYXlvdXRTdGF0ZSgpLmNy ZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQocm9vdCkuY3JlYXRl Rm9ybWF0dGluZ0NvbnRleHQocm9vdCk7CiAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dCgp OwogICAgIC8vIENvbWUgYmFjayBhbmQgZmluYWxpemUgdGhlIHJvb3QncyBoZWlnaHQgYW5kIG1h cmdpbi4KICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3QpOwpJbmRleDogU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ1N0YXRlLmgJKHJldmlzaW9uIDIzODg1OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oCSh3b3JraW5nIGNv cHkpCkBAIC00Myw3ICs0Myw3IEBAIHB1YmxpYzoKICAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUo UmVmPEZsb2F0aW5nU3RhdGU+JiYsIExheW91dFN0YXRlJik7CiAgICAgdmlydHVhbCB+SW5saW5l Rm9ybWF0dGluZ1N0YXRlKCk7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRl eHQ+IGZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSBv dmVycmlkZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IGNyZWF0ZUZv cm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSBvdmVycmlk ZTsKIAogICAgIElubGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQoKSB7IHJldHVybiBtX2lubGlu ZUNvbnRlbnQ7IH0KICAgICBJbmxpbmVJdGVtKiBsYXN0SW5saW5lSXRlbSgpIGNvbnN0IHsgcmV0 dXJuIG1faW5saW5lQ29udGVudC5pc0VtcHR5KCkgPyBudWxscHRyIDogbV9pbmxpbmVDb250ZW50 Lmxhc3QoKS5nZXQoKTsgfQo= 356819 2018-12-07 10:26:38 -0800 2018-12-07 11:25:53 -0800 patch formattingcontext-rename-2.patch text/plain 10074 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzODk1MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEyLTA3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXSBSZW5hbWUgZm9ybWF0 dGluZ0NvbnRleHQoKSB0byBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dCgpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI1MDAKKworICAgICAgICBSZXZp ZXdlZCBieSBaYWxhbiBCdWp0YXMuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0 aW5nU3RhdGUuaDoKKyAgICAgICAgKiBsYXlvdXQvTGF5b3V0Rm9ybWF0dGluZ1N0YXRlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGF5b3V0U3RhdGU6OmxheW91dEZvcm1hdHRpbmdD b250ZXh0U3VidHJlZSk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0 dGluZ1N0YXRlOjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrRm9ybWF0dGluZ1N0YXRlOjpmb3JtYXR0aW5nQ29udGV4dCk6IERlbGV0ZWQu CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5o OgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmg6CisKIDIwMTgtMTItMDcg IEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10g RG9uJ3QgdXBkYXRlIEFWUGxheWVyVmlld0NvbnRyb2xsZXIgY3VycmVudFRpbWUgd2hpbGUgc2Ny dWJiaW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAJKHJldmlzaW9uIDIzODg1OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NCw3ICsxNTQsNyBAQCB2b2lkIEZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZsb3dECiAgICAgICAgIGNvbXB1dGVCb3JkZXJBbmRQ YWRkaW5nKGxheW91dEJveCk7CiAgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dIb3Jpem9udGFsR2Vv bWV0cnkobGF5b3V0Qm94KTsKIAotICAgICAgICBsYXlvdXRTdGF0ZS5jcmVhdGVGb3JtYXR0aW5n U3RhdGVGb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkKGxheW91dEJveCkuZm9ybWF0dGluZ0NvbnRl eHQobGF5b3V0Qm94KS0+bGF5b3V0KCk7CisgICAgICAgIGxheW91dFN0YXRlLmNyZWF0ZUZvcm1h dHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5b3V0Qm94KS5jcmVhdGVGb3Jt YXR0aW5nQ29udGV4dChsYXlvdXRCb3gpLT5sYXlvdXQoKTsKIAogICAgICAgICBjb21wdXRlT3V0 T2ZGbG93VmVydGljYWxHZW9tZXRyeShsYXlvdXRCb3gpOwogICAgICAgICBsYXlvdXRPdXRPZkZs b3dEZXNjZW5kYW50cyhsYXlvdXRCb3gpOwpJbmRleDogU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAkocmV2aXNpb24gMjM4ODU5KQor KysgU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMzksNyArMjM5LDcgQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OgogICAgIC8vIFRoZW4gdGhlIHNocmluay10by1maXQgd2lkdGggaXM6 IG1pbihtYXgocHJlZmVycmVkIG1pbmltdW0gd2lkdGgsIGF2YWlsYWJsZSB3aWR0aCksIHByZWZl cnJlZCB3aWR0aCkuCiAgICAgYXV0byBhdmFpbGFibGVXaWR0aCA9IGxheW91dFN0YXRlLmRpc3Bs YXlCb3hGb3JMYXlvdXRCb3goKmZvcm1hdHRpbmdSb290LmNvbnRhaW5pbmdCbG9jaygpKS53aWR0 aCgpOwogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0YXRlLmNyZWF0ZUZvcm1h dHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQoZm9ybWF0dGluZ1Jvb3QpOwotICAg IGF1dG8gaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBmb3JtYXR0aW5nU3RhdGUuZm9ybWF0 dGluZ0NvbnRleHQoZm9ybWF0dGluZ1Jvb3QpLT5pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cygp OworICAgIGF1dG8gaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBmb3JtYXR0aW5nU3RhdGUu Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ1Jvb3QpLT5pbnN0cmluc2ljV2lkdGhD b25zdHJhaW50cygpOwogICAgIHJldHVybiBzdGQ6Om1pbihzdGQ6Om1heChpbnN0cmluc2ljV2lk dGhDb25zdHJhaW50cy5taW5pbXVtLCBhdmFpbGFibGVXaWR0aCksIGluc3RyaW5zaWNXaWR0aENv bnN0cmFpbnRzLm1heGltdW0pOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ1N0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdTdGF0ZS5oCShyZXZpc2lvbiAyMzg4NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Rm9ybWF0dGluZ1N0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgY2xhc3Mg Rm9ybWF0dGluZ1N0YXRlIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5Gb3JtYXR0aW5nU3RhdGUo KTsKIAotICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PmZvcm1h dHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSA9IDA7CisgICAg dmlydHVhbCBzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IGNyZWF0ZUZvcm1hdHRp bmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSA9IDA7CiAKICAgICBG bG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9mbG9hdGluZ1N0 YXRlOyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRGb3JtYXR0aW5nU3Rh dGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRGb3JtYXR0 aW5nU3RhdGUuY3BwCShyZXZpc2lvbiAyMzg4NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv TGF5b3V0Rm9ybWF0dGluZ1N0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzgsNyArNzgsNyBA QCB2b2lkIExheW91dFN0YXRlOjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4CiB7CiAgICAgUkVMRUFT RV9BU1NFUlQobGF5b3V0Um9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogICAg IGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRp bmdSb290SWZOZWVkZWQobGF5b3V0Um9vdCk7Ci0gICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9 IGZvcm1hdHRpbmdTdGF0ZS5mb3JtYXR0aW5nQ29udGV4dChsYXlvdXRSb290KTsKKyAgICBhdXRv IGZvcm1hdHRpbmdDb250ZXh0ID0gZm9ybWF0dGluZ1N0YXRlLmNyZWF0ZUZvcm1hdHRpbmdDb250 ZXh0KGxheW91dFJvb3QpOwogICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXQoKTsKICAgICBm b3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMobGF5b3V0Um9vdCk7 CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9y bWF0dGluZ0NvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAJKHJldmlzaW9uIDIzODg1 OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNCw3ICsxMzQsNyBAQCB2b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hCiAKICAgICBwcmVjb21wdXRlVmVydGlj YWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5b3V0Qm94KTsKICAgICAvLyBT d2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRoYXQgdGhl IHJvb3QgY3JlYXRlcykuCi0gICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dFN0YXRl KCkuY3JlYXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChsYXlvdXRC b3gpLmZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7CisgICAgYXV0byBmb3JtYXR0aW5nQ29u dGV4dCA9IGxheW91dFN0YXRlKCkuY3JlYXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jv b3RJZk5lZWRlZChsYXlvdXRCb3gpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7 CiAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dCgpOwogCiAgICAgLy8gQ29tZSBiYWNrIGFu ZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGdlb21ldHJ5LgpAQCAtNDE3LDcgKzQxNyw3IEBAIEZvcm1h dHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHIKICAgICAgICAgICAgICAgICBpZiAo IUdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50c05lZWRDaGlsZHJlbldpZHRoKGNo aWxkQm94KSkKICAgICAgICAgICAgICAgICAgICAgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMg PSBHZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMobGF5b3V0U3RhdGUsIGNoaWxk Qm94KTsKICAgICAgICAgICAgICAgICBlbHNlIGlmIChjaGlsZEJveC5lc3RhYmxpc2hlc0Zvcm1h dHRpbmdDb250ZXh0KCkpCi0gICAgICAgICAgICAgICAgICAgIGluc3RyaW5zaWNXaWR0aENvbnN0 cmFpbnRzID0gbGF5b3V0U3RhdGUuY3JlYXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jv b3RJZk5lZWRlZChjaGlsZEJveCkuZm9ybWF0dGluZ0NvbnRleHQoY2hpbGRCb3gpLT5pbnN0cmlu c2ljV2lkdGhDb25zdHJhaW50cygpOworICAgICAgICAgICAgICAgICAgICBpbnN0cmluc2ljV2lk dGhDb25zdHJhaW50cyA9IGxheW91dFN0YXRlLmNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1h dHRpbmdSb290SWZOZWVkZWQoY2hpbGRCb3gpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNoaWxk Qm94KS0+aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKTsKICAgICAgICAgICAgICAgICBmb3Jt YXR0aW5nU3RhdGUuc2V0SW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY2hpbGRCb3gsIGluc3Ry aW5zaWNXaWR0aENvbnN0cmFpbnRzKTsKIAogICAgICAgICAgICAgICAgIHF1ZXVlLnJlbW92ZUxh c3QoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nU3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuY3BwCShyZXZpc2lvbiAyMzg4NTkp CisrKyBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z1N0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBCbG9ja0Zvcm1hdHRp bmdTdGF0ZTo6fkJsb2NrRm9ybWF0dGluZ1N0CiB7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxGb3Jt YXR0aW5nQ29udGV4dD4gQmxvY2tGb3JtYXR0aW5nU3RhdGU6OmZvcm1hdHRpbmdDb250ZXh0KGNv bnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KQorc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRp bmdDb250ZXh0PiBCbG9ja0Zvcm1hdHRpbmdTdGF0ZTo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQo Y29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QpCiB7CiAgICAgQVNTRVJUKGZvcm1hdHRp bmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSk7CiAgICAg cmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8QmxvY2tGb3JtYXR0aW5nQ29udGV4dD4oZm9ybWF0dGlu Z0NvbnRleHRSb290LCAqdGhpcyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCShyZXZp c2lvbiAyMzg4NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ1N0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAgcHVi bGljOgogICAgIEJsb2NrRm9ybWF0dGluZ1N0YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmLCBMYXlv dXRTdGF0ZSYpOwogICAgIHZpcnR1YWwgfkJsb2NrRm9ybWF0dGluZ1N0YXRlKCk7CiAKLSAgICBz dGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IGZvcm1hdHRpbmdDb250ZXh0KGNvbnN0 IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSBvdmVycmlkZTsKKyAgICBzdGQ6OnVuaXF1ZV9w dHI8Rm9ybWF0dGluZ0NvbnRleHQ+IGNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYg Zm9ybWF0dGluZ0NvbnRleHRSb290KSBvdmVycmlkZTsKIH07CiAKIH0KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAJKHJldmlzaW9uIDIzODg1OSkKKysrIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzczLDcgKzM3Myw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dEZvcm0KICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhyb290KTsK ICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4ocm9vdCk7CiAgICAgLy8gU3dpY2ggb3ZlciB0byB0 aGUgbmV3IGZvcm1hdHRpbmcgY29udGV4dCAodGhlIG9uZSB0aGF0IHRoZSByb290IGNyZWF0ZXMp LgotICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBsYXlvdXRTdGF0ZSgpLmNyZWF0ZUZvcm1h dHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQocm9vdCkuZm9ybWF0dGluZ0NvbnRl eHQocm9vdCk7CisgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dFN0YXRlKCkuY3Jl YXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChyb290KS5jcmVhdGVG b3JtYXR0aW5nQ29udGV4dChyb290KTsKICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0KCk7 CiAgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdodCBhbmQgbWFy Z2luLgogICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9vdCk7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdTdGF0ZS5jcHAJKHJldmlzaW9uIDIzODg1OSkKKysrIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgSW5saW5lRm9ybWF0dGluZ1N0YXRlOjp+SW5saW5l Rm9ybWF0dGluZwogewogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IElu bGluZUZvcm1hdHRpbmdTdGF0ZTo6Zm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0 aW5nQ29udGV4dFJvb3QpCitzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IElubGlu ZUZvcm1hdHRpbmdTdGF0ZTo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3Jt YXR0aW5nQ29udGV4dFJvb3QpCiB7CiAgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5l c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpOwogICAgIHJldHVybiBzdGQ6Om1h a2VfdW5pcXVlPElubGluZUZvcm1hdHRpbmdDb250ZXh0Pihmb3JtYXR0aW5nQ29udGV4dFJvb3Qs ICp0aGlzKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdTdGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oCShyZXZpc2lvbiAyMzg4 NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nU3RhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAg ICAgSW5saW5lRm9ybWF0dGluZ1N0YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmLCBMYXlvdXRTdGF0 ZSYpOwogICAgIHZpcnR1YWwgfklubGluZUZvcm1hdHRpbmdTdGF0ZSgpOwogCi0gICAgc3RkOjp1 bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBmb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gm IGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgb3ZlcnJpZGU7CisgICAgc3RkOjp1bmlxdWVfcHRyPEZv cm1hdHRpbmdDb250ZXh0PiBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1h dHRpbmdDb250ZXh0Um9vdCkgb3ZlcnJpZGU7CiAKICAgICBJbmxpbmVDb250ZW50JiBpbmxpbmVD b250ZW50KCkgeyByZXR1cm4gbV9pbmxpbmVDb250ZW50OyB9CiAgICAgSW5saW5lSXRlbSogbGFz dElubGluZUl0ZW0oKSBjb25zdCB7IHJldHVybiBtX2lubGluZUNvbnRlbnQuaXNFbXB0eSgpID8g bnVsbHB0ciA6IG1faW5saW5lQ29udGVudC5sYXN0KCkuZ2V0KCk7IH0K