236207 2022-02-06 12:37:03 -0800 [LFC][IFC] WritingMode::LeftToRight expects line content flipped within the line 2022-02-07 06:47:18 -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 1837933 0 zalan 2022-02-06 12:37:03 -0800 void LegacyInlineFlowBox::flipLinesInBlockDirection(LayoutUnit lineTop, LayoutUnit lineBottom) { // Flip the box on the line such that the top is now relative to the lineBottom instead of the lineTop. setLogicalTop(lineBottom - (logicalTop() - lineTop) - logicalHeight()); 1837939 1 451049 zalan 2022-02-06 13:01:22 -0800 Created attachment 451049 Patch 1838112 2 ews-feeder 2022-02-07 06:46:29 -0800 Committed r289214 (246899@main): <https://commits.webkit.org/246899@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451049. 1838113 3 webkit-bug-importer 2022-02-07 06:47:18 -0800 <rdar://problem/88569671> 451049 2022-02-06 13:01:22 -0800 2022-02-07 06:46:31 -0800 Patch bug-236207-20220206130121.patch text/plain 9671 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzY5MjFkM2U5ODM2Zjc4 NGM2M2M2OTRiZjE3M2QwN2EyMDY4NjM4Mi4uMjhiMjNjOTUzMjQ2MTllN2JmNjQ2Y2JlNWUzMGFh MTkxMjU0YWE3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTA2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFdyaXRpbmdN b2RlOjpMZWZ0VG9SaWdodCBleHBlY3RzIGxpbmUgY29udGVudCBmbGlwcGVkIHdpdGhpbiB0aGUg bGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2 MjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVmVy dGljYWwgd3JpdGluZyBtb2RlIHJlcXVpcmVzIHRvCisgICAgICAgIDEuIGZsaXAgdGhlIGxpbmUg Y29vcmRpbmF0ZSBpbnNpZGUgdGhlIGJsb2NrCisgICAgICAgIDIuIGJ1dCBhbHNvIHRvIGZsaXAg dGhlIGNvbnRlbnQgY29vcmRpbmF0ZSBpbnNpZGUgdGhlIGxpbmUgYm94LCB3aGVyZSAKKyAgICAg ICAgICAgdmVydGljYWwtbHIgZXhwZWN0cyB0aGUgY29udGVudCB0b3AgKHdoaWNoIHR1cm5zIGlu dG8gdGhlIHZpc3VhbCBsZWZ0KSB0byBiZSByZWxhdGl2ZSB0byB0aGUgYm90dG9tIG9mIHRoZSBs aW5lLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgZGVjb3VwbGUgdGhlIGxpbmUgYW5kIHRo ZSBsaW5lIGNvbnRlbnQgZmxpcHBpbmcgbG9naWMuIEl0IGhlbHBzIHRvIHJlYXNvbiBhYm91dCB0 aGUKKyAgICAgICAgdHlwZSBvZiBjb29yZGluYXRlIHRyYW5zbGF0aW9ucyBhdCBkaWZmZXJlbnQg bGV2ZWxzIChsaW5lIGluc2lkZSB0aGUgYmxvY2sgYW5kIGNvbnRlbnQgaW5zaWRlIHRoZSBsaW5l KS4KKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUgdmVydGljYWwtYWxpZ24gdGVzdHMgdW5k ZXIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMu CisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9j ZXNzQmlkaUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGVXaXRo aW5MaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5 L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWls ZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlMaW5lQnVp bGRlcjo6ZmxpcExvZ2ljYWxMaW5lUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUxpbmVCdWlsZGVyLmg6CisKIDIwMjItMDItMDYgIEFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTGluZUJveCBzaG91bGQgaG9sZCBvbiB0 byBpdHMgbG9naWNhbCByZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9k aXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggYTJkYzZkMjkyZmM2 NzJkY2Y4OGQ3YzhlNWMxNTcwYTFhOThjMWY3NS4uMTBhNzJkZGE1ZjY3YWU3MGE5ZTQ0NTg2Njkz YjJmYTE0NGRlYTFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rp c3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMzMzLDcgKzMzMyw3IEBA IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzTm9uQmlkaUNvbnRlbnQo Y29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDCiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVS dW4ubGF5b3V0Qm94KCk7CiAKICAgICAgICAgYXV0byB2aXN1YWxSZWN0UmVsYXRpdmVUb1Jvb3Qg PSBbJl0oYXV0byBsb2dpY2FsUmVjdCkgewotICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0g ZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShsb2dpY2FsUmVjdCwgd3JpdGlu Z01vZGUpOworICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0gZmxpcExvZ2ljYWxSZWN0VG9W aXN1YWxGb3JXcml0aW5nTW9kZVdpdGhpbkxpbmUobG9naWNhbFJlY3QsIGxpbmVCb3gubG9naWNh bFJlY3QoKSwgd3JpdGluZ01vZGUpOwogICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlQnkoY29u dGVudFN0YXJ0SW5WaXN1YWxPcmRlcik7CiAgICAgICAgICAgICByZXR1cm4gdmlzdWFsUmVjdDsK ICAgICAgICAgfTsKQEAgLTU2Miw3ICs1NjIsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICBhdXRvIHZpc3VhbFJlY3RS ZWxhdGl2ZVRvUm9vdCA9IFsmXShhdXRvIGxvZ2ljYWxSZWN0KSB7Ci0gICAgICAgICAgICAgICAg YXV0byB2aXN1YWxSZWN0ID0gZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShs b2dpY2FsUmVjdCwgd3JpdGluZ01vZGUpOworICAgICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVj dCA9IGZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGVXaXRoaW5MaW5lKGxvZ2lj YWxSZWN0LCBsaW5lQm94LmxvZ2ljYWxSZWN0KCksIHdyaXRpbmdNb2RlKTsKICAgICAgICAgICAg ICAgICBpZiAoV2ViQ29yZTo6aXNIb3Jpem9udGFsV3JpdGluZ01vZGUod3JpdGluZ01vZGUpKQog ICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0LnNldExlZnQoY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlcik7CiAgICAgICAgICAgICAgICAgZWxzZQpAQCAtNzgxLDE2ICs3ODEsMTkgQEAgdm9p ZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNvbXB1dGVJc0ZpcnN0SXNMYXN0Qm94Rm9y SW5saW5lQ29udGVudChEaXNwbGEKICAgICBib3hlc1tsYXN0Um9vdElubGluZUJveEluZGV4XS5z ZXRJc0xhc3RGb3JMYXlvdXRCb3godHJ1ZSk7CiB9CiAKLUlubGluZVJlY3QgSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKGNv bnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSkKK0lu bGluZVJlY3QgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zp c3VhbEZvcldyaXRpbmdNb2RlV2l0aGluTGluZShjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVj dCwgY29uc3QgSW5saW5lUmVjdCYgbGluZUxvZ2ljYWxSZWN0LCBXcml0aW5nTW9kZSB3cml0aW5n TW9kZSkgY29uc3QKIHsKICAgICBzd2l0Y2ggKHdyaXRpbmdNb2RlKSB7CiAgICAgY2FzZSBXcml0 aW5nTW9kZTo6VG9wVG9Cb3R0b206CiAgICAgICAgIHJldHVybiBsb2dpY2FsUmVjdDsKLSAgICBj YXNlIFdyaXRpbmdNb2RlOjpMZWZ0VG9SaWdodDoKLSAgICBjYXNlIFdyaXRpbmdNb2RlOjpSaWdo dFRvTGVmdDogeworICAgIGNhc2UgV3JpdGluZ01vZGU6OkxlZnRUb1JpZ2h0OiB7CisgICAgICAg IC8vIEZsaXAgY29udGVudCBzdWNoIHRoYXQgdGhlIHRvcCAodmlzdWFsIGxlZnQpIGlzIG5vdyBy ZWxhdGl2ZSB0byB0aGUgbGluZSBib3R0b20gaW5zdGVhZCBvZiB0aGUgbGluZSB0b3AuCisgICAg ICAgIGF1dG8gYm90dG9tT2Zmc2V0ID0gbGluZUxvZ2ljYWxSZWN0LmhlaWdodCgpIC0gbG9naWNh bFJlY3QuYm90dG9tKCk7CisgICAgICAgIHJldHVybiB7IGxvZ2ljYWxSZWN0LmxlZnQoKSwgYm90 dG9tT2Zmc2V0LCBsb2dpY2FsUmVjdC5oZWlnaHQoKSwgbG9naWNhbFJlY3Qud2lkdGgoKSB9Owor ICAgIH0KKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpSaWdodFRvTGVmdDoKICAgICAgICAgLy8gU2Vl IElubGluZUZvcm1hdHRpbmdHZW9tZXRyeSBmb3IgbW9yZSBpbmZvLgogICAgICAgICByZXR1cm4g eyBsb2dpY2FsUmVjdC5sZWZ0KCksIGxvZ2ljYWxSZWN0LnRvcCgpLCBsb2dpY2FsUmVjdC5oZWln aHQoKSwgbG9naWNhbFJlY3Qud2lkdGgoKSB9OwotICAgIH0KICAgICBkZWZhdWx0OgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaApp bmRleCBhNTU5NWMxZjJlNjlhM2MwZDA1ZTUzYzQ0NDU0OGIwM2IxMGFiMDNiLi45NDdmOGEzZWFl MGNkNTI2MWYzYzY3Y2I0NTE0NjY0Mjc3NmFjNDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKQEAgLTQ3 LDcgKzQ3LDYgQEAgcHVibGljOgogICAgIERpc3BsYXlCb3hlcyBidWlsZChjb25zdCBMaW5lQnVp bGRlcjo6TGluZUNvbnRlbnQmLCBjb25zdCBMaW5lQm94JiwgY29uc3QgSW5saW5lRGlzcGxheTo6 TGluZSYsIGNvbnN0IHNpemVfdCBsaW5lSW5kZXgpOwogCiAgICAgc3RhdGljIHZvaWQgY29tcHV0 ZUlzRmlyc3RJc0xhc3RCb3hGb3JJbmxpbmVDb250ZW50KERpc3BsYXlCb3hlcyYpOwotICAgIHN0 YXRpYyBJbmxpbmVSZWN0IGZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoY29u c3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QsIFdyaXRpbmdNb2RlKTsKIAogcHJpdmF0ZToKICAg ICB2b2lkIHByb2Nlc3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRl bnQmLCBjb25zdCBMaW5lQm94JiwgY29uc3QgSW5saW5lRGlzcGxheTo6TGluZSYsIERpc3BsYXlC b3hlcyYpOwpAQCAtNjcsNiArNjYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRqdXN0VmlzdWFs R2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbGF5Qm94Tm9kZUluZGV4LCBJbmxpbmVM YXlvdXRVbml0JiBhY2N1bXVsYXRlZE9mZnNldCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94VG9w LCBjb25zdCBEaXNwbGF5Qm94VHJlZSYsIERpc3BsYXlCb3hlcyYsIGNvbnN0IExpbmVCb3gmLCBj b25zdCBIYXNoTWFwPGNvbnN0IEJveCosIElzRmlyc3RMYXN0SW5kZXg+Jik7CiAgICAgc2l6ZV90 IGVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIoY29uc3QgQ29udGFpbmVyQm94JiwgRGlzcGxh eUJveFRyZWUmLCBBbmNlc3RvclN0YWNrJiwgRGlzcGxheUJveGVzJik7CiAKKyAgICBJbmxpbmVS ZWN0IGZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGVXaXRoaW5MaW5lKGNvbnN0 IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNhbFJl Y3QsIFdyaXRpbmdNb2RlKSBjb25zdDsKICAgICBJbmxpbmVMYXlvdXRQb2ludCBtb3ZlUG9pbnRI b3Jpem9udGFsbHlGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgdG9wTGVm dCwgSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsT2Zmc2V0LCBXcml0aW5nTW9kZSkgY29uc3Q7 CiAKICAgICBjb25zdCBDb250YWluZXJCb3gmIHJvb3QoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1h dHRpbmdDb250ZXh0Um9vdDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCmluZGV4IDBjMzA2NDI2YjE4ODBlNDVm MDhiZjM3YmU2YmE0N2M1ZmE4ZDExNDMuLjIxMGM5NTIwMzM2NjYwMTA4MDk2OWJlZDg5ZDQ1ZTE5 ZDUwMGU2MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAKQEAgLTk2LDggKzk2LDggQEAgSW5saW5lRGlzcGxh eTo6TGluZSBJbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVy OjpMaW5lQ29udGUKIAogICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0IGlmIHByb3BlcnRpZXMgbGlr ZSBlbmNsb3NpbmdMaW5lR2VvbWV0cnkgdG9wIGFuZCBib3R0b20gbmVlZHMgdG8gYmUgZmxpcHBl ZCBhcyB3ZWxsLgogICAgIGF1dG8gd3JpdGluZ01vZGUgPSByb290KCkuc3R5bGUoKS53cml0aW5n TW9kZSgpOwotICAgIHJldHVybiBJbmxpbmVEaXNwbGF5OjpMaW5lIHsgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKGxpbmVC b3hSZWN0LCB3cml0aW5nTW9kZSkKLSAgICAgICAgLCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoZW5jbG9zaW5nTGluZUdl b21ldHJ5LnNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIHdyaXRpbmdNb2RlKQorICAgIHJldHVybiBJ bmxpbmVEaXNwbGF5OjpMaW5lIHsgZmxpcExvZ2ljYWxMaW5lUmVjdFRvVmlzdWFsRm9yV3JpdGlu Z01vZGUobGluZUJveFJlY3QsIHdyaXRpbmdNb2RlKQorICAgICAgICAsIGZsaXBMb2dpY2FsTGlu ZVJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKGVuY2xvc2luZ0xpbmVHZW9tZXRyeS5zY3JvbGxh YmxlT3ZlcmZsb3dSZWN0LCB3cml0aW5nTW9kZSkKICAgICAgICAgLCBlbmNsb3NpbmdMaW5lR2Vv bWV0cnkuZW5jbG9zaW5nVG9wQW5kQm90dG9tCiAgICAgICAgICwgcm9vdElubGluZUJveC5sb2dp Y2FsVG9wKCkgKyByb290SW5saW5lQm94LmFzY2VudCgpCiAgICAgICAgICwgY29udGVudFZpc3Vh bExlZnQKQEAgLTEwNSw2ICsxMDUsMjIgQEAgSW5saW5lRGlzcGxheTo6TGluZSBJbmxpbmVEaXNw bGF5TGluZUJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGUKICAgICB9 OwogfQogCitJbmxpbmVSZWN0IElubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6ZmxpcExvZ2ljYWxM aW5lUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoY29uc3QgSW5saW5lUmVjdCYgbGluZUxvZ2lj YWxSZWN0LCBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKHdy aXRpbmdNb2RlKSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b206CisgICAgICAg IHJldHVybiBsaW5lTG9naWNhbFJlY3Q7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmln aHQ6CisgICAgY2FzZSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6CisgICAgICAgIC8vIFNlZSBJ bmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkgZm9yIG1vcmUgaW5mby4KKyAgICAgICAgcmV0dXJuIHsg bGluZUxvZ2ljYWxSZWN0LmxlZnQoKSwgbGluZUxvZ2ljYWxSZWN0LnRvcCgpLCBsaW5lTG9naWNh bFJlY3QuaGVpZ2h0KCksIGxpbmVMb2dpY2FsUmVjdC53aWR0aCgpIH07CisgICAgZGVmYXVsdDoK KyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAg ICByZXR1cm4gbGluZUxvZ2ljYWxSZWN0OworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5oCmluZGV4IGYw NTQwM2Q3YjkwOGFlMzYwZjcyZjc4ZjRlOTJiMWI2NDM3NjkyNDguLmY1NjczN2RhZjZiNzIwMmNh MWQyNjljOWEzMTY2YjIxOTI0YmQ4NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWls ZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuaApAQCAtNDgsNiArNDgsNyBAQCBw cml2YXRlOgogICAgICAgICBJbmxpbmVSZWN0IHNjcm9sbGFibGVPdmVyZmxvd1JlY3Q7CiAgICAg fTsKICAgICBFbmNsb3NpbmdMaW5lR2VvbWV0cnkgY29sbGVjdEVuY2xvc2luZ0xpbmVHZW9tZXRy eShjb25zdCBMaW5lQm94JiwgY29uc3QgSW5saW5lUmVjdCYgbGluZUJveFJlY3QpIGNvbnN0Owor ICAgIElubGluZVJlY3QgZmxpcExvZ2ljYWxMaW5lUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUo Y29uc3QgSW5saW5lUmVjdCYsIFdyaXRpbmdNb2RlKSBjb25zdDsKIAogICAgIGNvbnN0IElubGlu ZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1f aW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7IH0KICAgICBjb25zdCBCb3gmIHJvb3QoKSBjb25zdCB7 IHJldHVybiBmb3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKTsgfQo=