263860 2023-10-29 19:19:36 -0700 [IFC][Ruby] Exclude inter-character annotation box from inline items 2023-10-30 05:29:14 -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 1988392 0 zalan 2023-10-29 19:19:36 -0700 ssia 1988393 1 468405 zalan 2023-10-29 19:26:38 -0700 Created attachment 468405 [fast-cq]Patch 1988464 2 ews-feeder 2023-10-30 05:28:40 -0700 Committed 269934@main (d8e2845bfd78): <https://commits.webkit.org/269934@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468405. 1988465 3 webkit-bug-importer 2023-10-30 05:29:14 -0700 <rdar://problem/117681835> 468405 2023-10-29 19:26:38 -0700 2023-10-30 05:28:40 -0700 [fast-cq]Patch bug-263860-20231029192637.patch text/plain 11661 zalan RnJvbSBlNGEyNjJiMjFiZjAyYTMyNmQ5YTE4NzJhZjdiMzRkOWQ2ZDllNzg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjkgT2N0IDIwMjMgMTk6MTk6NDYgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBFeGNsdWRlIGludGVyLWNoYXJhY3RlciBhbm5vdGF0aW9uIGJveCBmcm9tCiBpbmxpbmUg aXRlbXMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2Mzg2MAoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpXaGlsZSBvcmlnaW5hbGx5IGl0IHNlZW1lZCBsaWtl IGEgZ29vZCBpZGVhIHRvIHRyZWF0IGludGVyLWNoYXJhY3RlciBhbm5vdGF0aW9uIGJveCBhcyBy ZWd1bGFyCmF0b21pYyBpbmxpbmUgbGV2ZWwgYm94IGFuZCBsZXQgaW5saW5lIGxheW91dCB0YWtl IGNhcmUgb2YgKGlubGluZSBkaXJlY3Rpb24pIHBvc2l0aW9uaW5nLAppdCBsZXQgcmVndWxhciBp bmxpbmUgQ1NTIHByb3BlcnRpZXMgbGVhayBpbnRvIGl0IChlLmcuIGxldHRlciBzcGFjaW5nKS4K VGhpcyBwYXRjaCB0dXJucyBpbnRlci1jaGFyYWN0ZXIgaGFuZGxpbmcgdmVyeSBtdWNoIGxpa2Ug aW50ZXJsaW5lYXIuIEl0IGFsc28gaGVscHMgcmVhc29uCmFib3V0IG5vdCBoYXZpbmcgYW55IHR5 cGUgb2YgYW5ub3RhdGlvbiBib3ggcGFydCBvZiBpbmxpbmUgaXRlbXMuCgoqIExheW91dFRlc3Rz L2Zhc3QvcnVieS9ib3BvbW9mby1sZXR0ZXItc3BhY2luZy5odG1sOgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHA6 CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlSW5saW5lTGV2ZWxC b3gpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rp c3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRBdG9taWNJbmxpbmVMZXZlbERpc3Bs YXlCb3gpOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFw cGVuZElubGluZUJveERpc3BsYXlCb3gpOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmhhbmRsZUlubGluZUJveEVuZCk6CihXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kUnVieUFubm90YXRpb25Cb3gpOgooV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZEludGVybGlu ZWFyUnVieUFubm90YXRpb25Cb3gpOiBEZWxldGVkLgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZEludGVyY2hhcmFjdGVyUnVieUFubm90YXRpb25C b3gpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGlu Z0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OnBs YWNlUnVieUNvbnRlbnQpOgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6 OmxvZ2ljYVdpZHRoRm9yUnVieVJhbmdlIGNvbnN0KToKLS0tCiAuLi4vaW5saW5lL0lubGluZUl0 ZW1zQnVpbGRlci5jcHAgICAgICAgICAgICAgfCAgNyArKy0tCiAuLi4vZGlzcGxheS9JbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwICAgfCA0MSArKystLS0tLS0tLS0tLS0tLS0tCiAuLi4v ZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCAgICAgfCAgNCArLQogLi4uL2lu bGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgIHwgMjYgKysrLS0tLS0tLS0t CiA0IGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDY0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IGI0N2JkMDMxM2Ix ZS4uYjI2NDJhZDVlODZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRl ci5jcHAKQEAgLTc3MywxMSArNzczLDEwIEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5k bGVJbmxpbmVCb3hFbmQoY29uc3QgQm94JiBpbmxpbmVCb3gsIElubGluZUl0ZW1MaXN0CiAKIHZv aWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxh eW91dEJveCwgSW5saW5lSXRlbUxpc3QmIGlubGluZUl0ZW1MaXN0KQogeworICAgIGlmIChsYXlv dXRCb3guaXNSdWJ5QW5ub3RhdGlvbkJveCgpKQorICAgICAgICByZXR1cm47CisKICAgICBpZiAo bGF5b3V0Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewotICAgICAgICBpZiAobGF5b3V0 Qm94LmlzUnVieUFubm90YXRpb25Cb3goKSAmJiBsYXlvdXRCb3guc3R5bGUoKS5ydWJ5UG9zaXRp b24oKSAhPSBSdWJ5UG9zaXRpb246OkludGVyQ2hhcmFjdGVyKSB7Ci0gICAgICAgICAgICAvLyBp bnRlci1saW5lYXIgYW5ub3RhdGlvbiBib3hlcyBkbyBub3QgcGFydGljaXBhdGUgaW4gaW5saW5l IGxheW91dCAob25seSBpbnRlci1jaGFyYWN0ZXJzIGRvKS4KLSAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgfQogICAgICAgICBtX2lzTm9uQmlkaVRleHRBbmRGb3JjZWRMaW5lQnJlYWtPbmx5 Q29udGVudCA9IGZhbHNlOwogICAgICAgICByZXR1cm4gaW5saW5lSXRlbUxpc3QuYXBwZW5kKHsg bGF5b3V0Qm94LCBJbmxpbmVJdGVtOjpUeXBlOjpCb3ggfSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXIuY3BwCmluZGV4IDM2NTU2NTg3Y2IzZS4uMjI4YmFiZDk0NzRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXIuY3BwCkBAIC0zMDAsOSArMzAwLDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXI6OmFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxheUJveChjb25zdCBMaW5lOjoKICAgICBB U1NFUlQobGluZVJ1bi5sYXlvdXRCb3goKS5pc0F0b21pY0lubGluZUxldmVsQm94KCkpOwogICAg IGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKLSAgICBpZiAobGF5b3V0 Qm94LmlzUnVieUFubm90YXRpb25Cb3goKSkKLSAgICAgICAgcmV0dXJuIGFwcGVuZEludGVyY2hh cmFjdGVyUnVieUFubm90YXRpb25Cb3gobGluZVJ1biwgYm94ZXMpOwotCiAgICAgYXV0byYgc3R5 bGUgPSAhbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJv eC5zdHlsZSgpOwogICAgIGF1dG8gaXNDb250ZW50ZnVsID0gdHJ1ZTsKICAgICBhdXRvIGlua092 ZXJmbG93ID0gWyZdIHsKQEAgLTM5Niw5ICszOTMsMTAgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiBs aW4KICAgICAgICAgLCBpc0ZpcnN0TGFzdEJveChpbmxpbmVCb3gpCiAgICAgfSk7CiAKLSAgICBp ZiAobGF5b3V0Qm94LmlzUnVieUJhc2UoKSAmJiBpc0ludGVybGluZWFyQW5ub3RhdGlvbkJveChs YXlvdXRCb3guYXNzb2NpYXRlZFJ1YnlBbm5vdGF0aW9uQm94KCkpKSB7Ci0gICAgICAgIG1faW50 ZXJsaW5lYXJSdWJ5Q29sdW1uUmFuZ2VMaXN0LmFwcGVuZCh7IGJveGVzLnNpemUoKSAtIDEsIGJv eGVzLnNpemUoKSB9KTsKLSAgICAgICAgYXBwZW5kSW50ZXJsaW5lYXJSdWJ5QW5ub3RhdGlvbkJv eChsYXlvdXRCb3gsIGJveGVzKTsKKyAgICBpZiAobGF5b3V0Qm94LmlzUnVieUJhc2UoKSkgewor ICAgICAgICBpZiAoaXNJbnRlcmxpbmVhckFubm90YXRpb25Cb3gobGF5b3V0Qm94LmFzc29jaWF0 ZWRSdWJ5QW5ub3RhdGlvbkJveCgpKSkKKyAgICAgICAgICAgIG1faW50ZXJsaW5lYXJSdWJ5Q29s dW1uUmFuZ2VMaXN0LmFwcGVuZCh7IGJveGVzLnNpemUoKSAtIDEsIGJveGVzLnNpemUoKSB9KTsK KyAgICAgICAgYXBwZW5kUnVieUFubm90YXRpb25Cb3gobGF5b3V0Qm94LCBib3hlcyk7CiAgICAg fQogfQogCkBAIC00NTYsNyArNDU0LDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXI6OmhhbmRsZUlubGluZUJveEVuZChjb25zdCBMaW5lOjpSdW4mIGxpbmVSdW4sIGMKICAgICAg ICAgbV9pbnRlcmxpbmVhclJ1YnlDb2x1bW5SYW5nZUxpc3QubGFzdCgpID0geyBtX2ludGVybGlu ZWFyUnVieUNvbHVtblJhbmdlTGlzdC5sYXN0KCkuYmVnaW4oKSwgYm94ZXMuc2l6ZSgpIC0gMSB9 OwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIG1faW50ZXJDaGFyYWN0ZXJSdWJ5QmFzZSA9 ICZsaW5lUnVuLmxheW91dEJveCgpOwogfQogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6YXBwZW5kSW5saW5lRGlzcGxheUJveEF0QmlkaUJvdW5kYXJ5KGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBJbmxpbmVEaXNwbGF5OjpCb3hlcyYgYm94ZXMpCkBAIC00NzYsMTAgKzQ3Myw5IEBA IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJbmxpbmVEaXNwbGF5Qm94 QXRCaWRpQm91bmRhcnkoY29uc3QgQm94CiAgICAgfSk7CiB9CiAKLXZvaWQgSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJbnRlcmxpbmVhclJ1YnlBbm5vdGF0aW9uQm94KGNvbnN0 IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIElubGluZURpc3BsYXk6OkJveGVzJiBib3hlcykKK3Zv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRSdWJ5QW5ub3RhdGlvbkJveChj b25zdCBCb3gmIHJ1YnlCYXNlTGF5b3V0Qm94LCBJbmxpbmVEaXNwbGF5OjpCb3hlcyYgYm94ZXMp CiB7CiAgICAgQVNTRVJUKHJ1YnlCYXNlTGF5b3V0Qm94LmlzUnVieUJhc2UoKSk7Ci0gICAgQVNT RVJUKGlzSW50ZXJsaW5lYXJBbm5vdGF0aW9uQm94KHJ1YnlCYXNlTGF5b3V0Qm94LmFzc29jaWF0 ZWRSdWJ5QW5ub3RhdGlvbkJveCgpKSk7CiAKICAgICBhdXRvJiBhbm5vdGF0aW9uQm94ID0gKnJ1 YnlCYXNlTGF5b3V0Qm94LmFzc29jaWF0ZWRSdWJ5QW5ub3RhdGlvbkJveCgpOwogICAgIGF1dG8g cnVieUZvcm1hdHRpbmdDb250ZXh0ID0gUnVieUZvcm1hdHRpbmdDb250ZXh0IHsgZm9ybWF0dGlu Z0NvbnRleHQoKSB9OwpAQCAtNTA1LDMzICs1MDEsNiBAQCB2b2lkIElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6YXBwZW5kSW50ZXJsaW5lYXJSdWJ5QW5ub3RhdGlvbkJveChjb25zdCBCb3gm CiAgICAgfSk7CiB9CiAKLXZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJ bnRlcmNoYXJhY3RlclJ1YnlBbm5vdGF0aW9uQm94KGNvbnN0IExpbmU6OlJ1biYgbGluZVJ1biwg SW5saW5lRGlzcGxheTo6Qm94ZXMmIGJveGVzKQotewotICAgIGF1dG8mIGFubm90YXRpb25Cb3gg PSBsaW5lUnVuLmxheW91dEJveCgpOwotICAgIEFTU0VSVCghYW5ub3RhdGlvbkJveC5pc0ludGVy bGluZWFyUnVieUFubm90YXRpb25Cb3goKSk7Ci0gICAgYXV0byBydWJ5Rm9ybWF0dGluZ0NvbnRl eHQgPSBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQgeyBmb3JtYXR0aW5nQ29udGV4dCgpIH07Ci0gICAg YXV0byB2aXN1YWxCb3JkZXJCb3hUb3BMZWZ0ID0gcnVieUZvcm1hdHRpbmdDb250ZXh0LnBsYWNl QW5ub3RhdGlvbkJveCgqbV9pbnRlckNoYXJhY3RlclJ1YnlCYXNlKTsKLSAgICBhdXRvIHZpc3Vh bENvbnRlbnRCb3hTaXplID0gcnVieUZvcm1hdHRpbmdDb250ZXh0LnNpemVBbm5vdGF0aW9uQm94 KCptX2ludGVyQ2hhcmFjdGVyUnVieUJhc2UpOwotCi0gICAgYXV0byYgYW5ub3RhdGlvbkJveEdl b21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChhbm5vdGF0aW9uQm94 KTsKLSAgICBhbm5vdGF0aW9uQm94R2VvbWV0cnkuc2V0VG9wTGVmdCh0b0xheW91dFBvaW50KHZp c3VhbEJvcmRlckJveFRvcExlZnQpKTsKLSAgICBhbm5vdGF0aW9uQm94R2VvbWV0cnkuc2V0Q29u dGVudEJveFNpemUodG9MYXlvdXRTaXplKHZpc3VhbENvbnRlbnRCb3hTaXplKSk7Ci0KLSAgICBh dXRvIHZpc3VhbEJvcmRlckJveFJlY3QgPSBCb3hHZW9tZXRyeTo6Ym9yZGVyQm94UmVjdChhbm5v dGF0aW9uQm94R2VvbWV0cnkpOwotCi0gICAgYm94ZXMuYXBwZW5kKHsgbV9saW5lSW5kZXgKLSAg ICAgICAgLCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OkF0b21pY0lubGluZUxldmVsQm94Ci0g ICAgICAgICwgYW5ub3RhdGlvbkJveAotICAgICAgICAsIGxpbmVSdW4uYmlkaUxldmVsKCkKLSAg ICAgICAgLCB2aXN1YWxCb3JkZXJCb3hSZWN0Ci0gICAgICAgICwgdmlzdWFsQm9yZGVyQm94UmVj dAotICAgICAgICAsIHsgfQotICAgICAgICAsIHsgfQotICAgICAgICAsIHRydWUKLSAgICAgICAg LCBpc0xpbmVGdWxseVRydW5jYXRlZEluQmxvY2tEaXJlY3Rpb24oKQotICAgIH0pOwotfQotCiB2 b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KGNv bnN0IExpbmVMYXlvdXRSZXN1bHQmIGxpbmVMYXlvdXRSZXN1bHQsIGNvbnN0IExpbmVCb3gmIGxp bmVCb3gsIElubGluZURpc3BsYXk6OkJveGVzJiBib3hlcykKIHsKICNpZm5kZWYgTkRFQlVHCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXIuaAppbmRleCAwMzE4N2E3MTYyZTAuLmY1NWQ5OTRiY2M4MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxh eS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5oCkBAIC02MSw4ICs2MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhcHBlbmRJbmxp bmVCb3hEaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYsIGNvbnN0IElubGluZUxldmVsQm94Jiwg Y29uc3QgSW5saW5lUmVjdCYsIGJvb2wgbGluZWhhc0NvbnRlbnQsIElubGluZURpc3BsYXk6OkJv eGVzJik7CiAgICAgdm9pZCBhcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3goY29uc3Qg TGluZTo6UnVuJiwgY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgYm9v bCBsaW5laGFzQ29udGVudCwgSW5saW5lRGlzcGxheTo6Qm94ZXMmKTsKICAgICB2b2lkIGFwcGVu ZElubGluZURpc3BsYXlCb3hBdEJpZGlCb3VuZGFyeShjb25zdCBCb3gmLCBJbmxpbmVEaXNwbGF5 OjpCb3hlcyYpOwotICAgIHZvaWQgYXBwZW5kSW50ZXJsaW5lYXJSdWJ5QW5ub3RhdGlvbkJveChj b25zdCBCb3gmLCBJbmxpbmVEaXNwbGF5OjpCb3hlcyYpOwotICAgIHZvaWQgYXBwZW5kSW50ZXJj aGFyYWN0ZXJSdWJ5QW5ub3RhdGlvbkJveChjb25zdCBMaW5lOjpSdW4mLCBJbmxpbmVEaXNwbGF5 OjpCb3hlcyYpOworICAgIHZvaWQgYXBwZW5kUnVieUFubm90YXRpb25Cb3goY29uc3QgQm94JiBy dWJ5QmFzZUxheW91dEJveCwgSW5saW5lRGlzcGxheTo6Qm94ZXMmKTsKICAgICB2b2lkIGhhbmRs ZUlubGluZUJveEVuZChjb25zdCBMaW5lOjpSdW4mLCBjb25zdCBJbmxpbmVEaXNwbGF5OjpCb3hl cyYpOwogICAgIHZvaWQgYXBwbHlSdWJ5T3ZlcmhhbmcoSW5saW5lRGlzcGxheTo6Qm94ZXMmKTsK IApAQCAtOTYsNyArOTUsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9saW5lSXNGdWxseVRydW5j YXRlZEluQmxvY2tEaXJlY3Rpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9jb250ZW50SGFzSW5r T3ZlcmZsb3cgeyBmYWxzZSB9OwogICAgIFZlY3RvcjxXVEY6OlJhbmdlPHNpemVfdD4+IG1faW50 ZXJsaW5lYXJSdWJ5Q29sdW1uUmFuZ2VMaXN0OwotICAgIENoZWNrZWRQdHI8Y29uc3QgQm94PiBt X2ludGVyQ2hhcmFjdGVyUnVieUJhc2U7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMWU1MzlmMzk4ZThlLi4z MDZlZGMwYjY1NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3Jt YXR0aW5nQ29udGV4dC5jcHAKQEAgLTEyMywxMiArMTIzLDYgQEAgdm9pZCBSdWJ5Rm9ybWF0dGlu Z0NvbnRleHQ6OnBsYWNlUnVieUNvbnRlbnQoV1RGOjpSYW5nZTxzaXplX3Q+IGNhbmRpZGF0ZVJh bmdlLAogICAgICAgICAgICAgYXBwZW5kSW5saW5lTGV2ZWxJdGVtKHJ1YnlJdGVtLCBsb2dpY2Fs UmlnaHRTcGFjaW5nRm9yQmFzZSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQot ICAgICAgICBpZiAocnVieUxheW91dEJveC5pc1J1YnlBbm5vdGF0aW9uQm94KCkpIHsKLSAgICAg ICAgICAgIEFTU0VSVCghcnVieUxheW91dEJveC5pc0ludGVybGluZWFyUnVieUFubm90YXRpb25C b3goKSk7Ci0gICAgICAgICAgICBhcHBlbmRJbmxpbmVMZXZlbEl0ZW0ocnVieUl0ZW0pOwotICAg ICAgICAgICAgKytpbmRleDsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIH0KQEAgLTQ1OSwxMiArNDUzLDYgQEAg SW5saW5lTGF5b3V0VW5pdCBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmxvZ2ljYVdpZHRoRm9yUnVi eVJhbmdlKFdURjo6UmFuZ2U8c2l6ZV8KICAgICAgICAgaWYgKHJ1YnlMYXlvdXRCb3guaXNSdWJ5 QmFzZSgpKSB7CiAgICAgICAgICAgICBBU1NFUlQocnVieUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgp KTsKIAotICAgICAgICAgICAgYXV0byBpbnRlcmxpbmVhckFubm90YXRpb25NYXJnaW5Cb3hXaWR0 aCA9IFsmXSgpIC0+IElubGluZUxheW91dFVuaXQgewotICAgICAgICAgICAgICAgIGlmIChhdXRv KiBhbm5vdGF0aW9uQm94ID0gcnVieUxheW91dEJveC5hc3NvY2lhdGVkUnVieUFubm90YXRpb25C b3goKTsgaXNJbnRlcmxpbmVhckFubm90YXRpb24oYW5ub3RhdGlvbkJveCkpCi0gICAgICAgICAg ICAgICAgICAgIHJldHVybiBJbmxpbmVMYXlvdXRVbml0IHsgcGFyZW50Rm9ybWF0dGluZ0NvbnRl eHQoKS5nZW9tZXRyeUZvckJveCgqYW5ub3RhdGlvbkJveCkubWFyZ2luQm94V2lkdGgoKSB9Owot ICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgICAgICB9OwotCiAgICAgICAgICAg ICBhdXRvIGJhc2VMb2dpY2FsV2lkdGggPSBbJl0gewogICAgICAgICAgICAgICAgIC8vIEJhc2Ug Y29udGVudCBuZWVkcyBzcGVjaWFsIGhhbmRsaW5nIHdpdGggdGFraW5nIGFubm90YXRpb24gYm94 IGludG8gYWNjb3VudC4KICAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IElubGlu ZUxheW91dFVuaXQgeyB9OwpAQCAtNDgwLDE3ICs0NjgsMTMgQEAgSW5saW5lTGF5b3V0VW5pdCBS dWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OmxvZ2ljYVdpZHRoRm9yUnVieVJhbmdlKFdURjo6UmFuZ2U8 c2l6ZV8KICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAg ICAgICByZXR1cm4gSW5saW5lTGF5b3V0VW5pdCB7IH07CiAgICAgICAgICAgICB9OwotICAgICAg ICAgICAgY2FuZGlkYXRlQ29udGVudExvZ2ljYWxXaWR0aCArPSBzdGQ6Om1heChiYXNlTG9naWNh bFdpZHRoKCksIGludGVybGluZWFyQW5ub3RhdGlvbk1hcmdpbkJveFdpZHRoKCkpOworICAgICAg ICAgICAgaWYgKGF1dG8qIGFubm90YXRpb25Cb3ggPSBydWJ5TGF5b3V0Qm94LmFzc29jaWF0ZWRS dWJ5QW5ub3RhdGlvbkJveCgpKSB7CisgICAgICAgICAgICAgICAgYXV0byBhbm5vdGF0aW9uTWFy Z2luQm94V2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgcGFyZW50Rm9ybWF0dGluZ0NvbnRleHQo KS5nZW9tZXRyeUZvckJveCgqYW5ub3RhdGlvbkJveCkubWFyZ2luQm94V2lkdGgoKSB9OworICAg ICAgICAgICAgICAgIGNhbmRpZGF0ZUNvbnRlbnRMb2dpY2FsV2lkdGggKz0gaXNJbnRlcmxpbmVh ckFubm90YXRpb24oYW5ub3RhdGlvbkJveCkgPyBzdGQ6Om1heChiYXNlTG9naWNhbFdpZHRoKCks IGFubm90YXRpb25NYXJnaW5Cb3hXaWR0aCkgOiAoYmFzZUxvZ2ljYWxXaWR0aCgpICsgYW5ub3Rh dGlvbk1hcmdpbkJveFdpZHRoKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAg IGNhbmRpZGF0ZUNvbnRlbnRMb2dpY2FsV2lkdGggKz0gYmFzZUxvZ2ljYWxXaWR0aCgpOwogICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLQotICAgICAgICBpZiAocnVieUxheW91dEJv eC5pc1J1YnlBbm5vdGF0aW9uQm94KCkpIHsKLSAgICAgICAgICAgIEFTU0VSVCghcnVieUxheW91 dEJveC5pc0ludGVybGluZWFyUnVieUFubm90YXRpb25Cb3goKSk7Ci0gICAgICAgICAgICBjYW5k aWRhdGVDb250ZW50TG9naWNhbFdpZHRoICs9IElubGluZUxheW91dFVuaXQgeyBwYXJlbnRGb3Jt YXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KHJ1YnlMYXlvdXRCb3gpLm1hcmdpbkJveFdp ZHRoKCkgfTsKLSAgICAgICAgICAgICsraW5kZXg7Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgfQotCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KICAgICByZXR1 cm4gY2FuZGlkYXRlQ29udGVudExvZ2ljYWxXaWR0aDsK