219522 2020-12-03 18:28:26 -0800 [LFC][IFC] Decouple inline content and float handling in LineBuilder 2020-12-04 04:28: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 1711921 0 zalan 2020-12-03 18:28:26 -0800 ssia 1711922 1 415373 zalan 2020-12-03 18:40:26 -0800 Created attachment 415373 Patch 1711994 2 ews-feeder 2020-12-04 04:27:05 -0800 Committed r270427: <https://trac.webkit.org/changeset/270427> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415373. 1711995 3 webkit-bug-importer 2020-12-04 04:28:18 -0800 <rdar://problem/71975300> 415373 2020-12-03 18:40:26 -0800 2020-12-04 04:27:06 -0800 Patch bug-219522-20201203184025.patch text/plain 9235 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk1ZDMzOTQxM2I3NWZj MGY3OWMyY2NlNTE3MTk2MzRlZDM2ZTRmMi4uYjE1YzI1MWNjZjFiN2JjOWUxZjIwODYxYmRiNjhm ZDkxYzg0NDRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTEyLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEZWNvdXBs ZSBpbmxpbmUgY29udGVudCBhbmQgZmxvYXQgaGFuZGxpbmcgaW4gTGluZUJ1aWxkZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTUyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBsaW5lIGNhbmRp ZGF0ZSBjb250ZW50IGlzIGVpdGhlciBhIGxpc3Qgb2YgaW5saW5lIHJ1bnMgb3IgYW4gaW5kaXZp ZHVhbCBmbG9hdCBib3guIExldCdzIHByb2Nlc3MgdGhlbSBzZXBhcmF0ZWx5LgorCisgICAgICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBzdXBwb3J0IGZvciAidmVydGljYWxs eSBzdHJldGNoeSIgbGluZXMgdnMuIGludHJ1c2l2ZSBmbG9hdHMgd2hlcmUgdGhlIGxpbmUgaGVp Z2h0CisgICAgICAgIG1heSBjaGFuZ2UgYXMgd2UgYWRkIG5ldyBpbmxpbmUgbGV2ZWwgYm94ZXMg YW5kIHdlIG5lZWQgdG8gcHJvYmUgYWdhaW5zdCBleGlzdGluZyBmbG9hdHMuCisKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmNvbnRpbnVv dXNDb250ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUNhbmRpZGF0 ZTo6SW5saW5lQ29udGVudDo6aXNFbXB0eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlRmxvYXRDb250ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50OjpvcGVyYXRvcigp IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmhhbmRsZUZsb2F0T3JJbmxpbmVDb250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oOgorCiAyMDIwLTEyLTAyICBUcnVp dHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIHIyNzAzMzkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggZDEyYmU3ZGEwNDdm NWZhMjQwMGQ0NzRkYzEyZTAyMTc0NzAyNDRmNy4uYzdmY2QwYWM0Y2QxZjVjMTY4NWM0YTdhYTFj OTk5NjM5ZjdkMjQwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMTI5LDcgKzEyOSw3 IEBAIHN0cnVjdCBMaW5lQ2FuZGlkYXRlIHsKICAgICBzdHJ1Y3QgSW5saW5lQ29udGVudCB7CiAg ICAgICAgIElubGluZUNvbnRlbnQoYm9vbCBpZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcpOwog Ci0gICAgICAgIGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudCYg b3BlcmF0b3IoKSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGludW91c0NvbnRlbnQ7IH0KKyAgICAg ICAgY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50JiBjb250aW51 b3VzQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGludW91c0NvbnRlbnQ7IH0KICAgICAg ICAgY29uc3QgSW5saW5lSXRlbSogdHJhaWxpbmdMaW5lQnJlYWsoKSBjb25zdCB7IHJldHVybiBt X3RyYWlsaW5nTGluZUJyZWFrOyB9CiAgICAgICAgIGNvbnN0IElubGluZUl0ZW0qIHRyYWlsaW5n V29yZEJyZWFrT3Bwb3J0dW5pdHkoKSBjb25zdCB7IHJldHVybiBtX3RyYWlsaW5nV29yZEJyZWFr T3Bwb3J0dW5pdHk7IH0KIApAQCAtMTM3LDYgKzEzNyw3IEBAIHN0cnVjdCBMaW5lQ2FuZGlkYXRl IHsKICAgICAgICAgdm9pZCBhcHBlbmRUcmFpbGluZ0xpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVt JiBsaW5lQnJlYWtJdGVtKSB7IG1fdHJhaWxpbmdMaW5lQnJlYWsgPSAmbGluZUJyZWFrSXRlbTsg fQogICAgICAgICB2b2lkIGFwcGVuZHRyYWlsaW5nV29yZEJyZWFrT3Bwb3J0dW5pdHkoY29uc3Qg SW5saW5lSXRlbSYgd29yZEJyZWFrSXRlbSkgeyBtX3RyYWlsaW5nV29yZEJyZWFrT3Bwb3J0dW5p dHkgPSAmd29yZEJyZWFrSXRlbTsgfQogICAgICAgICB2b2lkIHJlc2V0KCk7CisgICAgICAgIGJv b2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGludW91c0NvbnRlbnQucnVucygpLmlz RW1wdHkoKSAmJiAhdHJhaWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSgpICYmICF0cmFpbGluZ0xp bmVCcmVhaygpOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBib29sIG1faWdub3JlVHJhaWxp bmdMZXR0ZXJTcGFjaW5nIHsgZmFsc2UgfTsKQEAgLTI4OSwxMCArMjkwLDE1IEBAIExpbmVCdWls ZGVyOjpDb21taXR0ZWRDb250ZW50IExpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNvbnRlbnQoY29u c3QgSW5saW5lSXRlbVJhCiAgICAgICAgIC8vIDQuIFJldHVybiBpZiB3ZSBhcmUgYXQgdGhlIGVu ZCBvZiB0aGUgbGluZSBlaXRoZXIgYnkgbm90IGJlaW5nIGFibGUgdG8gZml0IG1vcmUgY29udGVu dCBvciBiZWNhdXNlIG9mIGFuIGV4cGxpY2l0IGxpbmUgYnJlYWsuCiAgICAgICAgIGNhbmRpZGF0 ZUNvbnRlbnRGb3JMaW5lKGxpbmVDYW5kaWRhdGUsIGN1cnJlbnRJdGVtSW5kZXgsIG5lZWRzTGF5 b3V0UmFuZ2UsIHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCwgbV9saW5lLmNvbnRlbnRMb2dp Y2FsV2lkdGgoKSk7CiAgICAgICAgIC8vIE5vdyBjaGVjayBpZiB3ZSBjYW4gcHV0IHRoaXMgY29u dGVudCBvbiB0aGUgY3VycmVudCBsaW5lLgotICAgICAgICBhdXRvIHJlc3VsdCA9IGhhbmRsZUZs b2F0T3JJbmxpbmVDb250ZW50KGlubGluZUNvbnRlbnRCcmVha2VyLCBuZWVkc0xheW91dFJhbmdl LCBsaW5lQ2FuZGlkYXRlKTsKKyAgICAgICAgYXV0byByZXN1bHQgPSBSZXN1bHQgeyB9OworICAg ICAgICBpZiAobGluZUNhbmRpZGF0ZS5mbG9hdEl0ZW0pIHsKKyAgICAgICAgICAgIEFTU0VSVChs aW5lQ2FuZGlkYXRlLmlubGluZUNvbnRlbnQuaXNFbXB0eSgpKTsKKyAgICAgICAgICAgIHJlc3Vs dCA9IGhhbmRsZUZsb2F0Q29udGVudCgqbGluZUNhbmRpZGF0ZS5mbG9hdEl0ZW0pOworICAgICAg ICB9IGVsc2UKKyAgICAgICAgICAgIHJlc3VsdCA9IGhhbmRsZUlubGluZUNvbnRlbnQoaW5saW5l Q29udGVudEJyZWFrZXIsIG5lZWRzTGF5b3V0UmFuZ2UsIGxpbmVDYW5kaWRhdGUpOwogICAgICAg ICBjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQgPSByZXN1bHQuY29tbWl0dGVkQ291bnQuaXNSZXZl cnQgPyByZXN1bHQuY29tbWl0dGVkQ291bnQudmFsdWUgOiBjb21taXR0ZWRJbmxpbmVJdGVtQ291 bnQgKyByZXN1bHQuY29tbWl0dGVkQ291bnQudmFsdWU7CiAgICAgICAgIGF1dG8mIGlubGluZUNv bnRlbnQgPSBsaW5lQ2FuZGlkYXRlLmlubGluZUNvbnRlbnQ7Ci0gICAgICAgIGF1dG8gaW5saW5l Q29udGVudElzRnVsbHlDb21taXR0ZWQgPSBpbmxpbmVDb250ZW50KCkucnVucygpLnNpemUoKSA9 PSByZXN1bHQuY29tbWl0dGVkQ291bnQudmFsdWUgJiYgIXJlc3VsdC5wYXJ0aWFsVHJhaWxpbmdD b250ZW50TGVuZ3RoOworICAgICAgICBhdXRvIGlubGluZUNvbnRlbnRJc0Z1bGx5Q29tbWl0dGVk ID0gaW5saW5lQ29udGVudC5jb250aW51b3VzQ29udGVudCgpLnJ1bnMoKS5zaXplKCkgPT0gcmVz dWx0LmNvbW1pdHRlZENvdW50LnZhbHVlICYmICFyZXN1bHQucGFydGlhbFRyYWlsaW5nQ29udGVu dExlbmd0aDsKICAgICAgICAgYXV0byBpc0VuZE9mTGluZSA9IHJlc3VsdC5pc0VuZE9mTGluZSA9 PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6OlllczsKIAogICAgICAgICBpZiAo aW5saW5lQ29udGVudElzRnVsbHlDb21taXR0ZWQpIHsKQEAgLTUyMywyOCArNTI5LDMwIEBAIHNp emVfdCBMaW5lQnVpbGRlcjo6bmV4dFdyYXBPcHBvcnR1bml0eShzaXplX3Qgc3RhcnRJbmRleCwg Y29uc3QgTGluZUJ1aWxkZXI6OkluCiAgICAgcmV0dXJuIGxheW91dFJhbmdlLmVuZDsKIH0KIAot TGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlRmxvYXRPcklubGluZUNvbnRl bnQoSW5saW5lQ29udGVudEJyZWFrZXImIGlubGluZUNvbnRlbnRCcmVha2VyLCBjb25zdCBJbmxp bmVJdGVtUmFuZ2UmIGxheW91dFJhbmdlLCBjb25zdCBMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlk YXRlKQorTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlRmxvYXRDb250ZW50 KGNvbnN0IElubGluZUl0ZW0mIGZsb2F0SXRlbSkKIHsKLSAgICBpZiAobGluZUNhbmRpZGF0ZS5p bmxpbmVDb250ZW50KCkucnVucygpLmlzRW1wdHkoKSAmJiAhbGluZUNhbmRpZGF0ZS5mbG9hdEl0 ZW0pIHsKLSAgICAgICAgYXV0byYgaW5saW5lQ29udGVudCA9IGxpbmVDYW5kaWRhdGUuaW5saW5l Q29udGVudDsKKyAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbV9ob3Jpem9udGFsU3BhY2VGb3JM aW5lIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKKyAgICBhdXRvIGZsb2F0Qm94V2lk dGggPSBpbmxpbmVJdGVtV2lkdGgoZmxvYXRJdGVtLCB7IH0pOworICAgIGlmIChmbG9hdEJveFdp ZHRoID4gYXZhaWxhYmxlV2lkdGggJiYgIW1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpKQorICAg ICAgICByZXR1cm4geyBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6OlllcyB9Owor ICAgIC8vIFRoaXMgZmxvYXQgc2hyaW5rcyB0aGUgY3VycmVudCBsaW5lLgorICAgIGF1dG8mIGZs b2F0Qm94ID0gZmxvYXRJdGVtLmxheW91dEJveCgpOworICAgIG1fZmxvYXRzLmFwcGVuZCgmZmxv YXRCb3gpOworICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0ID0gdHJ1ZTsKKyAgICBp ZiAoZmxvYXRCb3guaXNMZWZ0RmxvYXRpbmdQb3NpdGlvbmVkKCkpCisgICAgICAgIG1fbGluZS5t b3ZlTG9naWNhbExlZnQoZmxvYXRCb3hXaWR0aCk7CisgICAgbV9ob3Jpem9udGFsU3BhY2VGb3JM aW5lIC09IGZsb2F0Qm94V2lkdGg7CisgICAgcmV0dXJuIHsgSW5saW5lQ29udGVudEJyZWFrZXI6 OklzRW5kT2ZMaW5lOjpObyB9OworfQorCitMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVy OjpoYW5kbGVJbmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiBpbmxpbmVDb250ZW50 QnJlYWtlciwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgY29uc3QgTGluZUNh bmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSkKK3sKKyAgICBhdXRvJiBpbmxpbmVDb250ZW50ID0gbGlu ZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50OworICAgIGlmIChpbmxpbmVDb250ZW50LmNvbnRpbnVv dXNDb250ZW50KCkucnVucygpLmlzRW1wdHkoKSkgewogICAgICAgICBBU1NFUlQoaW5saW5lQ29u dGVudC50cmFpbGluZ0xpbmVCcmVhaygpIHx8IGlubGluZUNvbnRlbnQudHJhaWxpbmdXb3JkQnJl YWtPcHBvcnR1bml0eSgpKTsKICAgICAgICAgcmV0dXJuIHsgaW5saW5lQ29udGVudC50cmFpbGlu Z0xpbmVCcmVhaygpID8gSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lOjpZZXMgOiBJ bmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5vIH07CiAgICAgfQogICAgIGF1dG8g YXZhaWxhYmxlV2lkdGggPSBtX2hvcml6b250YWxTcGFjZUZvckxpbmUgLSBtX2xpbmUuY29udGVu dExvZ2ljYWxXaWR0aCgpOwotICAgIGlmIChsaW5lQ2FuZGlkYXRlLmZsb2F0SXRlbSkgewotICAg ICAgICBhdXRvIGZsb2F0Qm94V2lkdGggPSBpbmxpbmVJdGVtV2lkdGgoKmxpbmVDYW5kaWRhdGUu ZmxvYXRJdGVtLCB7IH0pOwotICAgICAgICBpZiAoZmxvYXRCb3hXaWR0aCA+IGF2YWlsYWJsZVdp ZHRoICYmICFtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSkKLSAgICAgICAgICAgIHJldHVybiB7 IElubGluZUNvbnRlbnRCcmVha2VyOjpJc0VuZE9mTGluZTo6WWVzIH07Ci0gICAgICAgIC8vIFRo aXMgZmxvYXQgc2hyaW5rcyB0aGUgY3VycmVudCBsaW5lLgotICAgICAgICBhdXRvJiBmbG9hdEJv eCA9IGxpbmVDYW5kaWRhdGUuZmxvYXRJdGVtLT5sYXlvdXRCb3goKTsKLSAgICAgICAgbV9mbG9h dHMuYXBwZW5kKCZmbG9hdEJveCk7Ci0gICAgICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZs b2F0ID0gdHJ1ZTsKLSAgICAgICAgaWYgKGZsb2F0Qm94LmlzTGVmdEZsb2F0aW5nUG9zaXRpb25l ZCgpKQotICAgICAgICAgICAgbV9saW5lLm1vdmVMb2dpY2FsTGVmdChmbG9hdEJveFdpZHRoKTsK LSAgICAgICAgbV9ob3Jpem9udGFsU3BhY2VGb3JMaW5lIC09IGZsb2F0Qm94V2lkdGg7Ci0gICAg ICAgIHJldHVybiB7IElubGluZUNvbnRlbnRCcmVha2VyOjpJc0VuZE9mTGluZTo6Tm8gfTsKLSAg ICB9Ci0KICAgICBhdXRvIHNob3VsZERpc2FibGVIeXBoZW5hdGlvbiA9IFsmXSB7CiAgICAgICAg IGF1dG8mIHN0eWxlID0gcm9vdCgpLnN0eWxlKCk7CiAgICAgICAgIHVuc2lnbmVkIGxpbWl0TGlu ZXMgPSBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0TGluZXMoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlh bEh5cGhlbmF0aW9uTGltaXRMaW5lcygpID8gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46 Om1heCgpIDogc3R5bGUuaHlwaGVuYXRpb25MaW1pdExpbmVzKCk7CkBAIC01NTQsNyArNTYyLDcg QEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlRmxvYXRPcklubGluZUNv bnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXIKICAgICAgICAgaW5saW5lQ29udGVudEJyZWFrZXIu c2V0SHlwaGVuYXRpb25EaXNhYmxlZCgpOwogCiAgICAgLy8gQ2hlY2sgaWYgdGhpcyBuZXcgY29u dGVudCBmaXRzLgotICAgIGF1dG8mIGNvbnRpbnVvdXNJbmxpbmVDb250ZW50ID0gbGluZUNhbmRp ZGF0ZS5pbmxpbmVDb250ZW50KCk7CisgICAgYXV0byYgY29udGludW91c0lubGluZUNvbnRlbnQg PSBsaW5lQ2FuZGlkYXRlLmlubGluZUNvbnRlbnQuY29udGludW91c0NvbnRlbnQoKTsKICAgICBh dXRvIGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9IG1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpICYm ICFtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKICAgICBhdXRvIGxpbmVTdGF0dXMgPSBJ bmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFdp ZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBt X2xpbmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxs eVRyaW1tYWJsZSgpLCBpc0xpbmVDb25zaWRlcmVkRW1wdHkgfTsKICAgICBhdXRvIHJlc3VsdCA9 IGlubGluZUNvbnRlbnRCcmVha2VyLnByb2Nlc3NJbmxpbmVDb250ZW50KGNvbnRpbnVvdXNJbmxp bmVDb250ZW50LCBsaW5lU3RhdHVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IGZjMmU4MjBk YzdjYzI3NzdjY2U0YzY5MzE5MGQ2MjkwNGY4ZWFiMzEuLjJiYjAwOWU3M2NjNGY1MDAzNjdkN2Iz Y2M5NTFmODU2MmEwNzE0ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtODcsNyArODcsOCBA QCBwcml2YXRlOgogICAgICAgICBib29sIGlzQ29uc3RyYWluZWRCeUZsb2F0IHsgZmFsc2UgfTsK ICAgICB9OwogICAgIFVzZWRDb25zdHJhaW50cyBjb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5s aW5lUmVjdCYgaW5pdGlhbExpbmVDb25zdHJhaW50cywgYm9vbCBpc0ZpcnN0TGluZSk7Ci0gICAg UmVzdWx0IGhhbmRsZUZsb2F0T3JJbmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiwg Y29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBMaW5lQ2FuZGlk YXRlJik7CisgICAgUmVzdWx0IGhhbmRsZUZsb2F0Q29udGVudChjb25zdCBJbmxpbmVJdGVtJik7 CisgICAgUmVzdWx0IGhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXImLCBj b25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIGNvbnN0IExpbmVDYW5kaWRh dGUmKTsKICAgICBzaXplX3QgcmVidWlsZExpbmUoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVk c0xheW91dFJhbmdlLCBjb25zdCBJbmxpbmVJdGVtJiBsYXN0SW5saW5lSXRlbVRvQWRkKTsKICAg ICBzaXplX3QgcmVidWlsZExpbmVGb3JUcmFpbGluZ1NvZnRIeXBoZW4oY29uc3QgSW5saW5lSXRl bVJhbmdlJiBsYXlvdXRSYW5nZSk7CiAgICAgdm9pZCBjb21taXRQYXJ0aWFsQ29udGVudChjb25z dCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1bkxpc3QmLCBjb25z dCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50Jik7 Cg==