257929 2023-06-09 18:32:31 -0700 [IFC] Remove inlineLayoutState::SetClearGapBeforeFirstLine from LineBuilder 2023-06-12 07:02:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1960898 0 zalan 2023-06-09 18:32:31 -0700 ssia 1960900 1 466659 zalan 2023-06-09 18:38:43 -0700 Created attachment 466659 Patch 1960930 2 466661 zalan 2023-06-10 05:55:06 -0700 Created attachment 466661 [fast-cq]Patch 1961017 3 ews-feeder 2023-06-12 07:01:06 -0700 Committed 265068@main (fc2cbdef688b): <https://commits.webkit.org/265068@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466661. 1961018 4 webkit-bug-importer 2023-06-12 07:02:17 -0700 <rdar://problem/110641429> 466659 2023-06-09 18:38:43 -0700 2023-06-10 05:55:04 -0700 Patch bug-257929-20230609183842.patch text/plain 8766 zalan RnJvbSA2OTkzMTY1OWUxNTU3MjI1M2I4YjAyMWQ0ZGI3YjQxOTFjNmNhOGVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgOSBKdW4gMjAyMyAxODozMjo0MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdIFJl bW92ZSBpbmxpbmVMYXlvdXRTdGF0ZTo6U2V0Q2xlYXJHYXBCZWZvcmVGaXJzdExpbmUKIGZyb20g TGluZUJ1aWxkZXIgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1Nzky OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZv ciBiZWluZyBhYmxlIHRvIHBhc3MgaW4gY29uc3QgSW5saW5lTGF5b3V0U3RhdGUmIHRvIExpbmVC dWlsZGVyLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMYXlvdXRTdGF0ZS5oOgoqIFNvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNw cDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgoo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6YWRqdXN0TGluZVJlY3RGb3JJbml0aWFsTGV0 dGVySWZBcHBsaWNhYmxlKTogTm8gbmVlZCB0byBjYWxsIGNsZWFyIGV2ZXIgc2luY2UgMjYzNTI5 QG1haW4gIltJRkNdIE1vdmUgbm9uLXBlcnNpc3RlbnQgZGF0YSBmcm9tIElubGluZUZvcm1hdHRp bmdTdGF0ZSB0byBJbmxpbmVMYXlvdXRTdGF0ZSIgYXMgdGhpcyBiaXQgaXMgbm90IHBlcnNpc3Rl bnQgYW55bW9yZS4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQnVpbGRlci5oOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 YmxvY2tMYXlvdXRTdGF0ZSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpp bmxpbmVMYXlvdXRTdGF0ZSBjb25zdCk6IERlbGV0ZWQuCi0tLQogLi4uL2lubGluZS9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICAgfCAgNiArKysrKysKIC4uLi9pbmxpbmUvSW5s aW5lTGF5b3V0U3RhdGUuaCAgICAgICAgICAgICAgICAgIHwgIDQgKystLQogLi4uL2lubGluZS9J bmxpbmVMaW5lQnVpbGRlci5jcHAgICAgICAgICAgICAgICAgfCAxNyArKysrKysrKy0tLS0tLS0t LQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oICAgICAgICAgICAgICAgICAgfCAgNSAr KystLQogNCBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5k ZXggNDBjYTM4MDIxMWI3Li5hNmMwZDQyOTk3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTI4MSw2ICsyODEsMTIgQEAgSW5saW5l TGF5b3V0UmVzdWx0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KGNvbnN0IElu bGluZUl0ZW1zJiBpbmxpbmUKIAogICAgICAgICBhdXRvIGxpbmVJbmRleCA9IHByZXZpb3VzTGlu ZSA/IChwcmV2aW91c0xpbmUtPmxpbmVJbmRleCArIDEpIDogMGx1OwogICAgICAgICBhdXRvIGxp bmVMb2dpY2FsUmVjdCA9IGNyZWF0ZURpc3BsYXlDb250ZW50Rm9yTGluZShsaW5lSW5kZXgsIGxp bmVMYXlvdXRSZXN1bHQsIGNvbnN0cmFpbnRzLCBpbmxpbmVMYXlvdXRTdGF0ZSwgbGF5b3V0UmVz dWx0LmRpc3BsYXlDb250ZW50KTsKKworICAgICAgICBpZiAoYXV0byBmaXJzdExpbmVHYXAgPSBs aW5lTGF5b3V0UmVzdWx0LmxpbmVHZW9tZXRyeS5pbml0aWFsTGV0dGVyQ2xlYXJHYXApIHsKKyAg ICAgICAgICAgIEFTU0VSVCghaW5saW5lTGF5b3V0U3RhdGUuY2xlYXJHYXBCZWZvcmVGaXJzdExp bmUoKSk7CisgICAgICAgICAgICBpbmxpbmVMYXlvdXRTdGF0ZS5zZXRDbGVhckdhcEJlZm9yZUZp cnN0TGluZSgqZmlyc3RMaW5lR2FwKTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChsaW5lTGF5 b3V0UmVzdWx0LmlzRmlyc3RMYXN0LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkKICAgICAg ICAgICAgIGlubGluZUxheW91dFN0YXRlLnNldENsZWFyR2FwQWZ0ZXJMYXN0TGluZShmb3JtYXR0 aW5nR2VvbWV0cnkoKS5sb2dpY2FsVG9wRm9yTmV4dExpbmUobGluZUxheW91dFJlc3VsdCwgbGlu ZUxvZ2ljYWxSZWN0LCBmbG9hdGluZ0NvbnRleHQpIC0gbGluZUxvZ2ljYWxSZWN0LmJvdHRvbSgp KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGF5b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxheW91dFN0YXRlLmgKaW5kZXggMzM0OTIwMDcx NjFhLi4yN2JjZmQ4OTg5NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxheW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGF5b3V0U3RhdGUu aApAQCAtNDgsOCArNDgsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgQmxvY2tMYXlvdXRT dGF0ZSYgbV9wYXJlbnRCbG9ja0xheW91dFN0YXRlOwotICAgIElubGluZUxheW91dFVuaXQgbV9j bGVhckdhcEJlZm9yZUZpcnN0TGluZSB7IDAgfTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IG1fY2xl YXJHYXBBZnRlckxhc3RMaW5lIHsgMCB9OworICAgIElubGluZUxheW91dFVuaXQgbV9jbGVhckdh cEJlZm9yZUZpcnN0TGluZSB7IDAuZiB9OworICAgIElubGluZUxheW91dFVuaXQgbV9jbGVhckdh cEFmdGVyTGFzdExpbmUgeyAwLmYgfTsKICAgICAvLyBGSVhNRTogVGhpcyBpcyByZXF1aXJlZCBi eSB0aGUgaW50ZWdhcmF0aW9uIGNvZGVwYXRoLgogICAgIEhhc2hNYXA8Y29uc3QgRWxlbWVudEJv eCosIExheW91dFVuaXQ+IG1fbmVzdGVkTGlzdE1hcmtlck9mZnNldHM7CiB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDc2MjRmZmJiM2M5OS4uYjc2MDNl ZDhhZjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0z NTcsNyArMzU3LDcgQEAgTGluZUJ1aWxkZXI6OkxheW91dFJlc3VsdCBMaW5lQnVpbGRlcjo6bGF5 b3V0SW5saW5lQ29udGVudChjb25zdCBMaW5lSW5wdXQmIGxpbmUKICAgICAgICAgICAgICwgbV9s aW5lLnJ1bnMoKQogICAgICAgICAgICAgLCB7IFdURk1vdmUobV9wbGFjZWRGbG9hdHMpLCBXVEZN b3ZlKG1fc3VzcGVuZGVkRmxvYXRzKSwgeyB9IH0KICAgICAgICAgICAgICwgeyB7IH0sIG1fbGlu ZS5jb250ZW50TG9naWNhbFdpZHRoKCksIHsgfSwgbGluZUNvbnRlbnQub3ZlcmZsb3dMb2dpY2Fs V2lkdGggfQotICAgICAgICAgICAgLCB7IG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKSwgeyB9 LCB7IH0gfQorICAgICAgICAgICAgLCB7IG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKSwgeyB9 LCB7IH0sIHsgfSB9CiAgICAgICAgIH07CiAgICAgfQogCkBAIC0zNjksNyArMzY5LDcgQEAgTGlu ZUJ1aWxkZXI6OkxheW91dFJlc3VsdCBMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVudChj b25zdCBMaW5lSW5wdXQmIGxpbmUKICAgICAgICAgLCBtX2xpbmUucnVucygpCiAgICAgICAgICwg eyBXVEZNb3ZlKG1fcGxhY2VkRmxvYXRzKSwgV1RGTW92ZShtX3N1c3BlbmRlZEZsb2F0cyksIG1f bGluZUlzQ29uc3RyYWluZWRCeUZsb2F0IH0KICAgICAgICAgLCB7IGNvbnRlbnRMb2dpY2FsTGVm dCwgbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgY29udGVudExvZ2ljYWxMZWZ0ICsgbV9s aW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbGluZUNvbnRlbnQub3ZlcmZsb3dMb2dpY2FsV2lk dGggfQotICAgICAgICAsIHsgbV9saW5lTG9naWNhbFJlY3QudG9wTGVmdCgpLCBtX2xpbmVMb2dp Y2FsUmVjdC53aWR0aCgpLCBtX2xpbmVJbml0aWFsTG9naWNhbFJlY3QubGVmdCgpICsgbV9pbml0 aWFsSW50cnVzaXZlRmxvYXRzV2lkdGggfQorICAgICAgICAsIHsgbV9saW5lTG9naWNhbFJlY3Qu dG9wTGVmdCgpLCBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpLCBtX2xpbmVJbml0aWFsTG9naWNh bFJlY3QubGVmdCgpICsgbV9pbml0aWFsSW50cnVzaXZlRmxvYXRzV2lkdGgsIG1faW5pdGlhbExl dHRlckNsZWFyR2FwIH0KICAgICAgICAgLCB7ICFtX2xpbmUuaXNIYW5naW5nVHJhaWxpbmdDb250 ZW50V2hpdGVzcGFjZSgpLCBtX2xpbmUuaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoKCkgfQog ICAgICAgICAsIHsgY29tcHV0ZWRWaXN1YWxPcmRlcihtX2xpbmUpLCBpbmxpbmVCYXNlRGlyZWN0 aW9uIH0KICAgICAgICAgLCB7IGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkgPyBMYXlvdXRSZXN1bHQ6 OklzRmlyc3RMYXN0OjpGaXJzdEZvcm1hdHRlZExpbmU6OldpdGhpbklGQyA6IExheW91dFJlc3Vs dDo6SXNGaXJzdExhc3Q6OkZpcnN0Rm9ybWF0dGVkTGluZTo6Tm8sIGlzTGFzdExpbmUgfQpAQCAt OTkyLDE5ICs5OTIsMTYgQEAgc3RkOjpvcHRpb25hbDxMaW5lQnVpbGRlcjo6SW5pdGlhbExldHRl ck9mZnNldHM+IExpbmVCdWlsZGVyOjphZGp1c3RMaW5lUmVjdEZvckkKIHsKICAgICBhdXRvIGRy b3AgPSBmbG9hdEJveC5zdHlsZSgpLmluaXRpYWxMZXR0ZXJEcm9wKCk7CiAgICAgYXV0byBpc0lu aXRpYWxMZXR0ZXIgPSBmbG9hdEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpICYmIGZsb2F0Qm94 LnN0eWxlKCkuc3R5bGVUeXBlKCkgPT0gUHNldWRvSWQ6OkZpcnN0TGV0dGVyICYmIGRyb3A7Ci0g ICAgaWYgKCFpc0luaXRpYWxMZXR0ZXIpIHsKLSAgICAgICAgaW5saW5lTGF5b3V0U3RhdGUoKS5z ZXRDbGVhckdhcEJlZm9yZUZpcnN0TGluZSh7IH0pOworICAgIGlmICghaXNJbml0aWFsTGV0dGVy KQogICAgICAgICByZXR1cm4geyB9OwotICAgIH0KKwogICAgIC8vIEhlcmUgd2UgdHJ5IHRvIHNl dCB0aGUgdmVydGljYWwgc3RhcnQgcG9zaXRpb24gZm9yIHRoZSBmbG9hdCBpbiBmbHVzaCB3aXRo IHRoZSBhZGpvaW5pbmcgdGV4dCBjb250ZW50J3MgY2FwIGhlaWdodC4KICAgICAvLyBJdCdzIGEg c3VwZXIgcHJlbWF0dXJlIGFzIGF0IHRoaXMgcG9pbnQgd2UgZG9uJ3Qgbm9ybWFsbHkgZGVhbCB3 aXRoIHZlcnRpY2FsIGdlb21ldHJ5IC1vdGhlciB0aGFuIHRoZSBpbmNvbWluZyB2ZXJ0aWNhbCBj b25zdHJhaW50LgogICAgIGF1dG8gaW5pdGlhbExldHRlckNhcEhlaWdodE9mZnNldCA9IGZvcm1h dHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1F1aXJrcygpLmluaXRpYWxMZXR0ZXJBbGlnbm1lbnRP ZmZzZXQoZmxvYXRCb3gsIHJvb3RTdHlsZSgpKTsKICAgICAvLyBXaGlsZSBpbml0aWFsLWxldHRl ciBiYXNlZCBmbG9hdHMgZG8gbm90IHNldCB0aGVpciBjbGVhciBwcm9wZXJ0eSwgaW50cnVzaXZl IGZsb2F0cyBmcm9tIHNpYmxpbmcgSUZDcyBhcmUgc3VwcG9zZWQgdG8gYmUgY2xlYXJlZC4KICAg ICBhdXRvIGludHJ1c2l2ZUJvdHRvbSA9IGJsb2NrTGF5b3V0U3RhdGUoKS5pbnRydXNpdmVJbml0 aWFsTGV0dGVyTG9naWNhbEJvdHRvbSgpOwotICAgIGlmICghaW5pdGlhbExldHRlckNhcEhlaWdo dE9mZnNldCAmJiAhaW50cnVzaXZlQm90dG9tKSB7Ci0gICAgICAgIGlubGluZUxheW91dFN0YXRl KCkuc2V0Q2xlYXJHYXBCZWZvcmVGaXJzdExpbmUoeyB9KTsKKyAgICBpZiAoIWluaXRpYWxMZXR0 ZXJDYXBIZWlnaHRPZmZzZXQgJiYgIWludHJ1c2l2ZUJvdHRvbSkKICAgICAgICAgcmV0dXJuIHsg fTsKLSAgICB9CiAKICAgICBhdXRvIGNsZWFyR2FwQmVmb3JlRmlyc3RMaW5lID0gSW5saW5lTGF5 b3V0VW5pdCB7IH07CiAgICAgaWYgKGludHJ1c2l2ZUJvdHRvbSkgewpAQCAtMTAzMyw3ICsxMDMw LDkgQEAgc3RkOjpvcHRpb25hbDxMaW5lQnVpbGRlcjo6SW5pdGlhbExldHRlck9mZnNldHM+IExp bmVCdWlsZGVyOjphZGp1c3RMaW5lUmVjdEZvckkKICAgICB9CiAKICAgICBtX2xpbmVMb2dpY2Fs UmVjdC5tb3ZlVmVydGljYWxseShjbGVhckdhcEJlZm9yZUZpcnN0TGluZSk7Ci0gICAgaW5saW5l TGF5b3V0U3RhdGUoKS5zZXRDbGVhckdhcEJlZm9yZUZpcnN0TGluZShjbGVhckdhcEJlZm9yZUZp cnN0TGluZSk7CisgICAgLy8gVGhlcmUgc2hvdWxkIG5ldmVyIGJlIG11bHRpcGxlIGluaXRpYWwg bGV0dGVycy4KKyAgICBBU1NFUlQoIW1faW5pdGlhbExldHRlckNsZWFyR2FwKTsKKyAgICBtX2lu aXRpYWxMZXR0ZXJDbGVhckdhcCA9IGNsZWFyR2FwQmVmb3JlRmlyc3RMaW5lOwogICAgIHJldHVy biBJbml0aWFsTGV0dGVyT2Zmc2V0cyB7IGluaXRpYWxMZXR0ZXJDYXBIZWlnaHRPZmZzZXQudmFs dWVfb3IoMF9sdSksIHN1bmtlbkJlbG93Rmlyc3RMaW5lT2Zmc2V0IH07CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IGJlMmNhZDZiNjY5NC4uN2MzZWYxZjQx YTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKQEAgLTcyLDYgKzcy LDcgQEAgcHVibGljOgogICAgICAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9naWNhbFRvcExl ZnQ7CiAgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7IDAuZiB9Owog ICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTG9naWNhbExlZnRJbmNsdWRpbmdJ bnRydXNpdmVGbG9hdHMgeyAwLmYgfTsKKyAgICAgICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5l TGF5b3V0VW5pdD4gaW5pdGlhbExldHRlckNsZWFyR2FwOwogICAgICAgICB9OwogICAgICAgICBM aW5lR2VvbWV0cnkgbGluZUdlb21ldHJ5IHsgfTsKIApAQCAtMTU2LDggKzE1Nyw3IEBAIHByaXZh dGU6CiAgICAgYm9vbCBpc0ZpcnN0Rm9ybWF0dGVkTGluZSgpIGNvbnN0IHsgcmV0dXJuICFtX3By ZXZpb3VzTGluZS5oYXNfdmFsdWUoKTsgfQogCiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDsgfQotICAgIElubGluZUxheW91dFN0YXRlJiBpbmxpbmVMYXlvdXRTdGF0ZSgp IGNvbnN0IHsgcmV0dXJuIG1faW5saW5lTGF5b3V0U3RhdGU7IH0KLSAgICBCbG9ja0xheW91dFN0 YXRlJiBibG9ja0xheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gaW5saW5lTGF5b3V0U3RhdGUo KS5wYXJlbnRCbG9ja0xheW91dFN0YXRlKCk7IH0KKyAgICBCbG9ja0xheW91dFN0YXRlJiBibG9j a0xheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVMYXlvdXRTdGF0ZS5wYXJlbnRC bG9ja0xheW91dFN0YXRlKCk7IH0KICAgICBGbG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlKCkg eyByZXR1cm4gYmxvY2tMYXlvdXRTdGF0ZSgpLmZsb2F0aW5nU3RhdGUoKTsgfQogICAgIGNvbnN0 IEZsb2F0aW5nU3RhdGUmIGZsb2F0aW5nU3RhdGUoKSBjb25zdCB7IHJldHVybiBjb25zdF9jYXN0 PExpbmVCdWlsZGVyJj4oKnRoaXMpLmZsb2F0aW5nU3RhdGUoKTsgfQogICAgIGNvbnN0IEVsZW1l bnRCb3gmIHJvb3QoKSBjb25zdDsKQEAgLTE4NSw2ICsxODUsNyBAQCBwcml2YXRlOgogICAgIFZl Y3RvcjxJbmxpbmVJdGVtPiBtX2xpbmVTcGFubmluZ0lubGluZUJveGVzOwogICAgIHVuc2lnbmVk IG1fc3VjY2Vzc2l2ZUh5cGhlbmF0ZWRMaW5lQ291bnQgeyAwIH07CiAgICAgYm9vbCBtX2xpbmVJ c0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07CisgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiBtX2luaXRpYWxMZXR0ZXJDbGVhckdhcDsKIH07CiAKIH0K 466661 2023-06-10 05:55:06 -0700 2023-06-12 07:01:07 -0700 [fast-cq]Patch bug-257929-20230610055505.patch text/plain 9117 zalan RnJvbSBhMDY5MTM1ZDZiYzM5Y2Y3NTQyOGI1NWEwY2UwOTc1NmFmODAyZDY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgOSBKdW4gMjAyMyAxODozMjo0MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdIFJl bW92ZSBpbmxpbmVMYXlvdXRTdGF0ZTo6U2V0Q2xlYXJHYXBCZWZvcmVGaXJzdExpbmUKIGZyb20g TGluZUJ1aWxkZXIgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1Nzky OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZv ciBiZWluZyBhYmxlIHRvIHBhc3MgaW4gY29uc3QgSW5saW5lTGF5b3V0U3RhdGUmIHRvIExpbmVC dWlsZGVyLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMYXlvdXRTdGF0ZS5oOgoqIFNvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNw cDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgoo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6YWRqdXN0TGluZVJlY3RGb3JJbml0aWFsTGV0 dGVySWZBcHBsaWNhYmxlKTogTm8gbmVlZCB0byBjYWxsIGNsZWFyIGV2ZXIgc2luY2UgMjYzNTI5 QG1haW4gIltJRkNdIE1vdmUgbm9uLXBlcnNpc3RlbnQgZGF0YSBmcm9tIElubGluZUZvcm1hdHRp bmdTdGF0ZSB0byBJbmxpbmVMYXlvdXRTdGF0ZSIgYXMgdGhpcyBiaXQgaXMgbm90IHBlcnNpc3Rl bnQgYW55bW9yZS4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQnVpbGRlci5oOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 YmxvY2tMYXlvdXRTdGF0ZSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpp bmxpbmVMYXlvdXRTdGF0ZSBjb25zdCk6IERlbGV0ZWQuCi0tLQogLi4uL2lubGluZS9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICB8ICA2ICsrKysrKwogLi4uL2lubGluZS9Jbmxp bmVMYXlvdXRTdGF0ZS5oICAgICAgICAgICAgICAgICB8ICA0ICsrLS0KIC4uLi9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICAgfCAxOCArKysrKysrKystLS0tLS0tLS0K IC4uLi9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaCAgICAgICAgICAgICAgICAgfCAgNSArKyst LQogNCBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXgg NDBjYTM4MDIxMWI3Li5hNmMwZDQyOTk3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTI4MSw2ICsyODEsMTIgQEAgSW5saW5lTGF5 b3V0UmVzdWx0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KGNvbnN0IElubGlu ZUl0ZW1zJiBpbmxpbmUKIAogICAgICAgICBhdXRvIGxpbmVJbmRleCA9IHByZXZpb3VzTGluZSA/ IChwcmV2aW91c0xpbmUtPmxpbmVJbmRleCArIDEpIDogMGx1OwogICAgICAgICBhdXRvIGxpbmVM b2dpY2FsUmVjdCA9IGNyZWF0ZURpc3BsYXlDb250ZW50Rm9yTGluZShsaW5lSW5kZXgsIGxpbmVM YXlvdXRSZXN1bHQsIGNvbnN0cmFpbnRzLCBpbmxpbmVMYXlvdXRTdGF0ZSwgbGF5b3V0UmVzdWx0 LmRpc3BsYXlDb250ZW50KTsKKworICAgICAgICBpZiAoYXV0byBmaXJzdExpbmVHYXAgPSBsaW5l TGF5b3V0UmVzdWx0LmxpbmVHZW9tZXRyeS5pbml0aWFsTGV0dGVyQ2xlYXJHYXApIHsKKyAgICAg ICAgICAgIEFTU0VSVCghaW5saW5lTGF5b3V0U3RhdGUuY2xlYXJHYXBCZWZvcmVGaXJzdExpbmUo KSk7CisgICAgICAgICAgICBpbmxpbmVMYXlvdXRTdGF0ZS5zZXRDbGVhckdhcEJlZm9yZUZpcnN0 TGluZSgqZmlyc3RMaW5lR2FwKTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChsaW5lTGF5b3V0 UmVzdWx0LmlzRmlyc3RMYXN0LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkKICAgICAgICAg ICAgIGlubGluZUxheW91dFN0YXRlLnNldENsZWFyR2FwQWZ0ZXJMYXN0TGluZShmb3JtYXR0aW5n R2VvbWV0cnkoKS5sb2dpY2FsVG9wRm9yTmV4dExpbmUobGluZUxheW91dFJlc3VsdCwgbGluZUxv Z2ljYWxSZWN0LCBmbG9hdGluZ0NvbnRleHQpIC0gbGluZUxvZ2ljYWxSZWN0LmJvdHRvbSgpKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGF5b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxheW91dFN0YXRlLmgKaW5kZXggMzM0OTIwMDcxNjFh Li4yN2JjZmQ4OTg5NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxheW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGF5b3V0U3RhdGUuaApA QCAtNDgsOCArNDgsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgQmxvY2tMYXlvdXRTdGF0 ZSYgbV9wYXJlbnRCbG9ja0xheW91dFN0YXRlOwotICAgIElubGluZUxheW91dFVuaXQgbV9jbGVh ckdhcEJlZm9yZUZpcnN0TGluZSB7IDAgfTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IG1fY2xlYXJH YXBBZnRlckxhc3RMaW5lIHsgMCB9OworICAgIElubGluZUxheW91dFVuaXQgbV9jbGVhckdhcEJl Zm9yZUZpcnN0TGluZSB7IDAuZiB9OworICAgIElubGluZUxheW91dFVuaXQgbV9jbGVhckdhcEFm dGVyTGFzdExpbmUgeyAwLmYgfTsKICAgICAvLyBGSVhNRTogVGhpcyBpcyByZXF1aXJlZCBieSB0 aGUgaW50ZWdhcmF0aW9uIGNvZGVwYXRoLgogICAgIEhhc2hNYXA8Y29uc3QgRWxlbWVudEJveCos IExheW91dFVuaXQ+IG1fbmVzdGVkTGlzdE1hcmtlck9mZnNldHM7CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDc2MjRmZmJiM2M5OS4uNzlkZjg2NjI4 M2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNTcs NyArMzU3LDcgQEAgTGluZUJ1aWxkZXI6OkxheW91dFJlc3VsdCBMaW5lQnVpbGRlcjo6bGF5b3V0 SW5saW5lQ29udGVudChjb25zdCBMaW5lSW5wdXQmIGxpbmUKICAgICAgICAgICAgICwgbV9saW5l LnJ1bnMoKQogICAgICAgICAgICAgLCB7IFdURk1vdmUobV9wbGFjZWRGbG9hdHMpLCBXVEZNb3Zl KG1fc3VzcGVuZGVkRmxvYXRzKSwgeyB9IH0KICAgICAgICAgICAgICwgeyB7IH0sIG1fbGluZS5j b250ZW50TG9naWNhbFdpZHRoKCksIHsgfSwgbGluZUNvbnRlbnQub3ZlcmZsb3dMb2dpY2FsV2lk dGggfQotICAgICAgICAgICAgLCB7IG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKSwgeyB9LCB7 IH0gfQorICAgICAgICAgICAgLCB7IG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKSwgeyB9LCB7 IH0sIHsgfSB9CiAgICAgICAgIH07CiAgICAgfQogCkBAIC0zNjksNyArMzY5LDcgQEAgTGluZUJ1 aWxkZXI6OkxheW91dFJlc3VsdCBMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVudChjb25z dCBMaW5lSW5wdXQmIGxpbmUKICAgICAgICAgLCBtX2xpbmUucnVucygpCiAgICAgICAgICwgeyBX VEZNb3ZlKG1fcGxhY2VkRmxvYXRzKSwgV1RGTW92ZShtX3N1c3BlbmRlZEZsb2F0cyksIG1fbGlu ZUlzQ29uc3RyYWluZWRCeUZsb2F0IH0KICAgICAgICAgLCB7IGNvbnRlbnRMb2dpY2FsTGVmdCwg bV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgY29udGVudExvZ2ljYWxMZWZ0ICsgbV9saW5l LmNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbGluZUNvbnRlbnQub3ZlcmZsb3dMb2dpY2FsV2lkdGgg fQotICAgICAgICAsIHsgbV9saW5lTG9naWNhbFJlY3QudG9wTGVmdCgpLCBtX2xpbmVMb2dpY2Fs UmVjdC53aWR0aCgpLCBtX2xpbmVJbml0aWFsTG9naWNhbFJlY3QubGVmdCgpICsgbV9pbml0aWFs SW50cnVzaXZlRmxvYXRzV2lkdGggfQorICAgICAgICAsIHsgbV9saW5lTG9naWNhbFJlY3QudG9w TGVmdCgpLCBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpLCBtX2xpbmVJbml0aWFsTG9naWNhbFJl Y3QubGVmdCgpICsgbV9pbml0aWFsSW50cnVzaXZlRmxvYXRzV2lkdGgsIG1faW5pdGlhbExldHRl ckNsZWFyR2FwIH0KICAgICAgICAgLCB7ICFtX2xpbmUuaXNIYW5naW5nVHJhaWxpbmdDb250ZW50 V2hpdGVzcGFjZSgpLCBtX2xpbmUuaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoKCkgfQogICAg ICAgICAsIHsgY29tcHV0ZWRWaXN1YWxPcmRlcihtX2xpbmUpLCBpbmxpbmVCYXNlRGlyZWN0aW9u IH0KICAgICAgICAgLCB7IGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkgPyBMYXlvdXRSZXN1bHQ6Oklz Rmlyc3RMYXN0OjpGaXJzdEZvcm1hdHRlZExpbmU6OldpdGhpbklGQyA6IExheW91dFJlc3VsdDo6 SXNGaXJzdExhc3Q6OkZpcnN0Rm9ybWF0dGVkTGluZTo6Tm8sIGlzTGFzdExpbmUgfQpAQCAtMzg4 LDYgKzM4OCw3IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmluaXRpYWxpemUoY29uc3QgSW5saW5lUmVj dCYgaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgY29uc3QgVXNlCiAgICAgbV93cmFwT3Bwb3J0dW5p dHlMaXN0LmNsZWFyKCk7CiAgICAgbV9vdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCA9IHsgfTsKICAg ICBtX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0gPSB7IH07CisgICAgbV9pbml0aWFsTGV0dGVyQ2xl YXJHYXAgPSB7IH07CiAKICAgICBhdXRvIGNyZWF0ZUxpbmVTcGFubmluZ0lubGluZUJveGVzID0g WyZdIHsKICAgICAgICAgYXV0byBpc1Jvb3RMYXlvdXRCb3ggPSBbJl0oYXV0byYgZWxlbWVudEJv eCkgewpAQCAtOTkyLDE5ICs5OTMsMTYgQEAgc3RkOjpvcHRpb25hbDxMaW5lQnVpbGRlcjo6SW5p dGlhbExldHRlck9mZnNldHM+IExpbmVCdWlsZGVyOjphZGp1c3RMaW5lUmVjdEZvckkKIHsKICAg ICBhdXRvIGRyb3AgPSBmbG9hdEJveC5zdHlsZSgpLmluaXRpYWxMZXR0ZXJEcm9wKCk7CiAgICAg YXV0byBpc0luaXRpYWxMZXR0ZXIgPSBmbG9hdEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpICYm IGZsb2F0Qm94LnN0eWxlKCkuc3R5bGVUeXBlKCkgPT0gUHNldWRvSWQ6OkZpcnN0TGV0dGVyICYm IGRyb3A7Ci0gICAgaWYgKCFpc0luaXRpYWxMZXR0ZXIpIHsKLSAgICAgICAgaW5saW5lTGF5b3V0 U3RhdGUoKS5zZXRDbGVhckdhcEJlZm9yZUZpcnN0TGluZSh7IH0pOworICAgIGlmICghaXNJbml0 aWFsTGV0dGVyKQogICAgICAgICByZXR1cm4geyB9OwotICAgIH0KKwogICAgIC8vIEhlcmUgd2Ug dHJ5IHRvIHNldCB0aGUgdmVydGljYWwgc3RhcnQgcG9zaXRpb24gZm9yIHRoZSBmbG9hdCBpbiBm bHVzaCB3aXRoIHRoZSBhZGpvaW5pbmcgdGV4dCBjb250ZW50J3MgY2FwIGhlaWdodC4KICAgICAv LyBJdCdzIGEgc3VwZXIgcHJlbWF0dXJlIGFzIGF0IHRoaXMgcG9pbnQgd2UgZG9uJ3Qgbm9ybWFs bHkgZGVhbCB3aXRoIHZlcnRpY2FsIGdlb21ldHJ5IC1vdGhlciB0aGFuIHRoZSBpbmNvbWluZyB2 ZXJ0aWNhbCBjb25zdHJhaW50LgogICAgIGF1dG8gaW5pdGlhbExldHRlckNhcEhlaWdodE9mZnNl dCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1F1aXJrcygpLmluaXRpYWxMZXR0ZXJB bGlnbm1lbnRPZmZzZXQoZmxvYXRCb3gsIHJvb3RTdHlsZSgpKTsKICAgICAvLyBXaGlsZSBpbml0 aWFsLWxldHRlciBiYXNlZCBmbG9hdHMgZG8gbm90IHNldCB0aGVpciBjbGVhciBwcm9wZXJ0eSwg aW50cnVzaXZlIGZsb2F0cyBmcm9tIHNpYmxpbmcgSUZDcyBhcmUgc3VwcG9zZWQgdG8gYmUgY2xl YXJlZC4KICAgICBhdXRvIGludHJ1c2l2ZUJvdHRvbSA9IGJsb2NrTGF5b3V0U3RhdGUoKS5pbnRy dXNpdmVJbml0aWFsTGV0dGVyTG9naWNhbEJvdHRvbSgpOwotICAgIGlmICghaW5pdGlhbExldHRl ckNhcEhlaWdodE9mZnNldCAmJiAhaW50cnVzaXZlQm90dG9tKSB7Ci0gICAgICAgIGlubGluZUxh eW91dFN0YXRlKCkuc2V0Q2xlYXJHYXBCZWZvcmVGaXJzdExpbmUoeyB9KTsKKyAgICBpZiAoIWlu aXRpYWxMZXR0ZXJDYXBIZWlnaHRPZmZzZXQgJiYgIWludHJ1c2l2ZUJvdHRvbSkKICAgICAgICAg cmV0dXJuIHsgfTsKLSAgICB9CiAKICAgICBhdXRvIGNsZWFyR2FwQmVmb3JlRmlyc3RMaW5lID0g SW5saW5lTGF5b3V0VW5pdCB7IH07CiAgICAgaWYgKGludHJ1c2l2ZUJvdHRvbSkgewpAQCAtMTAz Myw3ICsxMDMxLDkgQEAgc3RkOjpvcHRpb25hbDxMaW5lQnVpbGRlcjo6SW5pdGlhbExldHRlck9m ZnNldHM+IExpbmVCdWlsZGVyOjphZGp1c3RMaW5lUmVjdEZvckkKICAgICB9CiAKICAgICBtX2xp bmVMb2dpY2FsUmVjdC5tb3ZlVmVydGljYWxseShjbGVhckdhcEJlZm9yZUZpcnN0TGluZSk7Ci0g ICAgaW5saW5lTGF5b3V0U3RhdGUoKS5zZXRDbGVhckdhcEJlZm9yZUZpcnN0TGluZShjbGVhckdh cEJlZm9yZUZpcnN0TGluZSk7CisgICAgLy8gVGhlcmUgc2hvdWxkIG5ldmVyIGJlIG11bHRpcGxl IGluaXRpYWwgbGV0dGVycy4KKyAgICBBU1NFUlQoIW1faW5pdGlhbExldHRlckNsZWFyR2FwKTsK KyAgICBtX2luaXRpYWxMZXR0ZXJDbGVhckdhcCA9IGNsZWFyR2FwQmVmb3JlRmlyc3RMaW5lOwog ICAgIHJldHVybiBJbml0aWFsTGV0dGVyT2Zmc2V0cyB7IGluaXRpYWxMZXR0ZXJDYXBIZWlnaHRP ZmZzZXQudmFsdWVfb3IoMF9sdSksIHN1bmtlbkJlbG93Rmlyc3RMaW5lT2Zmc2V0IH07CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IGJlMmNhZDZiNjY5NC4u N2MzZWYxZjQxYTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKQEAg LTcyLDYgKzcyLDcgQEAgcHVibGljOgogICAgICAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbG9n aWNhbFRvcExlZnQ7CiAgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7 IDAuZiB9OwogICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpbml0aWFsTG9naWNhbExlZnRJ bmNsdWRpbmdJbnRydXNpdmVGbG9hdHMgeyAwLmYgfTsKKyAgICAgICAgICAgIHN0ZDo6b3B0aW9u YWw8SW5saW5lTGF5b3V0VW5pdD4gaW5pdGlhbExldHRlckNsZWFyR2FwOwogICAgICAgICB9Owog ICAgICAgICBMaW5lR2VvbWV0cnkgbGluZUdlb21ldHJ5IHsgfTsKIApAQCAtMTU2LDggKzE1Nyw3 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc0ZpcnN0Rm9ybWF0dGVkTGluZSgpIGNvbnN0IHsgcmV0 dXJuICFtX3ByZXZpb3VzTGluZS5oYXNfdmFsdWUoKTsgfQogCiAgICAgY29uc3QgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmxp bmVGb3JtYXR0aW5nQ29udGV4dDsgfQotICAgIElubGluZUxheW91dFN0YXRlJiBpbmxpbmVMYXlv dXRTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lTGF5b3V0U3RhdGU7IH0KLSAgICBCbG9j a0xheW91dFN0YXRlJiBibG9ja0xheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gaW5saW5lTGF5 b3V0U3RhdGUoKS5wYXJlbnRCbG9ja0xheW91dFN0YXRlKCk7IH0KKyAgICBCbG9ja0xheW91dFN0 YXRlJiBibG9ja0xheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVMYXlvdXRTdGF0 ZS5wYXJlbnRCbG9ja0xheW91dFN0YXRlKCk7IH0KICAgICBGbG9hdGluZ1N0YXRlJiBmbG9hdGlu Z1N0YXRlKCkgeyByZXR1cm4gYmxvY2tMYXlvdXRTdGF0ZSgpLmZsb2F0aW5nU3RhdGUoKTsgfQog ICAgIGNvbnN0IEZsb2F0aW5nU3RhdGUmIGZsb2F0aW5nU3RhdGUoKSBjb25zdCB7IHJldHVybiBj b25zdF9jYXN0PExpbmVCdWlsZGVyJj4oKnRoaXMpLmZsb2F0aW5nU3RhdGUoKTsgfQogICAgIGNv bnN0IEVsZW1lbnRCb3gmIHJvb3QoKSBjb25zdDsKQEAgLTE4NSw2ICsxODUsNyBAQCBwcml2YXRl OgogICAgIFZlY3RvcjxJbmxpbmVJdGVtPiBtX2xpbmVTcGFubmluZ0lubGluZUJveGVzOwogICAg IHVuc2lnbmVkIG1fc3VjY2Vzc2l2ZUh5cGhlbmF0ZWRMaW5lQ291bnQgeyAwIH07CiAgICAgYm9v bCBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07CisgICAgc3RkOjpvcHRpb25h bDxJbmxpbmVMYXlvdXRVbml0PiBtX2luaXRpYWxMZXR0ZXJDbGVhckdhcDsKIH07CiAKIH0K