238219 2022-03-22 12:57:47 -0700 [IFC][Integration] Rename InlineIteratorLine.cpp to InlineIteratorLineBox.cpp 2022-03-22 16:49:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1853857 0 zalan 2022-03-22 12:57:47 -0700 ssia 1853859 1 455416 zalan 2022-03-22 13:00:33 -0700 Created attachment 455416 Patch 1854001 2 ews-feeder 2022-03-22 16:48:02 -0700 Committed r291725 (248757@main): <https://commits.webkit.org/248757@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455416. 1854005 3 webkit-bug-importer 2022-03-22 16:49:19 -0700 <rdar://problem/90667126> 455416 2022-03-22 13:00:33 -0700 2022-03-22 16:48:04 -0700 Patch bug-238219-20220322130032.patch text/plain 15601 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3N2E5YmI0MjlkNmFj YzcxOWFmOGEyYWU2MTNkOWQ3ZjE3OTIwMi4uZjZlMTRiOGJmZGRiODY3NDAxY2Y1NWRiZDJlYWRm NGVjM2EzMDI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAzLTIyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVuYW1lIElubGluZUl0ZXJhdG9yTGluZS5jcHAgdG8gSW5saW5lSXRlcmF0b3JMaW5lQm94LmNw cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4MjE5 CisKKyAgICAgICAgVW5yZXZpZXdlZC4KKworICAgICAgICByMjkxNTQ4IHNob3VsZCBoYXZlIGlu Y2x1ZGVkIHRoaXMgcmVuYW1lLgorCisgICAgICAgICogU291cmNlcy50eHQ6CisgICAgICAgICog V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGxheW91dC9pbnRl Z3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3guY3BwOiBSZW5hbWVkIGZyb20gU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5jcHAuCisgICAgICAg IChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0 b3IpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvcjo6 YXRFbmQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVCb3hJ dGVyYXRvcjo6dHJhdmVyc2VOZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9y OjpMaW5lQm94SXRlcmF0b3I6OnRyYXZlcnNlUHJldmlvdXMpOgorICAgICAgICAoV2ViQ29yZTo6 SW5saW5lSXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvcjo6b3BlcmF0b3I9PSBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6Zmlyc3RMaW5lQm94Rm9yKToKKyAgICAgICAg KFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpsYXN0TGluZUJveEZvcik6CisgICAgICAgIChXZWJD b3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveDo6bmV4dCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveDo6cHJldmlvdXMgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVCb3g6OmZpcnN0TGVhZkJveCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveDo6bGFzdExlYWZCb3ggY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OmNsb3Nlc3RCb3hGb3JIb3Jp em9udGFsUG9zaXRpb24pOgorCiAyMDIyLTAzLTIyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgY29udGVudCBmaWx0ZXJpbmcgaW4gdGhlIE5l dHdvcmsgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQgYi9T b3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dAppbmRleCA3ZWQwMDBkNjJhZWUwMzcyOGZlNjUwNmUz ZWYyOWMwN2VhYThlZTUzLi40N2FjNTNkZmYyMWYzMjg3YzQ1MjhiM2UwZTQ3Yzk3ZjcxYmI4YWI4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Tb3VyY2VzLnR4dApAQCAtMTU3Nyw3ICsxNTc3LDcgQEAgbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvaW52YWxpZGF0aW9uL0lubGluZUludmFsaWRhdGlvbi5jcHAKIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwCiBsYXlvdXQvaW50 ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JCb3guY3BwCiBsYXlvdXQvaW50ZWdyYXRpb24vSW5saW5l SXRlcmF0b3JJbmxpbmVCb3guY3BwCi1sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JM aW5lLmNwcAorbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUJveC5jcHAKIGxh eW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxvZ2ljYWxPcmRlclRyYXZlcnNhbC5jcHAK IGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvclRleHRCb3guY3BwCiBsYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDNkNGRmYjQ3NjgzODcx ZjZmMmY5MWYzYThjNjIzNGRhMGQ3NDVhMjYuLmRkMTkwNTM0ZmQxYjJkNDQyMWEzMmJjNDE3Mzk0 NzdhODg2MzdjNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKQEAgLTE3NjIxLDcgKzE3NjIxLDcgQEAKIAkJRTRDOTFBMTcxODA5OTlG QjAwQTE3RjZEIC8qIFJlbmRlclRleHRMaW5lQm94ZXMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gUmVuZGVyVGV4dExpbmVCb3hlcy5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCUU0RDMzRjM5MjUyQUVFQ0MwMDgzN0QwNSAvKiBJbmxpbmVSdW5BbmRP ZmZzZXQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSW5saW5lUnVuQW5kT2Zm c2V0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUU0RDMzRjNGMjUyQzRCODIwMDgz N0QwNSAvKiBJbmxpbmVJdGVyYXRvckxpbmVCb3guaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gSW5saW5lSXRlcmF0b3JMaW5lQm94Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07Ci0JCUU0RDMzRjQyMjUyQzUwQTgwMDgzN0QwNSAvKiBJbmxpbmVJdGVyYXRvckxpbmUuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gSW5saW5lSXRlcmF0b3JMaW5lLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJRTREMzNGNDIyNTJDNTBBODAwODM3RDA1IC8qIElubGluZUl0ZXJh dG9yTGluZUJveC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBJbmxpbmVJdGVyYXRvckxpbmVCb3gu Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFNEQzM0Y0MzI1MkM1MEUyMDA4MzdE MDUgLyogSW5saW5lSXRlcmF0b3JMaW5lQm94TGVnYWN5UGF0aC5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBJbmxpbmVJdGVyYXRvckxpbmVCb3hMZWdhY3lQYXRoLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUU0RDMzRjQ1MjUyQzUwRkIwMDgzN0QwNSAvKiBJbmxp bmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IElubGluZUl0ZXJhdG9yTGluZUJveE1vZGVyblBhdGguaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJRTRENThFQjIxN0I0REJEQzAwQ0JEQ0E4IC8qIFN0eWxlUmVzb2x2ZUZv ckRvY3VtZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFN0eWxl UmVzb2x2ZUZvckRvY3VtZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTMx NTM2LDcgKzMxNTM2LDcgQEAKIAkJCQlFNEE2NjRDNDI1MjFCNzc3MDA3MDgxREMgLyogSW5saW5l SXRlcmF0b3JCb3hNb2Rlcm5QYXRoLmggKi8sCiAJCQkJRTQxNUVCMTQyNzBDMzUzNzAwRThEQTFC IC8qIElubGluZUl0ZXJhdG9ySW5saW5lQm94LmNwcCAqLywKIAkJCQlFNDE1RUIxMTI3MEMzNTEy MDBFOERBMUIgLyogSW5saW5lSXRlcmF0b3JJbmxpbmVCb3guaCAqLywKLQkJCQlFNEQzM0Y0MjI1 MkM1MEE4MDA4MzdEMDUgLyogSW5saW5lSXRlcmF0b3JMaW5lLmNwcCAqLywKKwkJCQlFNEQzM0Y0 MjI1MkM1MEE4MDA4MzdEMDUgLyogSW5saW5lSXRlcmF0b3JMaW5lQm94LmNwcCAqLywKIAkJCQlF NEQzM0YzRjI1MkM0QjgyMDA4MzdEMDUgLyogSW5saW5lSXRlcmF0b3JMaW5lQm94LmggKi8sCiAJ CQkJRTREMzNGNDMyNTJDNTBFMjAwODM3RDA1IC8qIElubGluZUl0ZXJhdG9yTGluZUJveExlZ2Fj eVBhdGguaCAqLywKIAkJCQlFNEQzM0Y0NTI1MkM1MEZCMDA4MzdEMDUgLyogSW5saW5lSXRlcmF0 b3JMaW5lQm94TW9kZXJuUGF0aC5oICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmNwcApkZWxldGVkIGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDk5NWMxYTk4ODVmNTlhYzI2OWE0YTNkYzFjMTkwYjVkZjkxZGYwZS4u MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmNwcAorKysgL2Rldi9u dWxsCkBAIC0xLDE1NyArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwot ICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0g KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICog QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgot I2luY2x1ZGUgIklubGluZUl0ZXJhdG9yTGluZUJveC5oIgotCi0jaW5jbHVkZSAiSW5saW5lSXRl cmF0b3JCb3guaCIKLSNpbmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaCIKLSNp bmNsdWRlICJSZW5kZXJCbG9ja0Zsb3cuaCIKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotbmFtZXNw YWNlIElubGluZUl0ZXJhdG9yIHsKLQotTGluZUJveEl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0b3Io TGluZUJveDo6UGF0aFZhcmlhbnQmJiBwYXRoVmFyaWFudCkKLSAgICA6IG1fbGluZUJveChXVEZN b3ZlKHBhdGhWYXJpYW50KSkKLXsKLX0KLQotTGluZUJveEl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0 b3IoY29uc3QgTGluZUJveCYgbGluZUJveCkKLSAgICA6IG1fbGluZUJveChsaW5lQm94KQotewot fQotCi1ib29sIExpbmVCb3hJdGVyYXRvcjo6YXRFbmQoKSBjb25zdAotewotICAgIHJldHVybiBX VEY6OnN3aXRjaE9uKG1fbGluZUJveC5tX3BhdGhWYXJpYW50LCBbXShhdXRvJiBwYXRoKSB7Ci0g ICAgICAgIHJldHVybiBwYXRoLmF0RW5kKCk7Ci0gICAgfSk7Ci19Ci0KLUxpbmVCb3hJdGVyYXRv ciYgTGluZUJveEl0ZXJhdG9yOjp0cmF2ZXJzZU5leHQoKQotewotICAgIFdURjo6c3dpdGNoT24o bV9saW5lQm94Lm1fcGF0aFZhcmlhbnQsIFtdKGF1dG8mIHBhdGgpIHsKLSAgICAgICAgcmV0dXJu IHBhdGgudHJhdmVyc2VOZXh0KCk7Ci0gICAgfSk7Ci0gICAgcmV0dXJuICp0aGlzOwotfQotCi1M aW5lQm94SXRlcmF0b3ImIExpbmVCb3hJdGVyYXRvcjo6dHJhdmVyc2VQcmV2aW91cygpCi17Ci0g ICAgV1RGOjpzd2l0Y2hPbihtX2xpbmVCb3gubV9wYXRoVmFyaWFudCwgW10oYXV0byYgcGF0aCkg ewotICAgICAgICByZXR1cm4gcGF0aC50cmF2ZXJzZVByZXZpb3VzKCk7Ci0gICAgfSk7Ci0gICAg cmV0dXJuICp0aGlzOwotfQotCi1ib29sIExpbmVCb3hJdGVyYXRvcjo6b3BlcmF0b3I9PShjb25z dCBMaW5lQm94SXRlcmF0b3ImIG90aGVyKSBjb25zdAotewotICAgIHJldHVybiBtX2xpbmVCb3gu bV9wYXRoVmFyaWFudCA9PSBvdGhlci5tX2xpbmVCb3gubV9wYXRoVmFyaWFudDsKLX0KLQotTGlu ZUJveEl0ZXJhdG9yIGZpcnN0TGluZUJveEZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3cp Ci17Ci0jaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgaWYgKGF1dG8q IGxpbmVMYXlvdXQgPSBmbG93Lm1vZGVybkxpbmVMYXlvdXQoKSkKLSAgICAgICAgcmV0dXJuIGxp bmVMYXlvdXQtPmZpcnN0TGluZUJveCgpOwotI2VuZGlmCi0KLSAgICByZXR1cm4geyBMaW5lQm94 SXRlcmF0b3JMZWdhY3lQYXRoIHsgZmxvdy5maXJzdFJvb3RCb3goKSB9IH07Ci19Ci0KLUxpbmVC b3hJdGVyYXRvciBsYXN0TGluZUJveEZvcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3cpCi17 Ci0jaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgaWYgKGF1dG8qIGxp bmVMYXlvdXQgPSBmbG93Lm1vZGVybkxpbmVMYXlvdXQoKSkKLSAgICAgICAgcmV0dXJuIGxpbmVM YXlvdXQtPmxhc3RMaW5lQm94KCk7Ci0jZW5kaWYKLQotICAgIHJldHVybiB7IExpbmVCb3hJdGVy YXRvckxlZ2FjeVBhdGggeyBmbG93Lmxhc3RSb290Qm94KCkgfSB9OwotfQotCi1MaW5lQm94SXRl cmF0b3IgTGluZUJveDo6bmV4dCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIExpbmVCb3hJdGVyYXRv cigqdGhpcykudHJhdmVyc2VOZXh0KCk7Ci19Ci0KLUxpbmVCb3hJdGVyYXRvciBMaW5lQm94Ojpw cmV2aW91cygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIExpbmVCb3hJdGVyYXRvcigqdGhpcykudHJh dmVyc2VQcmV2aW91cygpOwotfQotCi1MZWFmQm94SXRlcmF0b3IgTGluZUJveDo6Zmlyc3RMZWFm Qm94KCkgY29uc3QKLXsKLSAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbihtX3BhdGhWYXJpYW50LCBb XShhdXRvJiBwYXRoKSAtPiBMZWFmQm94SXRlcmF0b3IgewotICAgICAgICByZXR1cm4geyBwYXRo LmZpcnN0TGVhZkJveCgpIH07Ci0gICAgfSk7Ci19Ci0KLUxlYWZCb3hJdGVyYXRvciBMaW5lQm94 OjpsYXN0TGVhZkJveCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFdURjo6c3dpdGNoT24obV9wYXRo VmFyaWFudCwgW10oYXV0byYgcGF0aCkgLT4gTGVhZkJveEl0ZXJhdG9yIHsKLSAgICAgICAgcmV0 dXJuIHsgcGF0aC5sYXN0TGVhZkJveCgpIH07Ci0gICAgfSk7Ci19Ci0KLUxlYWZCb3hJdGVyYXRv ciBjbG9zZXN0Qm94Rm9ySG9yaXpvbnRhbFBvc2l0aW9uKGNvbnN0IExpbmVCb3gmIGxpbmVCb3gs IGZsb2F0IGhvcml6b250YWxQb3NpdGlvbiwgYm9vbCBlZGl0YWJsZU9ubHkpCi17Ci0gICAgYXV0 byBpc0VkaXRhYmxlID0gWyZdKGF1dG8gYm94KSB7Ci0gICAgICAgIHJldHVybiBib3ggJiYgYm94 LT5yZW5kZXJlcigpLm5vZGUoKSAmJiBib3gtPnJlbmRlcmVyKCkubm9kZSgpLT5oYXNFZGl0YWJs ZVN0eWxlKCk7Ci0gICAgfTsKLQotICAgIGF1dG8gZmlyc3RCb3ggPSBsaW5lQm94LmZpcnN0TGVh ZkJveCgpOwotICAgIGF1dG8gbGFzdEJveCA9IGxpbmVCb3gubGFzdExlYWZCb3goKTsKLQotICAg IGlmIChmaXJzdEJveCAhPSBsYXN0Qm94KSB7Ci0gICAgICAgIGlmIChmaXJzdEJveC0+aXNMaW5l QnJlYWsoKSkKLSAgICAgICAgICAgIGZpcnN0Qm94ID0gZmlyc3RCb3gtPm5leHRPbkxpbmVJZ25v cmluZ0xpbmVCcmVhaygpOwotICAgICAgICBlbHNlIGlmIChsYXN0Qm94LT5pc0xpbmVCcmVhaygp KQotICAgICAgICAgICAgbGFzdEJveCA9IGxhc3RCb3gtPnByZXZpb3VzT25MaW5lSWdub3JpbmdM aW5lQnJlYWsoKTsKLSAgICB9Ci0KLSAgICBpZiAoZmlyc3RCb3ggPT0gbGFzdEJveCAmJiAoIWVk aXRhYmxlT25seSB8fCBpc0VkaXRhYmxlKGZpcnN0Qm94KSkpCi0gICAgICAgIHJldHVybiBmaXJz dEJveDsKLQotICAgIGlmIChmaXJzdEJveCAmJiBob3Jpem9udGFsUG9zaXRpb24gPD0gZmlyc3RC b3gtPmxvZ2ljYWxMZWZ0KCkgJiYgIWZpcnN0Qm94LT5yZW5kZXJlcigpLmlzTGlzdE1hcmtlcigp ICYmICghZWRpdGFibGVPbmx5IHx8IGlzRWRpdGFibGUoZmlyc3RCb3gpKSkKLSAgICAgICAgcmV0 dXJuIGZpcnN0Qm94OwotCi0gICAgaWYgKGxhc3RCb3ggJiYgaG9yaXpvbnRhbFBvc2l0aW9uID49 IGxhc3RCb3gtPmxvZ2ljYWxSaWdodCgpICYmICFsYXN0Qm94LT5yZW5kZXJlcigpLmlzTGlzdE1h cmtlcigpICYmICghZWRpdGFibGVPbmx5IHx8IGlzRWRpdGFibGUobGFzdEJveCkpKQotICAgICAg ICByZXR1cm4gbGFzdEJveDsKLQotICAgIGF1dG8gY2xvc2VzdEJveCA9IGxhc3RCb3g7Ci0gICAg Zm9yIChhdXRvIGJveCA9IGZpcnN0Qm94OyBib3g7IGJveCA9IGJveC50cmF2ZXJzZU5leHRPbkxp bmVJZ25vcmluZ0xpbmVCcmVhaygpKSB7Ci0gICAgICAgIGlmICghYm94LT5yZW5kZXJlcigpLmlz TGlzdE1hcmtlcigpICYmICghZWRpdGFibGVPbmx5IHx8IGlzRWRpdGFibGUoYm94KSkpIHsKLSAg ICAgICAgICAgIGlmIChob3Jpem9udGFsUG9zaXRpb24gPCBib3gtPmxvZ2ljYWxSaWdodCgpKQot ICAgICAgICAgICAgICAgIHJldHVybiBib3g7Ci0gICAgICAgICAgICBjbG9zZXN0Qm94ID0gYm94 OwotICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIGNsb3Nlc3RCb3g7Ci19Ci0KLX0KLX0K LQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0 ZXJhdG9yTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5s aW5lSXRlcmF0b3JMaW5lQm94LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wOTk1YzFhOTg4NWY1OWFjMjY5YTRh M2RjMWMxOTBiNWRmOTFkZjBlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUJveC5jcHAKQEAgLTAsMCArMSwxNTcg QEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4g UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg SU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICog VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBE SVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBD T05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9D VVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us IERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIg Q0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiSW5saW5lSXRl cmF0b3JMaW5lQm94LmgiCisKKyNpbmNsdWRlICJJbmxpbmVJdGVyYXRvckJveC5oIgorI2luY2x1 ZGUgIkxheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIgorI2luY2x1ZGUgIlJlbmRlckJsb2Nr Rmxvdy5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CituYW1lc3BhY2UgSW5saW5lSXRlcmF0b3Ig eworCitMaW5lQm94SXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvcihMaW5lQm94OjpQYXRoVmFyaWFu dCYmIHBhdGhWYXJpYW50KQorICAgIDogbV9saW5lQm94KFdURk1vdmUocGF0aFZhcmlhbnQpKQor eworfQorCitMaW5lQm94SXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvcihjb25zdCBMaW5lQm94JiBs aW5lQm94KQorICAgIDogbV9saW5lQm94KGxpbmVCb3gpCit7Cit9CisKK2Jvb2wgTGluZUJveEl0 ZXJhdG9yOjphdEVuZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIFdURjo6c3dpdGNoT24obV9saW5l Qm94Lm1fcGF0aFZhcmlhbnQsIFtdKGF1dG8mIHBhdGgpIHsKKyAgICAgICAgcmV0dXJuIHBhdGgu YXRFbmQoKTsKKyAgICB9KTsKK30KKworTGluZUJveEl0ZXJhdG9yJiBMaW5lQm94SXRlcmF0b3I6 OnRyYXZlcnNlTmV4dCgpCit7CisgICAgV1RGOjpzd2l0Y2hPbihtX2xpbmVCb3gubV9wYXRoVmFy aWFudCwgW10oYXV0byYgcGF0aCkgeworICAgICAgICByZXR1cm4gcGF0aC50cmF2ZXJzZU5leHQo KTsKKyAgICB9KTsKKyAgICByZXR1cm4gKnRoaXM7Cit9CisKK0xpbmVCb3hJdGVyYXRvciYgTGlu ZUJveEl0ZXJhdG9yOjp0cmF2ZXJzZVByZXZpb3VzKCkKK3sKKyAgICBXVEY6OnN3aXRjaE9uKG1f bGluZUJveC5tX3BhdGhWYXJpYW50LCBbXShhdXRvJiBwYXRoKSB7CisgICAgICAgIHJldHVybiBw YXRoLnRyYXZlcnNlUHJldmlvdXMoKTsKKyAgICB9KTsKKyAgICByZXR1cm4gKnRoaXM7Cit9CisK K2Jvb2wgTGluZUJveEl0ZXJhdG9yOjpvcGVyYXRvcj09KGNvbnN0IExpbmVCb3hJdGVyYXRvciYg b3RoZXIpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fbGluZUJveC5tX3BhdGhWYXJpYW50ID09IG90 aGVyLm1fbGluZUJveC5tX3BhdGhWYXJpYW50OworfQorCitMaW5lQm94SXRlcmF0b3IgZmlyc3RM aW5lQm94Rm9yKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKK3sKKyNpZiBFTkFCTEUoTEFZ T1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKKyAgICBpZiAoYXV0byogbGluZUxheW91dCA9IGZsb3cu bW9kZXJuTGluZUxheW91dCgpKQorICAgICAgICByZXR1cm4gbGluZUxheW91dC0+Zmlyc3RMaW5l Qm94KCk7CisjZW5kaWYKKworICAgIHJldHVybiB7IExpbmVCb3hJdGVyYXRvckxlZ2FjeVBhdGgg eyBmbG93LmZpcnN0Um9vdEJveCgpIH0gfTsKK30KKworTGluZUJveEl0ZXJhdG9yIGxhc3RMaW5l Qm94Rm9yKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKK3sKKyNpZiBFTkFCTEUoTEFZT1VU X0ZPUk1BVFRJTkdfQ09OVEVYVCkKKyAgICBpZiAoYXV0byogbGluZUxheW91dCA9IGZsb3cubW9k ZXJuTGluZUxheW91dCgpKQorICAgICAgICByZXR1cm4gbGluZUxheW91dC0+bGFzdExpbmVCb3go KTsKKyNlbmRpZgorCisgICAgcmV0dXJuIHsgTGluZUJveEl0ZXJhdG9yTGVnYWN5UGF0aCB7IGZs b3cubGFzdFJvb3RCb3goKSB9IH07Cit9CisKK0xpbmVCb3hJdGVyYXRvciBMaW5lQm94OjpuZXh0 KCkgY29uc3QKK3sKKyAgICByZXR1cm4gTGluZUJveEl0ZXJhdG9yKCp0aGlzKS50cmF2ZXJzZU5l eHQoKTsKK30KKworTGluZUJveEl0ZXJhdG9yIExpbmVCb3g6OnByZXZpb3VzKCkgY29uc3QKK3sK KyAgICByZXR1cm4gTGluZUJveEl0ZXJhdG9yKCp0aGlzKS50cmF2ZXJzZVByZXZpb3VzKCk7Cit9 CisKK0xlYWZCb3hJdGVyYXRvciBMaW5lQm94OjpmaXJzdExlYWZCb3goKSBjb25zdAoreworICAg IHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlhbnQsIFtdKGF1dG8mIHBhdGgpIC0+IExl YWZCb3hJdGVyYXRvciB7CisgICAgICAgIHJldHVybiB7IHBhdGguZmlyc3RMZWFmQm94KCkgfTsK KyAgICB9KTsKK30KKworTGVhZkJveEl0ZXJhdG9yIExpbmVCb3g6Omxhc3RMZWFmQm94KCkgY29u c3QKK3sKKyAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbihtX3BhdGhWYXJpYW50LCBbXShhdXRvJiBw YXRoKSAtPiBMZWFmQm94SXRlcmF0b3IgeworICAgICAgICByZXR1cm4geyBwYXRoLmxhc3RMZWFm Qm94KCkgfTsKKyAgICB9KTsKK30KKworTGVhZkJveEl0ZXJhdG9yIGNsb3Nlc3RCb3hGb3JIb3Jp em9udGFsUG9zaXRpb24oY29uc3QgTGluZUJveCYgbGluZUJveCwgZmxvYXQgaG9yaXpvbnRhbFBv c2l0aW9uLCBib29sIGVkaXRhYmxlT25seSkKK3sKKyAgICBhdXRvIGlzRWRpdGFibGUgPSBbJl0o YXV0byBib3gpIHsKKyAgICAgICAgcmV0dXJuIGJveCAmJiBib3gtPnJlbmRlcmVyKCkubm9kZSgp ICYmIGJveC0+cmVuZGVyZXIoKS5ub2RlKCktPmhhc0VkaXRhYmxlU3R5bGUoKTsKKyAgICB9Owor CisgICAgYXV0byBmaXJzdEJveCA9IGxpbmVCb3guZmlyc3RMZWFmQm94KCk7CisgICAgYXV0byBs YXN0Qm94ID0gbGluZUJveC5sYXN0TGVhZkJveCgpOworCisgICAgaWYgKGZpcnN0Qm94ICE9IGxh c3RCb3gpIHsKKyAgICAgICAgaWYgKGZpcnN0Qm94LT5pc0xpbmVCcmVhaygpKQorICAgICAgICAg ICAgZmlyc3RCb3ggPSBmaXJzdEJveC0+bmV4dE9uTGluZUlnbm9yaW5nTGluZUJyZWFrKCk7Cisg ICAgICAgIGVsc2UgaWYgKGxhc3RCb3gtPmlzTGluZUJyZWFrKCkpCisgICAgICAgICAgICBsYXN0 Qm94ID0gbGFzdEJveC0+cHJldmlvdXNPbkxpbmVJZ25vcmluZ0xpbmVCcmVhaygpOworICAgIH0K KworICAgIGlmIChmaXJzdEJveCA9PSBsYXN0Qm94ICYmICghZWRpdGFibGVPbmx5IHx8IGlzRWRp dGFibGUoZmlyc3RCb3gpKSkKKyAgICAgICAgcmV0dXJuIGZpcnN0Qm94OworCisgICAgaWYgKGZp cnN0Qm94ICYmIGhvcml6b250YWxQb3NpdGlvbiA8PSBmaXJzdEJveC0+bG9naWNhbExlZnQoKSAm JiAhZmlyc3RCb3gtPnJlbmRlcmVyKCkuaXNMaXN0TWFya2VyKCkgJiYgKCFlZGl0YWJsZU9ubHkg fHwgaXNFZGl0YWJsZShmaXJzdEJveCkpKQorICAgICAgICByZXR1cm4gZmlyc3RCb3g7CisKKyAg ICBpZiAobGFzdEJveCAmJiBob3Jpem9udGFsUG9zaXRpb24gPj0gbGFzdEJveC0+bG9naWNhbFJp Z2h0KCkgJiYgIWxhc3RCb3gtPnJlbmRlcmVyKCkuaXNMaXN0TWFya2VyKCkgJiYgKCFlZGl0YWJs ZU9ubHkgfHwgaXNFZGl0YWJsZShsYXN0Qm94KSkpCisgICAgICAgIHJldHVybiBsYXN0Qm94Owor CisgICAgYXV0byBjbG9zZXN0Qm94ID0gbGFzdEJveDsKKyAgICBmb3IgKGF1dG8gYm94ID0gZmly c3RCb3g7IGJveDsgYm94ID0gYm94LnRyYXZlcnNlTmV4dE9uTGluZUlnbm9yaW5nTGluZUJyZWFr KCkpIHsKKyAgICAgICAgaWYgKCFib3gtPnJlbmRlcmVyKCkuaXNMaXN0TWFya2VyKCkgJiYgKCFl ZGl0YWJsZU9ubHkgfHwgaXNFZGl0YWJsZShib3gpKSkgeworICAgICAgICAgICAgaWYgKGhvcml6 b250YWxQb3NpdGlvbiA8IGJveC0+bG9naWNhbFJpZ2h0KCkpCisgICAgICAgICAgICAgICAgcmV0 dXJuIGJveDsKKyAgICAgICAgICAgIGNsb3Nlc3RCb3ggPSBib3g7CisgICAgICAgIH0KKyAgICB9 CisKKyAgICByZXR1cm4gY2xvc2VzdEJveDsKK30KKworfQorfQorCg==