234285 2021-12-13 19:58:59 -0800 [LFC][IFC] Make the LineBox content (text runs and inline level boxes) relative to the root inline box. 2021-12-14 09:23:21 -0800 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 1823880 0 zalan 2021-12-13 19:58:59 -0800 This is in preparation for handling text alignment with non-LTR content. 1823881 1 447097 zalan 2021-12-13 20:02:49 -0800 Created attachment 447097 Patch 1824022 2 ews-feeder 2021-12-14 09:22:00 -0800 Committed r287028 (?): <https://commits.webkit.org/r287028> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447097. 1824023 3 webkit-bug-importer 2021-12-14 09:23:21 -0800 <rdar://problem/86473211> 447097 2021-12-13 20:02:49 -0800 2021-12-14 09:22:03 -0800 Patch bug-234285-20211213200248.patch text/plain 9809 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTkxMWE2MGQ4M2Y0OTZm ZTY3MGY3MWQyNWNlMGQ4ZWM0MGZkN2U1MS4uNjNlNjE2ZTMyMGM4YjBjMTljZmY1MmIxYmEwZTdj M2NkM2M3MzgwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEyLTEzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgdGhl IExpbmVCb3ggY29udGVudCAodGV4dCBydW5zIGFuZCBpbmxpbmUgbGV2ZWwgYm94ZXMpIHJlbGF0 aXZlIHRvIHRoZSByb290IGlubGluZSBib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQyODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBMZXQncyBkZWNvdXBsZSB0aGUgcm9vdCBpbmxpbmUgYm94J3Mg bG9naWNhbCBsZWZ0IGFuZCB0aGUgdGV4dC1hbGlnbiBiYXNlZCBob3Jpem9udGFsIG9mZnNldCBh bmQKKyAgICAgICAgYWxzbyBtYWtlIHRoZSBjb250ZW50IGluc2lkZSB0aGUgcm9vdCBpbmxpbmUg Ym94IHJlbGF0aXZlIHRvIGl0LgorICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBo YW5kbGluZyB0ZXh0LWFsaWduIHdpdGggbm9uLVJUTCBjb250ZW50LgorCisgICAgICAgICogbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpwcm9jZXNzTm9uQmlkaUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudCk6CisgICAgICAg ICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4gY29uc3QpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6cm9vdElubGluZUJveEFsaWdubWVu dE9mZnNldCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94QnVpbGRlcjo6YnVpbGQpOgorCiAyMDIxLTEyLTEzICBBbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIFNpbXBsZSBSVEwgY29udGVudCBkb2Vz IG5vdCBuZWVkIHZpc3VhbCByZW9yZGVyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA5MWE2ZTQ3M2MxNGMxMDAzZWZk N2Y0ZGYzZmRiZjNiMGRmZGE1OTgwLi5hYTIwNmZmZjcyNWJmNWVmMWI3MGFmYTY0YjczNTlmMWUy ZmVjZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5jcHAKQEAgLTI4OSwxMSArMjg5LDEzIEBAIHZvaWQgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjphcHBlbmRJbmxpbmVEaXNwbGF5Qm94QXRCaWRpQm91bmRhcnkoY29uc3Qg Qm94CiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250 ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IExp bmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNhbFRv cExlZnQsIERpc3BsYXlCb3hlcyYgYm94ZXMpCiB7CiAgICAgLy8gQ3JlYXRlIHRoZSBpbmxpbmUg Ym94ZXMgb24gdGhlIGN1cnJlbnQgbGluZS4gVGhpcyBpcyBtb3N0bHkgdGV4dCBhbmQgYXRvbWlj IGlubGluZSBib3hlcy4KKyAgICBhdXRvIHJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZzZXQgPSBs aW5lQm94LnJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZzZXQoKTsKKwogICAgIGZvciAoYXV0byYg bGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0g bGluZVJ1bi5sYXlvdXRCb3goKTsKIAogICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0UmVsYXRpdmVU b1Jvb3QgPSBbJl0oYXV0byBsb2dpY2FsUmVjdCkgewotICAgICAgICAgICAgbG9naWNhbFJlY3Qu bW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgICAgICBsb2dpY2FsUmVjdC5t b3ZlQnkoeyBsaW5lQm94TG9naWNhbFRvcExlZnQueCgpICsgcm9vdElubGluZUJveEFsaWdubWVu dE9mZnNldCwgbGluZUJveExvZ2ljYWxUb3BMZWZ0LnkoKSB9KTsKICAgICAgICAgICAgIHJldHVy biBsb2dpY2FsUmVjdDsKICAgICAgICAgfTsKIApAQCAtNDgxLDYgKzQ4Myw3IEBAIHZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250CiAgICAgYXV0byBkaXNwbGF5Qm94VHJlZSA9IERpc3BsYXlCb3hUcmVl IHsgfTsKICAgICBhbmNlc3RvclN0YWNrLnB1c2goeyB9LCByb290KCkpOwogCisgICAgYXV0byBy b290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0ID0gbGluZUJveC5yb290SW5saW5lQm94QWxpZ25t ZW50T2Zmc2V0KCk7CiAgICAgYXV0byBjb250ZW50U3RhcnRJblZpc3VhbE9yZGVyID0gSW5saW5l TGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVy ID0gWyZdIHsKICAgICAgICAgYXV0byByb290SW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNh bFJlY3RGb3JSb290SW5saW5lQm94KCk7CkBAIC00OTAsNyArNDkzLDcgQEAgdm9pZCBJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRl cjo6TGluZUNvbnQKICAgICAgICAgICAgIGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXIgKz0gbGlu ZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aCAtIHJvb3RJbmxpbmVCb3hSZWN0LndpZHRoKCk7CiAg ICAgICAgIH0KICAgICAgICAgLy8gQWRqdXN0IHRoZSBjb250ZW50IHN0YXJ0IHBvc2l0aW9uIHdp dGggdGhlICh0ZXh0KWFsaWdubWVudCBvZmZzZXQgKHJvb3QgaW5saW5lIGJveCBoYXMgdGhlIGFs aWdubWVudCBvZmZzZXQgYW5kIG5vdCB0aGUgaW5kaXZpZHVhbCBydW5zKS4KLSAgICAgICAgY29u dGVudFN0YXJ0SW5WaXN1YWxPcmRlciArPSByb290SW5saW5lQm94UmVjdC5sZWZ0KCk7CisgICAg ICAgIGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXIgKz0gcm9vdElubGluZUJveEFsaWdubWVudE9m ZnNldDsKIAogICAgICAgICBhdXRvIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgPSBjb250ZW50 U3RhcnRJblZpc3VhbE9yZGVyOwogICAgICAgICBhdXRvJiBydW5zID0gbGluZUNvbnRlbnQucnVu czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKaW5kZXggZjU0NTEzMzQ1YTYzNmEz NjZhZTk1ODNlZWRkYzUyMzYwMzU3NTVhNS4uYjUyNzEyNzgwOTdmZThiNjdjYzAzM2ZhM2EzOWIx YTAyZWI0MTlkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKQEAgLTM0LDgg KzM0LDkgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1MaW5l Qm94OjpMaW5lQm94KGNvbnN0IEJveCYgcm9vdExheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwg c2l6ZV90IGxpbmVJbmRleCwgc2l6ZV90IG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCkK LSAgICA6IG1fcm9vdElubGluZUJveCh7IHJvb3RMYXlvdXRCb3gsICFsaW5lSW5kZXggPyByb290 TGF5b3V0Qm94LmZpcnN0TGluZVN0eWxlKCkgOiByb290TGF5b3V0Qm94LnN0eWxlKCksIGNvbnRl bnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHsg fSB9LCBJbmxpbmVMZXZlbEJveDo6VHlwZTo6Um9vdElubGluZUJveCB9KQorTGluZUJveDo6TGlu ZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgcm9vdElubGlu ZUJveEFsaWdubWVudE9mZnNldCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRo LCBzaXplX3QgbGluZUluZGV4LCBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 KQorICAgIDogbV9yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KHJvb3RJbmxpbmVCb3hBbGln bm1lbnRPZmZzZXQpCisgICAgLCBtX3Jvb3RJbmxpbmVCb3goeyByb290TGF5b3V0Qm94LCAhbGlu ZUluZGV4ID8gcm9vdExheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDogcm9vdExheW91dEJveC5z dHlsZSgpLCB7IH0sIElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0g fSwgSW5saW5lTGV2ZWxCb3g6OlR5cGU6OlJvb3RJbmxpbmVCb3ggfSkKIHsKICAgICBtX25vblJv b3RJbmxpbmVMZXZlbEJveExpc3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShub25TcGFubmluZ0lu bGluZUxldmVsQm94Q291bnQpOwogICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TWFwLnJlc2Vy dmVJbml0aWFsQ2FwYWNpdHkobm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50KTsKQEAgLTYy LDcgKzYzLDcgQEAgSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4oY29u c3QgTGluZTo6UnVuJiBydW4pIGNvbnN0CiAgICAgICAgIHJ1bmxvZ2ljYWxUb3AgKz0gcGFyZW50 SW5saW5lQm94LT5sb2dpY2FsVG9wKCk7CiAgICAgfQogICAgIElubGluZUxheW91dFVuaXQgbG9n aWNhbEhlaWdodCA9IGZvbnRNZXRyaWNzLmhlaWdodCgpOwotICAgIHJldHVybiB7IHJ1bmxvZ2lj YWxUb3AsIG1fcm9vdElubGluZUJveC5sb2dpY2FsTGVmdCgpICsgcnVuLmxvZ2ljYWxMZWZ0KCks IHJ1bi5sb2dpY2FsV2lkdGgoKSwgbG9naWNhbEhlaWdodCB9OworICAgIHJldHVybiB7IHJ1bmxv Z2ljYWxUb3AsIHJ1bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFdpZHRoKCksIGxvZ2ljYWxI ZWlnaHQgfTsKIH0KIAogSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2FsUmVjdEZvckxpbmVCcmVh a0JveChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC b3guaAppbmRleCBhNWJkYjZjYTgzN2Q3NTk0ODgxZTgyOTY5MTE5YWQxNGE4YzdhNGNiLi44OGQ4 MDIxMmMwODU4Mzk3YTA5ODY2MTdiYjk1M2I2ZWNlMDQ0NzI2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJveC5oCkBAIC01OSw3ICs1OSw3IEBAIGNsYXNzIExpbmVCb3hWZXJ0aWNhbEFsaWdu ZXI7CiBjbGFzcyBMaW5lQm94IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1Ymxp YzoKLSAgICBMaW5lQm94KGNvbnN0IEJveCYgcm9vdExheW91dEJveCwgSW5saW5lTGF5b3V0VW5p dCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0 aCwgc2l6ZV90IGxpbmVJbmRleCwgc2l6ZV90IG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3Vu dCk7CisgICAgTGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIElubGluZUxheW91dFVu aXQgcm9vdElubGluZUJveEFsaWdubWVudE9mZnNldCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbFdpZHRoLCBzaXplX3QgbGluZUluZGV4LCBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVM ZXZlbEJveENvdW50KTsKIAogICAgIC8vIE5vdGUgdGhhdCB0aGUgbGluZSBjYW4gaGF2ZSBtYW55 IGlubGluZSBib3hlcyBhbmQgYmUgImVtcHR5IiB0aGUgc2FtZSB0aW1lIGUuZy4gPGRpdj48c3Bh bj48L3NwYW4+PHNwYW4+PC9zcGFuPjwvZGl2PgogICAgIGJvb2wgaGFzQ29udGVudCgpIGNvbnN0 IHsgcmV0dXJuIG1faGFzQ29udGVudDsgfQpAQCAtNzksNiArNzksOCBAQCBwdWJsaWM6CiAgICAg dXNpbmcgSW5saW5lTGV2ZWxCb3hMaXN0ID0gVmVjdG9yPElubGluZUxldmVsQm94PjsKICAgICBj b25zdCBJbmxpbmVMZXZlbEJveExpc3QmIG5vblJvb3RJbmxpbmVMZXZlbEJveGVzKCkgY29uc3Qg eyByZXR1cm4gbV9ub25Sb290SW5saW5lTGV2ZWxCb3hMaXN0OyB9CiAKKyAgICBJbmxpbmVMYXlv dXRVbml0IHJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX3Jv b3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZzZXQ7IH0KKwogcHJpdmF0ZToKICAgICBmcmllbmQgY2xh c3MgTGluZUJveEJ1aWxkZXI7CiAgICAgZnJpZW5kIGNsYXNzIExpbmVCb3hWZXJ0aWNhbEFsaWdu ZXI7CkBAIC05Nyw2ICs5OSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc0NvbnRlbnQgeyBm YWxzZSB9OwogICAgIE9wdGlvblNldDxJbmxpbmVMZXZlbEJveDo6VHlwZT4gbV9ib3hUeXBlczsK IAorICAgIElubGluZUxheW91dFVuaXQgbV9yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0IHsg MCB9OwogICAgIElubGluZUxldmVsQm94IG1fcm9vdElubGluZUJveDsKICAgICBJbmxpbmVMZXZl bEJveExpc3QgbV9ub25Sb290SW5saW5lTGV2ZWxCb3hMaXN0OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5kZXggYTYwNDg4ZTEyYmQ5MTJlZjFhZGU5 YWJhNjUxYTIyNTAzYzc4ZjFlOC4uMjkzMDg5NjdiMGIzMmM2MGI5MmI4ZGJhNWZmYjFhMjJmNjZk MDQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApA QCAtMTAwLDggKzEwMCw4IEBAIExpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcihjb25zdCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvCiBMaW5lQm94QnVpbGRl cjo6TGluZUFuZExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVy OjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIHNpemVfdCBsaW5lSW5kZXgpCiB7CiAgICAgYXV0 byB0ZXh0QWxpZ24gPSAhbGluZUluZGV4ID8gcm9vdEJveCgpLmZpcnN0TGluZVN0eWxlKCkudGV4 dEFsaWduKCkgOiByb290Qm94KCkuc3R5bGUoKS50ZXh0QWxpZ24oKTsKLSAgICBhdXRvIGNvbnRl bnRMb2dpY2FsTGVmdCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCh0ZXh0QWxp Z24sIGxpbmVDb250ZW50KS52YWx1ZV9vcihJbmxpbmVMYXlvdXRVbml0IHsgfSk7Ci0gICAgYXV0 byBsaW5lQm94ID0gTGluZUJveCB7IHJvb3RCb3goKSwgY29udGVudExvZ2ljYWxMZWZ0LCBsaW5l Q29udGVudC5jb250ZW50TG9naWNhbFdpZHRoLCBsaW5lSW5kZXgsIGxpbmVDb250ZW50Lm5vblNw YW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCB9OworICAgIGF1dG8gcm9vdElubGluZUJveEFsaWdu bWVudE9mZnNldCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCh0ZXh0QWxpZ24s IGxpbmVDb250ZW50KS52YWx1ZV9vcihJbmxpbmVMYXlvdXRVbml0IHsgfSk7CisgICAgYXV0byBs aW5lQm94ID0gTGluZUJveCB7IHJvb3RCb3goKSwgcm9vdElubGluZUJveEFsaWdubWVudE9mZnNl dCwgbGluZUNvbnRlbnQuY29udGVudExvZ2ljYWxXaWR0aCwgbGluZUluZGV4LCBsaW5lQ29udGVu dC5ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQgfTsKIAogICAgIGF1dG8gbGluZUJveExv Z2ljYWxIZWlnaHQgPSBjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMobGluZUJveCwg bGluZUNvbnRlbnQucnVucywgbGluZUluZGV4KTsKIApAQCAtMTQwLDcgKzE0MCw3IEBAIExpbmVC b3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICBlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9w ID0gc3RkOjptaW4oZW5jbG9zaW5nVG9wQW5kQm90dG9tLnRvcCwgYm9yZGVyQm94LnRvcCgpKTsK ICAgICAgICAgICAgIGVuY2xvc2luZ1RvcEFuZEJvdHRvbS5ib3R0b20gPSBzdGQ6Om1heChlbmNs b3NpbmdUb3BBbmRCb3R0b20uYm90dG9tLCBib3JkZXJCb3guYm90dG9tKCkpOwogICAgICAgICB9 Ci0gICAgICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpMaW5lIHsgbGluZUJveExvZ2ljYWxSZWN0 LCBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LCBlbmNsb3NpbmdUb3BBbmRCb3R0b20sIHJvb3RJbmxp bmVCb3gubG9naWNhbFRvcCgpICsgcm9vdElubGluZUJveC5iYXNlbGluZSgpLCByb290SW5saW5l Qm94LmxvZ2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gubG9naWNhbFdpZHRoKCkgfTsKKyAgICAg ICAgcmV0dXJuIElubGluZURpc3BsYXk6OkxpbmUgeyBsaW5lQm94TG9naWNhbFJlY3QsIHNjcm9s bGFibGVPdmVyZmxvd1JlY3QsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgcm9vdElubGluZUJveC5s b2dpY2FsVG9wKCkgKyByb290SW5saW5lQm94LmJhc2VsaW5lKCksIHJvb3RJbmxpbmVCb3hBbGln bm1lbnRPZmZzZXQgKyByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gu bG9naWNhbFdpZHRoKCkgfTsKICAgICB9OwogICAgIHJldHVybiB7IGxpbmUoKSwgbGluZUJveCB9 OwogfQo=