233277 2021-11-17 12:47:08 -0800 [LFC][IFC] Introduce enum class IntrinsicWidthMode 2021-11-17 14:56:25 -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 1816074 0 zalan 2021-11-17 12:47:08 -0800 This is going to be used to check if we are doing min or max intrinsic width computation (some css properties behave slightly different in min and max mode). 1816076 1 444556 zalan 2021-11-17 12:57:05 -0800 Created attachment 444556 Patch 1816142 2 ews-feeder 2021-11-17 14:55:16 -0800 Committed r285956 (244357@main): <https://commits.webkit.org/244357@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444556. 1816143 3 webkit-bug-importer 2021-11-17 14:56:25 -0800 <rdar://problem/85522294> 444556 2021-11-17 12:57:05 -0800 2021-11-17 14:55:17 -0800 Patch bug-233277-20211117125704.patch text/plain 15426 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU2YmU1ZDRhYzNiYjM0 ODM4NzJhMmI2MjI1MjNkNjUzZmJhNWVmNS4uMjQ2NTVhOGI2NjkyMmM4ZTU3YTc5OTZmZWRjNDhj OTJlMjZmMGNkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTExLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEludHJvZHVj ZSBlbnVtIGNsYXNzIEludHJpbnNpY1dpZHRoTW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMjc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYmVpbmcg YWJsZSB0byBhcHBseSBkaWZmZXJlbnQgZ2x5cGggaGFuZ2luZyBiZWhhdmlvciBmb3IgbWluIGFu ZCBtYXggaW50cmluc2ljIHdpZHRoIGNvbXB1dGF0aW9uLgorCisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaDoKKyAgICAgICAgKiBsYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpJbmxpbmVDb250 ZW50QnJlYWtlcik6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lQ29udGVudEJyZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l Q29udGVudEJyZWFrZXI6OmlzSW5JbnRyaW5zaWNXaWR0aE1vZGUgY29uc3QpOgorICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoRm9y Q29uc3RyYWludCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpMaW5lQnVpbGRlcik6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjb21wdXRlZEludHJpbnNpY1dpZHRoKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OnBsYWNlSW5saW5lQ29udGVudCk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmludHJpbnNpY1dpZHRo TW9kZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjppc0lu SW50cmluc2ljV2lkdGhNb2RlIGNvbnN0KToKKwogMjAyMS0xMS0xNyAgQWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkcmVzcyBwb3N0IHJldmlldyBjb21tZW50IGFm dGVyIHIyODU5MjUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaAppbmRleCBlMDk3MDhh MjhmNjkzN2RkMDkyNTIxMTRiZTY0MjA1NjM5NTJkMmUxLi5lMDhkY2Y2YTQxOTZjZDFhN2U3Yjky NmQ4MDlhNDAxNzg0MThlYzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKQEAg LTg3LDYgKzg3LDExIEBAIGlubGluZSBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQ6OkNvbnN0 cmFpbnRzRm9ySW5GbG93Q29udGVudChIb3Jpem9udGFsQ29uc3RyCiB7CiB9CiAKK2VudW0gY2xh c3MgSW50cmluc2ljV2lkdGhNb2RlIHsKKyAgICBNaW5pbXVtLAorICAgIE1heGltdW0KK307CisK IHN0cnVjdCBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIHsKICAgICB2b2lkIGV4cGFuZChMYXlv dXRVbml0IGhvcml6b250YWxWYWx1ZSk7CiAgICAgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyYg b3BlcmF0b3IrPShjb25zdCBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzJik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKaW5kZXggZmYyZmViYzk0MGVjODQ2 Y2UyNjM2ZDZhNGNmNjVjMzU2ZTcyNGVhMy4uMzU5NGFjOTczZmExODg4YWEzYzYyMTU4ZGMwOWNi ZGUzNjViMWE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2Vy LmNwcApAQCAtMTI1LDggKzEyNSw4IEBAIHN0YXRpYyBpbmxpbmUgc3RkOjpvcHRpb25hbDxzaXpl X3Q+IGZpcnN0VGV4dFJ1bkluZGV4KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyCiAgICAgcmV0 dXJuIHsgfTsKIH0KIAotSW5saW5lQ29udGVudEJyZWFrZXI6OklubGluZUNvbnRlbnRCcmVha2Vy KGJvb2wgaXNJbkludHJpbnNpY1dpZHRoTW9kZSkKLSAgICA6IG1faXNJbkludHJpbnNpY1dpZHRo TW9kZShpc0luSW50cmluc2ljV2lkdGhNb2RlKQorSW5saW5lQ29udGVudEJyZWFrZXI6OklubGlu ZUNvbnRlbnRCcmVha2VyKHN0ZDo6b3B0aW9uYWw8SW50cmluc2ljV2lkdGhNb2RlPiBpbnRyaW5z aWNXaWR0aE1vZGUpCisgICAgOiBtX2ludHJpbnNpY1dpZHRoTW9kZShpbnRyaW5zaWNXaWR0aE1v ZGUpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCmlu ZGV4IDkxYjc0NzZkOTRmNWI3NTg3MGE0YThhZThjNTZlODY3ZGVlNzA0NjYuLmIzMjNiMGI3NmEz OTJhODNjZjY1MTFmY2EzZTEyNjNkYTZiYzcxMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuaApAQCAtMjcsNiArMjcsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9V VF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKKyNpbmNsdWRlICJGb3JtYXR0aW5nQ29uc3RyYWludHMu aCIKICNpbmNsdWRlICJMYXlvdXRVbml0cy5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlLmgiCiAK QEAgLTM4LDcgKzM5LDcgQEAgc3RydWN0IENhbmRpZGF0ZVRleHRSdW5Gb3JCcmVha2luZzsKIAog Y2xhc3MgSW5saW5lQ29udGVudEJyZWFrZXIgewogcHVibGljOgotICAgIElubGluZUNvbnRlbnRC cmVha2VyKGJvb2wgaXNJbkludHJpbnNpY1dpZHRoTW9kZSk7CisgICAgSW5saW5lQ29udGVudEJy ZWFrZXIoc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNXaWR0aE1vZGU+KTsKIAogICAgIHN0cnVjdCBQ YXJ0aWFsUnVuIHsKICAgICAgICAgc2l6ZV90IGxlbmd0aCB7IDAgfTsKQEAgLTE1MCw5ICsxNTEs OSBAQCBwcml2YXRlOgogICAgIH07CiAgICAgT3B0aW9uU2V0PFdvcmRCcmVha1J1bGU+IHdvcmRC cmVha0JlaGF2aW9yKGNvbnN0IFJlbmRlclN0eWxlJiwgYm9vbCBoYXNXcmFwT3Bwb3J0dW5pdHlB dFByZXZpb3VzUG9zaXRpb24pIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkS2VlcEVuZE9mTGluZVdo aXRlc3BhY2UoY29uc3QgQ29udGludW91c0NvbnRlbnQmKSBjb25zdDsKLSAgICBib29sIGlzSW5J bnRyaW5zaWNXaWR0aE1vZGUoKSBjb25zdCB7IHJldHVybiBtX2lzSW5JbnRyaW5zaWNXaWR0aE1v ZGU7IH0KKyAgICBib29sIGlzSW5JbnRyaW5zaWNXaWR0aE1vZGUoKSBjb25zdCB7IHJldHVybiAh IW1faW50cmluc2ljV2lkdGhNb2RlOyB9CiAKLSAgICBib29sIG1faXNJbkludHJpbnNpY1dpZHRo TW9kZSB7IGZhbHNlIH07CisgICAgc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNXaWR0aE1vZGU+IG1f aW50cmluc2ljV2lkdGhNb2RlOwogICAgIGJvb2wgbl9oeXBoZW5hdGlvbklzRGlzYWJsZWQgeyBm YWxzZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwCmluZGV4IGZmMGI1NjJhZDRiZTFiM2Q2NGI3NTU5ZGEyNzhmYTlmY2RhMzFmMGIu LjRkNmNkZDZkMjAyNTI4YzgwMzc2OTQ2OWU4MmM1MDk2OTJmY2ExMmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTM5NywzNCArMzk3 LDM0IEBAIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhCiAKICAgICBjb2xsZWN0Q29udGVudElmTmVl ZGVkKCk7CiAKLSAgICBhdXRvIG1heGltdW1MaW5lV2lkdGggPSBbJl0oYXV0byBhdmFpbGFibGVX aWR0aCkgeworICAgIGF1dG8gbWF4aW11bUxpbmVXaWR0aCA9IFsmXShhdXRvIGludHJpbnNpY1dp ZHRoTW9kZSkgewogICAgICAgICAvLyBTd2l0Y2ggdG8gdGhlIG1pbi9tYXggZm9ybWF0dGluZyBy b290IHdpZHRoIHZhbHVlcyBiZWZvcmUgZm9ybWF0dGluZyB0aGUgbGluZXMuCiAgICAgICAgIGZv ciAoYXV0byogZm9ybWF0dGluZ1Jvb3QgOiBmb3JtYXR0aW5nQ29udGV4dFJvb3RMaXN0KSB7CiAg ICAgICAgICAgICBhdXRvIGludHJpbnNpY1dpZHRocyA9IGxheW91dFN0YXRlLmZvcm1hdHRpbmdT dGF0ZUZvckJveCgqZm9ybWF0dGluZ1Jvb3QpLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JC b3goKmZvcm1hdHRpbmdSb290KTsKICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9y bWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkoKmZvcm1hdHRpbmdSb290KTsKLSAgICAgICAgICAg IGF1dG8gY29udGVudFdpZHRoID0gKGF2YWlsYWJsZVdpZHRoID8gaW50cmluc2ljV2lkdGhzLT5t YXhpbXVtIDogaW50cmluc2ljV2lkdGhzLT5taW5pbXVtKSAtIGJveEdlb21ldHJ5Lmhvcml6b250 YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCk7CisgICAgICAgICAgICBhdXRvIGNvbnRlbnRXaWR0 aCA9IChpbnRyaW5zaWNXaWR0aE1vZGUgPT0gSW50cmluc2ljV2lkdGhNb2RlOjpNYXhpbXVtID8g aW50cmluc2ljV2lkdGhzLT5tYXhpbXVtIDogaW50cmluc2ljV2lkdGhzLT5taW5pbXVtKSAtIGJv eEdlb21ldHJ5Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCk7CiAgICAgICAgICAg ICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoY29udGVudFdpZHRoKTsKICAgICAgICAg fQotICAgICAgICByZXR1cm4gY29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFpbnQoYXZh aWxhYmxlV2lkdGgpOworICAgICAgICByZXR1cm4gY29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNv bnN0cmFpbnQoaW50cmluc2ljV2lkdGhNb2RlKTsKICAgICB9OwogCi0gICAgYXV0byBtaW5pbXVt Q29udGVudFdpZHRoID0gY2VpbGVkTGF5b3V0VW5pdChtYXhpbXVtTGluZVdpZHRoKDApKTsKLSAg ICBhdXRvIG1heGltdW1Db250ZW50V2lkdGggPSBjZWlsZWRMYXlvdXRVbml0KG1heGltdW1MaW5l V2lkdGgobWF4SW5saW5lTGF5b3V0VW5pdCgpKSk7CisgICAgYXV0byBtaW5pbXVtQ29udGVudFdp ZHRoID0gY2VpbGVkTGF5b3V0VW5pdChtYXhpbXVtTGluZVdpZHRoKEludHJpbnNpY1dpZHRoTW9k ZTo6TWluaW11bSkpOworICAgIGF1dG8gbWF4aW11bUNvbnRlbnRXaWR0aCA9IGNlaWxlZExheW91 dFVuaXQobWF4aW11bUxpbmVXaWR0aChJbnRyaW5zaWNXaWR0aE1vZGU6Ok1heGltdW0pKTsKICAg ICBhdXRvIGNvbnN0cmFpbnRzID0gZm9ybWF0dGluZ0dlb21ldHJ5KCkuY29uc3RyYWluQnlNaW5N YXhXaWR0aChyb290KCksIHsgbWluaW11bUNvbnRlbnRXaWR0aCwgbWF4aW11bUNvbnRlbnRXaWR0 aCB9KTsKICAgICBmb3JtYXR0aW5nU3RhdGUoKS5zZXRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KGNvbnN0cmFpbnRzKTsKICAgICByZXR1cm4gY29uc3RyYWludHM7CiB9CiAKLUlubGluZUxheW91 dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljV2lkdGhGb3JD b25zdHJhaW50KElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0CitJbmxpbmVM YXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRo Rm9yQ29uc3RyYWludChJbnRyaW5zaWNXaWR0aE1vZGUgaW50cmluc2ljV2lkdGhNb2RlKSBjb25z dAogewogICAgIGF1dG8mIGlubGluZUl0ZW1zID0gZm9ybWF0dGluZ1N0YXRlKCkuaW5saW5lSXRl bXMoKTsKLSAgICBhdXRvIGxpbmVCdWlsZGVyID0gTGluZUJ1aWxkZXIgeyAqdGhpcywgaW5saW5l SXRlbXMgfTsKKyAgICBhdXRvIGxpbmVCdWlsZGVyID0gTGluZUJ1aWxkZXIgeyAqdGhpcywgaW5s aW5lSXRlbXMsIGludHJpbnNpY1dpZHRoTW9kZSB9OwogICAgIGF1dG8gbGF5b3V0UmFuZ2UgPSBM aW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdlIHsgMCAsIGlubGluZUl0ZW1zLnNpemUoKSB9Owog ICAgIGF1dG8gbWF4aW11bUxpbmVXaWR0aCA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgIGF1 dG8gbWF4aW11bUZsb2F0V2lkdGggPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGlzRmlyc3RM aW5lID0gdHJ1ZTsKICAgICB3aGlsZSAoIWxheW91dFJhbmdlLmlzRW1wdHkoKSkgewotICAgICAg ICBhdXRvIGludHJpbnNpY0NvbnRlbnQgPSBsaW5lQnVpbGRlci5jb21wdXRlZEludHJpbnNpY1dp ZHRoKGxheW91dFJhbmdlLCBhdmFpbGFibGVXaWR0aCwgaXNGaXJzdExpbmUpOworICAgICAgICBh dXRvIGludHJpbnNpY0NvbnRlbnQgPSBsaW5lQnVpbGRlci5jb21wdXRlZEludHJpbnNpY1dpZHRo KGxheW91dFJhbmdlLCBpc0ZpcnN0TGluZSk7CiAgICAgICAgIGxheW91dFJhbmdlLnN0YXJ0ID0g aW50cmluc2ljQ29udGVudC5pbmxpbmVJdGVtUmFuZ2UuZW5kOwogICAgICAgICBtYXhpbXVtTGlu ZVdpZHRoID0gc3RkOjptYXgobWF4aW11bUxpbmVXaWR0aCwgaW50cmluc2ljQ29udGVudC5sb2dp Y2FsV2lkdGgpOwogICAgICAgICBpc0ZpcnN0TGluZSA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggY2U4MDVjMDA5NDYyNmVmMGRl NWFhZGI2ZDc2OWNiOGQ4MjAyMGNiYS4uNDdlNDBiZmM3ODYzMDBkMjFkYWU3OTY0ZDA0MjdhODA2 ZmRmMzI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5oCkBAIC02NSw3ICs2NSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlU3RhdGljUG9z aXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcm1hdHRpbmdTdGF0ZTo6T3V0T2ZGbG93 Qm94TGlzdCYpOwogCiAgICAgdm9pZCBjb21wdXRlSW50cmluc2ljV2lkdGhGb3JGb3JtYXR0aW5n Um9vdChjb25zdCBCb3gmKTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkSW50cmluc2lj V2lkdGhGb3JDb25zdHJhaW50KElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0 OworICAgIElubGluZUxheW91dFVuaXQgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFp bnQoSW50cmluc2ljV2lkdGhNb2RlKSBjb25zdDsKIAogICAgIHZvaWQgY29tcHV0ZUhvcml6b250 YWxNYXJnaW4oY29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJik7CiAgICAg dm9pZCBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxD b25zdHJhaW50cyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmlu ZGV4IDEwM2Y0NDIyYmYzYTk1MWJmZDA3NmU4ZmE1MWJjYjZlMzYyMGY2N2QuLjkzOWNjYTcxZDdj MjU5OTU1MjcwZThkNDNjYjYwNWVjNDUzYTdlYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQnVpbGRlci5jcHAKQEAgLTI2OSw4ICsyNjksOCBAQCBJbmxpbmVMYXlvdXRVbml0IExp bmVCdWlsZGVyOjppbmxpbmVJdGVtV2lkdGgoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwg SW5saQogICAgIHJldHVybiBib3hHZW9tZXRyeS5tYXJnaW5Cb3hXaWR0aCgpOwogfQogCi1MaW5l QnVpbGRlcjo6TGluZUJ1aWxkZXIoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1h dHRpbmdDb250ZXh0LCBGbG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlLCBIb3Jpem9udGFsQ29u c3RyYWludHMgcm9vdEhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgSW5saW5lSXRlbXMmIGlu bGluZUl0ZW1zLCBJc0luSW50cmluc2ljV2lkdGhNb2RlIGlzSW5JbnRyaW5zaWNXaWR0aE1vZGUp Ci0gICAgOiBtX2lzSW5JbnRyaW5zaWNXaWR0aE1vZGUoaXNJbkludHJpbnNpY1dpZHRoTW9kZSA9 PSBJc0luSW50cmluc2ljV2lkdGhNb2RlOjpZZXMpCitMaW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIo SW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LCBGbG9hdGlu Z1N0YXRlJiBmbG9hdGluZ1N0YXRlLCBIb3Jpem9udGFsQ29uc3RyYWludHMgcm9vdEhvcml6b250 YWxDb25zdHJhaW50cywgY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zLCBzdGQ6Om9wdGlv bmFsPEludHJpbnNpY1dpZHRoTW9kZT4gaW50cmluc2ljV2lkdGhNb2RlKQorICAgIDogbV9pbnRy aW5zaWNXaWR0aE1vZGUoaW50cmluc2ljV2lkdGhNb2RlKQogICAgICwgbV9pbmxpbmVGb3JtYXR0 aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKICAgICAsIG1faW5saW5lRm9ybWF0 dGluZ1N0YXRlKCZpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5mb3JtYXR0aW5nU3RhdGUoKSkKICAg ICAsIG1fZmxvYXRpbmdTdGF0ZSgmZmxvYXRpbmdTdGF0ZSkKQEAgLTI4MCw4ICsyODAsOCBAQCBM aW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZv cm1hdHRpbmdDb250ZXh0LCBGbG9hdAogewogfQogCi1MaW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIo Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LCBj b25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIElzSW5JbnRyaW5zaWNXaWR0aE1vZGUgaXNJ bkludHJpbnNpY1dpZHRoTW9kZSkKLSAgICA6IG1faXNJbkludHJpbnNpY1dpZHRoTW9kZShpc0lu SW50cmluc2ljV2lkdGhNb2RlID09IElzSW5JbnRyaW5zaWNXaWR0aE1vZGU6OlllcykKK0xpbmVC dWlsZGVyOjpMaW5lQnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcywgc3RkOjpv cHRpb25hbDxJbnRyaW5zaWNXaWR0aE1vZGU+IGludHJpbnNpY1dpZHRoTW9kZSkKKyAgICA6IG1f aW50cmluc2ljV2lkdGhNb2RlKGludHJpbnNpY1dpZHRoTW9kZSkKICAgICAsIG1faW5saW5lRm9y bWF0dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCiAgICAgLCBtX2xpbmUoaW5s aW5lRm9ybWF0dGluZ0NvbnRleHQpCiAgICAgLCBtX2lubGluZUl0ZW1zKGlubGluZUl0ZW1zKQpA QCAtMzI2LDkgKzMyNiwxMSBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6 OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJgogICAgICAgICAsIGxp bmVSdW5zIH07CiB9CiAKLUxpbmVCdWlsZGVyOjpJbnRyaW5zaWNDb250ZW50IExpbmVCdWlsZGVy Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlv dXRSYW5nZSwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgYm9vbCBpc0ZpcnN0TGlu ZSkKK0xpbmVCdWlsZGVyOjpJbnRyaW5zaWNDb250ZW50IExpbmVCdWlsZGVyOjpjb21wdXRlZElu dHJpbnNpY1dpZHRoKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5nZSwgYm9v bCBpc0ZpcnN0TGluZSkKIHsKLSAgICBhdXRvIGxpbmVDb25zdHJhaW50cyA9IGluaXRpYWxDb25z dHJhaW50c0ZvckxpbmUoeyAwLCAwLCBhdmFpbGFibGVXaWR0aCwgMCB9LCBpc0ZpcnN0TGluZSk7 CisgICAgQVNTRVJUKGlzSW5JbnRyaW5zaWNXaWR0aE1vZGUoKSk7CisgICAgYXV0byBsaW5lTG9n aWNhbFdpZHRoID0gKmludHJpbnNpY1dpZHRoTW9kZSgpID09IEludHJpbnNpY1dpZHRoTW9kZTo6 TWF4aW11bSA/IG1heElubGluZUxheW91dFVuaXQoKSA6IDAuZjsKKyAgICBhdXRvIGxpbmVDb25z dHJhaW50cyA9IGluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoeyAwLCAwLCBsaW5lTG9naWNhbFdp ZHRoLCAwIH0sIGlzRmlyc3RMaW5lKTsKICAgICBpbml0aWFsaXplKGxpbmVDb25zdHJhaW50cywg aXNGaXJzdExpbmUsIG5lZWRzTGF5b3V0UmFuZ2Uuc3RhcnQsIHsgfSwgeyB9KTsKIAogICAgIGF1 dG8gY29tbWl0dGVkQ29udGVudCA9IHBsYWNlSW5saW5lQ29udGVudChuZWVkc0xheW91dFJhbmdl KTsKQEAgLTM5Myw3ICszOTUsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0 IFVzZWRDb25zdHJhaW50cyYgbGluZUNvbnN0cmFpbnRzLCBib29sIGlzRmlycwogTGluZUJ1aWxk ZXI6OkNvbW1pdHRlZENvbnRlbnQgTGluZUJ1aWxkZXI6OnBsYWNlSW5saW5lQ29udGVudChjb25z dCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UpCiB7CiAgICAgYXV0byBsaW5lQ2Fu ZGlkYXRlID0gTGluZUNhbmRpZGF0ZSB7IGxheW91dFN0YXRlKCkuc2hvdWxkSWdub3JlVHJhaWxp bmdMZXR0ZXJTcGFjaW5nKCkgfTsKLSAgICBhdXRvIGlubGluZUNvbnRlbnRCcmVha2VyID0gSW5s aW5lQ29udGVudEJyZWFrZXIgeyBpc0luSW50cmluc2ljV2lkdGhNb2RlKCkgfTsKKyAgICBhdXRv IGlubGluZUNvbnRlbnRCcmVha2VyID0gSW5saW5lQ29udGVudEJyZWFrZXIgeyBpbnRyaW5zaWNX aWR0aE1vZGUoKSB9OwogCiAgICAgYXV0byBjdXJyZW50SXRlbUluZGV4ID0gbmVlZHNMYXlvdXRS YW5nZS5zdGFydDsKICAgICBzaXplX3QgY29tbWl0dGVkSW5saW5lSXRlbUNvdW50ID0gMDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IGU2ODMwOWE0MzkyMTU5YmU4 ZjUzMTA3ZDA1OWQ3MjZkM2MzNmExNzYuLjNhODc2NTA5NDhmOTc0ZDA5NmJjOGQzOWRjNTJlY2Fk OTNlZWM5ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtMjcs NiArMjcsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKKyNp bmNsdWRlICJGb3JtYXR0aW5nQ29uc3RyYWludHMuaCIKICNpbmNsdWRlICJJbmxpbmVDb250ZW50 QnJlYWtlci5oIgogI2luY2x1ZGUgIklubGluZUZvcm1hdHRpbmdTdGF0ZS5oIgogI2luY2x1ZGUg IklubGluZUxpbmUuaCIKQEAgLTM5LDkgKzQwLDggQEAgc3RydWN0IExpbmVDYW5kaWRhdGU7CiAK IGNsYXNzIExpbmVCdWlsZGVyIHsKIHB1YmxpYzoKLSAgICBlbnVtIGNsYXNzIElzSW5JbnRyaW5z aWNXaWR0aE1vZGUgeyBObywgWWVzIH07Ci0gICAgTGluZUJ1aWxkZXIoSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQmLCBGbG9hdGluZ1N0YXRlJiwgSG9yaXpvbnRhbENvbnN0cmFpbnRzIHJvb3RIb3Jp em9udGFsQ29uc3RyYWludHMsIGNvbnN0IElubGluZUl0ZW1zJiwgSXNJbkludHJpbnNpY1dpZHRo TW9kZSA9IElzSW5JbnRyaW5zaWNXaWR0aE1vZGU6Ok5vKTsKLSAgICBMaW5lQnVpbGRlcihjb25z dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIGNvbnN0IElubGluZUl0ZW1zJiwgSXNJbkludHJp bnNpY1dpZHRoTW9kZSA9IElzSW5JbnRyaW5zaWNXaWR0aE1vZGU6Olllcyk7CisgICAgTGluZUJ1 aWxkZXIoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmLCBGbG9hdGluZ1N0YXRlJiwgSG9yaXpvbnRh bENvbnN0cmFpbnRzIHJvb3RIb3Jpem9udGFsQ29uc3RyYWludHMsIGNvbnN0IElubGluZUl0ZW1z Jiwgc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNXaWR0aE1vZGU+ID0gc3RkOjpudWxsb3B0KTsKKyAg ICBMaW5lQnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIGNvbnN0IElubGlu ZUl0ZW1zJiwgc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNXaWR0aE1vZGU+KTsKIAogICAgIHN0cnVj dCBJbmxpbmVJdGVtUmFuZ2UgewogICAgICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVy biBzdGFydCA9PSBlbmQ7IH0KQEAgLTcyLDcgKzcyLDcgQEAgcHVibGljOgogICAgICAgICBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICAgICAgY29uc3QgRmxvYXRMaXN0 JiBmbG9hdHM7CiAgICAgfTsKLSAgICBJbnRyaW5zaWNDb250ZW50IGNvbXB1dGVkSW50cmluc2lj V2lkdGgoY29uc3QgSW5saW5lSXRlbVJhbmdlJiwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVX aWR0aCwgYm9vbCBpc0ZpcnN0TGluZSk7CisgICAgSW50cmluc2ljQ29udGVudCBjb21wdXRlZElu dHJpbnNpY1dpZHRoKGNvbnN0IElubGluZUl0ZW1SYW5nZSYsIGJvb2wgaXNGaXJzdExpbmUpOwog CiBwcml2YXRlOgogICAgIHZvaWQgY2FuZGlkYXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0 ZSYsIHNpemVfdCBpbmxpbmVJdGVtSW5kZXgsIGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNM YXlvdXRSYW5nZSwgSW5saW5lTGF5b3V0VW5pdCBjdXJyZW50TG9naWNhbFJpZ2h0KTsKQEAgLTEx Miw3ICsxMTIsOCBAQCBwcml2YXRlOgogICAgIElubGluZUxheW91dFVuaXQgaW5saW5lSXRlbVdp ZHRoKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVm dCkgY29uc3Q7CiAgICAgYm9vbCBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQoY29uc3QgSW5s aW5lSXRlbVJhbmdlJiBsaW5lUmFuZ2UsIHNpemVfdCBsYXN0SW5saW5lSXRlbUluZGV4LCBib29s IGhhc1BhcnRpYWxUcmFpbGluZ0NvbnRlbnQpIGNvbnN0OwogCi0gICAgYm9vbCBpc0luSW50cmlu c2ljV2lkdGhNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9pc0luSW50cmluc2ljV2lkdGhNb2RlOyB9 CisgICAgc3RkOjpvcHRpb25hbDxJbnRyaW5zaWNXaWR0aE1vZGU+IGludHJpbnNpY1dpZHRoTW9k ZSgpIGNvbnN0IHsgcmV0dXJuIG1faW50cmluc2ljV2lkdGhNb2RlOyB9CisgICAgYm9vbCBpc0lu SW50cmluc2ljV2lkdGhNb2RlKCkgY29uc3QgeyByZXR1cm4gISFpbnRyaW5zaWNXaWR0aE1vZGUo KTsgfQogCiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250 ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsgfQogICAgIElu bGluZUZvcm1hdHRpbmdTdGF0ZSogZm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gbV9pbmxpbmVG b3JtYXR0aW5nU3RhdGU7IH0KQEAgLTEyMyw3ICsxMjQsNyBAQCBwcml2YXRlOgogCiBwcml2YXRl OgogICAgIGJvb2wgbV9pc0ZpcnN0TGluZSB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lzSW5JbnRy aW5zaWNXaWR0aE1vZGUgeyBmYWxzZSB9OworICAgIHN0ZDo6b3B0aW9uYWw8SW50cmluc2ljV2lk dGhNb2RlPiBtX2ludHJpbnNpY1dpZHRoTW9kZTsKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKICAgICBJbmxpbmVGb3JtYXR0aW5n U3RhdGUqIG1faW5saW5lRm9ybWF0dGluZ1N0YXRlIHsgbnVsbHB0ciB9OwogICAgIEZsb2F0aW5n U3RhdGUqIG1fZmxvYXRpbmdTdGF0ZSB7IG51bGxwdHIgfTsK