238732 2022-04-04 04:38:19 -0700 [CSS Container Queries] Simplify grammar 2022-04-04 22:38:22 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard sam webkit-bug-importer oldest_to_newest 1857815 0 koivisto 2022-04-04 04:38:19 -0700 Since size() function syntax is no longer supported the parse structures can be simplified. 1857817 1 456559 koivisto 2022-04-04 04:43:53 -0700 Created attachment 456559 Patch 1858244 2 ews-feeder 2022-04-04 22:37:54 -0700 Committed r292375 (249240@main): <https://commits.webkit.org/249240@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456559. 1858245 3 webkit-bug-importer 2022-04-04 22:38:22 -0700 <rdar://problem/91278141> 456559 2022-04-04 04:43:53 -0700 2022-04-04 22:37:56 -0700 Patch bug-238732-20220404144351.patch text/plain 10283 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmEwMDc3NTEyZDA1YWRl M2NiYzkwZWRiODRlNjRjNDM0NDNmMjQ1OS4uMjc2YTcxOTgwY2IxZWVlNGE5OGRlMjZmZjkzMGIy YjViODgyZTdkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTA0LTA0ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBTaW1wbGlmeSBncmFtbWFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzg3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCZWNhdXNlIHNpemUoKSBmdW5jdGlvbiBzeW50YXggaXMgbm8gbG9u Z2VyIHN1cHBvcnRlZCwgc2VwYXJhdGUgU2l6ZVF1ZXJ5IGFuZCBTaXplQ29uZGl0aW9uIHByb2R1 Y3Rpb25zCisgICAgICAgIGFyZSBubyBsb25nZXIgbmVlZGVkLgorCisgICAgICAgIFNvbWUgc2xp Z2h0bHkgdW5uZWNlc3NhcnkgdGVtcGxhdGl6YXRpb24gaXMgcmV0YWluZWQgdG8gaGVscCB3aXRo IGZ1dHVyZSB3b3JrLgorCisgICAgICAgICogY3NzL0NvbnRhaW5lclF1ZXJ5LmNwcDoKKyAgICAg ICAgKiBjc3MvQ29udGFpbmVyUXVlcnkuaDoKKyAgICAgICAgKiBjc3MvQ29udGFpbmVyUXVlcnlQ YXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1 bWVDb250YWluZXJRdWVyeSk6CisgICAgICAgIChXZWJDb3JlOjpDb250YWluZXJRdWVyeVBhcnNl cjo6Y29uc3VtZUNvbmRpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDb250YWluZXJRdWVyeVBh cnNlcjo6Y29uc3VtZVNpemVGZWF0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lclF1 ZXJ5UGFyc2VyOjpjb25zdW1lUGxhaW5TaXplRmVhdHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpD b250YWluZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVNpemVRdWVyeSk6IERlbGV0ZWQuCisgICAgICAg ICogY3NzL0NvbnRhaW5lclF1ZXJ5UGFyc2VyLmg6CisgICAgICAgICogc3R5bGUvQ29udGFpbmVy UXVlcnlFdmFsdWF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkNvbnRhaW5lclF1 ZXJ5RXZhbHVhdG9yOjpldmFsdWF0ZVF1ZXJ5IGNvbnN0KToKKyAgICAgICAgKiBzdHlsZS9Db250 YWluZXJRdWVyeUV2YWx1YXRvci5oOgorCiAyMDIyLTAzLTMwICBBbmRyZXMgR29uemFsZXogIDxh bmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBTcGxpdCBzdHJlYW1pbmcgb2YgQVggdHJl ZXMgZnJvbSB0aGUgY2xhc3MgQVhMb2dnZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ29udGFpbmVyUXVlcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5 LmNwcAppbmRleCBjMTcwZWRjNzNlYzc4ZTJkMjRhZGEyMGY5Zjc5MWRiMTAxZThjYjM2Li4zODVm ZWRmM2ZkZDliNGRlNTg2Mjk3NWEwNDI1NmJjMzdmYWI3NGI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D b250YWluZXJRdWVyeS5jcHAKQEAgLTg3LDcgKzg3LDYgQEAgT3B0aW9uU2V0PEF4aXM+IHJlcXVp cmVkQXhlc0ZvckZlYXR1cmUoY29uc3QgQXRvbVN0cmluZyYgZmVhdHVyZU5hbWUpCiAgICAgcmV0 dXJuIHsgfTsKIH0KIAotdm9pZCBzZXJpYWxpemUoU3RyaW5nQnVpbGRlciYsIGNvbnN0IFNpemVR dWVyeSYpOwogdm9pZCBzZXJpYWxpemUoU3RyaW5nQnVpbGRlciYsIGNvbnN0IFNpemVGZWF0dXJl Jik7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBDb25kaXRpb25UeXBlPiB2b2lkIHNlcmlhbGl6ZShTdHJp bmdCdWlsZGVyJiwgY29uc3QgQ29uZGl0aW9uVHlwZSYpOwogCkBAIC0xMDUsMTMgKzEwNCw2IEBA IHN0YXRpYyB2b2lkIHNlcmlhbGl6ZShTdHJpbmdCdWlsZGVyJiBidWlsZGVyLCBjb25zdCBDb250 YWluZXJRdWVyeSYgY29udGFpbmVyUXVlCiAgICAgfSk7CiB9CiAKLXZvaWQgc2VyaWFsaXplKFN0 cmluZ0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0IFNpemVRdWVyeSYgc2l6ZVF1ZXJ5KQotewotICAg IFdURjo6c3dpdGNoT24oc2l6ZVF1ZXJ5LCBbJl0oYXV0byYgbm9kZSkgewotICAgICAgICBzZXJp YWxpemUoYnVpbGRlciwgbm9kZSk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgc2VyaWFsaXplKFN0cmlu Z0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0IFNpemVGZWF0dXJlJiBzaXplRmVhdHVyZSkKIHsKICAg ICBhdXRvIHNlcmlhbGl6ZVJhbmdlQ29tcGFyaXNvbk9wZXJhdG9yID0gWyZdKENvbXBhcmlzb25P cGVyYXRvciBvcCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1 ZXJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnkuaAppbmRleCBkNDQ2N2E3 NzMxMmMxNmNjZjRlZmUwODk4ZWIyZTM0Y2RmYjcxNDQ1Li41OGU2OWY5Yzk4MWRlZDE1Y2E4YTkx YWRhOTIzZDc2MTE4ZGNjNjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFp bmVyUXVlcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnkuaApAQCAt NDQsOCArNDQsNyBAQCBzdHJ1Y3QgVW5rbm93blF1ZXJ5IHsKICAgICBTdHJpbmcgdGV4dDsKIH07 CiAKLXVzaW5nIFNpemVRdWVyeSA9IHN0ZDo6dmFyaWFudDxTaXplQ29uZGl0aW9uLCBTaXplRmVh dHVyZT47Ci11c2luZyBDb250YWluZXJRdWVyeSA9IHN0ZDo6dmFyaWFudDxDb250YWluZXJDb25k aXRpb24sIFNpemVRdWVyeSwgVW5rbm93blF1ZXJ5PjsKK3VzaW5nIENvbnRhaW5lclF1ZXJ5ID0g c3RkOjp2YXJpYW50PENvbnRhaW5lckNvbmRpdGlvbiwgU2l6ZUZlYXR1cmUsIFVua25vd25RdWVy eT47CiAKIGVudW0gY2xhc3MgTG9naWNhbE9wZXJhdG9yIDogdWludDhfdCB7IEFuZCwgT3IsIE5v dCB9OwogZW51bSBjbGFzcyBDb21wYXJpc29uT3BlcmF0b3IgOiB1aW50OF90IHsgTGVzc1RoYW4s IExlc3NUaGFuT3JFcXVhbCwgRXF1YWwsIEdyZWF0ZXJUaGFuLCBHcmVhdGVyVGhhbk9yRXF1YWwg fTsKQEAgLTU2LDExICs1NSw2IEBAIHN0cnVjdCBDb250YWluZXJDb25kaXRpb24gewogICAgIFZl Y3RvcjxDb250YWluZXJRdWVyeT4gcXVlcmllczsKIH07CiAKLXN0cnVjdCBTaXplQ29uZGl0aW9u IHsKLSAgICBMb2dpY2FsT3BlcmF0b3IgbG9naWNhbE9wZXJhdG9yIHsgTG9naWNhbE9wZXJhdG9y OjpBbmQgfTsKLSAgICBWZWN0b3I8U2l6ZVF1ZXJ5PiBxdWVyaWVzOwotfTsKLQogc3RydWN0IENv bXBhcmlzb24gewogICAgIENvbXBhcmlzb25PcGVyYXRvciBvcCB7IENvbXBhcmlzb25PcGVyYXRv cjo6RXF1YWwgfTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5jcHAKaW5kZXggMmI4MWYyYTI0MjZmYzgwY2Y0NzQy ZjUxMTY3ZGIxN2NlNTE1MGU1OC4uNzExMmU2OWE2ZDBiNzA0MDNkNGZiNjNjMzE0N2JiZWExMGQw YWM0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NvbnRhaW5lclF1ZXJ5UGFyc2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVlcnlQYXJzZXIuY3BwCkBA IC03NCw5ICs3NCw5IEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OkNvbnRhaW5lclF1ZXJ5PiBDb250YWlu ZXJRdWVyeVBhcnNlcjo6Y29uc3VtZUNvbnRhaW5lclF1ZXJ5KENTCiAgICAgICAgIGJsb2NrUmFu Z2UuY29uc3VtZVdoaXRlc3BhY2UoKTsKIAogICAgICAgICAvLyBUcnkgdG8gcGFyc2UgYXMgYSBz aXplIHF1ZXJ5IGZpcnN0LgotICAgICAgICBhdXRvIGJsb2NrRm9yU2l6ZVF1ZXJ5ID0gYmxvY2tS YW5nZTsKLSAgICAgICAgaWYgKGF1dG8gc2l6ZVF1ZXJ5ID0gY29uc3VtZVNpemVRdWVyeShibG9j a0ZvclNpemVRdWVyeSkpCi0gICAgICAgICAgICByZXR1cm4geyAqc2l6ZVF1ZXJ5IH07CisgICAg ICAgIGF1dG8gYmxvY2tGb3JTaXplRmVhdHVyZSA9IGJsb2NrUmFuZ2U7CisgICAgICAgIGlmIChh dXRvIHNpemVGZWF0dXJlID0gY29uc3VtZVNpemVGZWF0dXJlKGJsb2NrRm9yU2l6ZUZlYXR1cmUp KQorICAgICAgICAgICAgcmV0dXJuIHsgKnNpemVGZWF0dXJlIH07CiAKICAgICAgICAgaWYgKGF1 dG8gY29uZGl0aW9uID0gY29uc3VtZUNvbmRpdGlvbjxDUTo6Q29udGFpbmVyQ29uZGl0aW9uPihi bG9ja1JhbmdlKSkKICAgICAgICAgICAgIHJldHVybiB7IGNvbmRpdGlvbiB9OwpAQCAtOTEsMTIg KzkxLDcgQEAgc3RkOjpvcHRpb25hbDxDb25kaXRpb25UeXBlPiBDb250YWluZXJRdWVyeVBhcnNl cjo6Y29uc3VtZUNvbmRpdGlvbihDU1NQYXJzZXJUb2sKICAgICBhdXRvIGNvbnN1bWVRdWVyeSA9 IFsmXShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSkgewogICAgICAgICBpZiBjb25zdGV4cHIg KHN0ZDo6aXNfc2FtZV92PENROjpDb250YWluZXJDb25kaXRpb24sIENvbmRpdGlvblR5cGU+KQog ICAgICAgICAgICAgcmV0dXJuIGNvbnN1bWVDb250YWluZXJRdWVyeShyYW5nZSk7Ci0gICAgICAg IGlmIGNvbnN0ZXhwciAoc3RkOjppc19zYW1lX3Y8Q1E6OlNpemVDb25kaXRpb24sIENvbmRpdGlv blR5cGU+KSB7Ci0gICAgICAgICAgICBpZiAocmFuZ2UucGVlaygpLnR5cGUoKSAhPSBMZWZ0UGFy ZW50aGVzaXNUb2tlbikKLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpvcHRpb25hbDxDUTo6 U2l6ZVF1ZXJ5PigpOwotICAgICAgICAgICAgYXV0byBibG9ja1JhbmdlID0gcmFuZ2UuY29uc3Vt ZUJsb2NrKCk7Ci0gICAgICAgICAgICByZXR1cm4gY29uc3VtZVNpemVRdWVyeShibG9ja1Jhbmdl KTsKLSAgICAgICAgfQorICAgICAgICAvLyBTdHlsZSBxdWVyeSBzdXBwb3J0IHdvdWxkIGJlIGhl cmUuCiAgICAgfTsKIAogICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpID09IElkZW50VG9rZW4p IHsKQEAgLTE0OCwzMiArMTQzLDIyIEBAIHN0ZDo6b3B0aW9uYWw8Q29uZGl0aW9uVHlwZT4gQ29u dGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVDb25kaXRpb24oQ1NTUGFyc2VyVG9rCiAgICAgcmV0 dXJuIGNvbmRpdGlvbjsKIH0KIAotc3RkOjpvcHRpb25hbDxDUTo6U2l6ZVF1ZXJ5PiBDb250YWlu ZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVNpemVRdWVyeShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5n ZSkKK3N0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBDb250YWluZXJRdWVyeVBhcnNlcjo6 Y29uc3VtZVNpemVGZWF0dXJlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogewotICAgIGlm IChyYW5nZS5wZWVrKCkudHlwZSgpID09IExlZnRQYXJlbnRoZXNpc1Rva2VuIHx8IChyYW5nZS5w ZWVrKCkudHlwZSgpID09IElkZW50VG9rZW4gJiYgcmFuZ2UucGVlaygpLmlkKCkgPT0gQ1NTVmFs dWVOb3QpKSB7Ci0gICAgICAgIGF1dG8gc2l6ZUNvbmRpdGlvbiA9IGNvbnN1bWVDb25kaXRpb248 Q1E6OlNpemVDb25kaXRpb24+KHJhbmdlKTsKLSAgICAgICAgaWYgKCFzaXplQ29uZGl0aW9uKQot ICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgcmV0dXJuIHsgKnNpemVDb25kaXRpb24g fTsKLSAgICB9Ci0KLSAgICBhdXRvIHNpemVGZWF0dXJlID0gY29uc3VtZVNpemVGZWF0dXJlKHJh bmdlKTsKLSAgICBpZiAoIXNpemVGZWF0dXJlKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAg bV9yZXF1aXJlZEF4ZXMuYWRkKENROjpyZXF1aXJlZEF4ZXNGb3JGZWF0dXJlKHNpemVGZWF0dXJl LT5uYW1lKSk7CisgICAgYXV0byBjb25zdW1lID0gWyZdIHsKKyAgICAgICAgYXV0byByYW5nZUNv cHkgPSByYW5nZTsKKyAgICAgICAgaWYgKGF1dG8gc2l6ZUZlYXR1cmUgPSBjb25zdW1lUGxhaW5T aXplRmVhdHVyZShyYW5nZSkpCisgICAgICAgICAgICByZXR1cm4gc2l6ZUZlYXR1cmU7CiAKLSAg ICByZXR1cm4geyAqc2l6ZUZlYXR1cmUgfTsKLX0KKyAgICAgICAgcmFuZ2UgPSByYW5nZUNvcHk7 CisgICAgICAgIHJldHVybiBjb25zdW1lUmFuZ2VTaXplRmVhdHVyZShyYW5nZSk7CisgICAgfTsK IAotc3RkOjpvcHRpb25hbDxDUTo6U2l6ZUZlYXR1cmU+IENvbnRhaW5lclF1ZXJ5UGFyc2VyOjpj b25zdW1lU2l6ZUZlYXR1cmUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UpCi17Ci0gICAgYXV0 byByYW5nZUNvcHkgPSByYW5nZTsKLSAgICBpZiAoYXV0byBzaXplRmVhdHVyZSA9IGNvbnN1bWVQ bGFpblNpemVGZWF0dXJlKHJhbmdlKSkKLSAgICAgICAgcmV0dXJuIHNpemVGZWF0dXJlOworICAg IGF1dG8gc2l6ZUZlYXR1cmUgPSBjb25zdW1lKCk7CisgICAgaWYgKHNpemVGZWF0dXJlKQorICAg ICAgICBtX3JlcXVpcmVkQXhlcy5hZGQoQ1E6OnJlcXVpcmVkQXhlc0ZvckZlYXR1cmUoc2l6ZUZl YXR1cmUtPm5hbWUpKTsKIAotICAgIHJhbmdlID0gcmFuZ2VDb3B5OwotICAgIHJldHVybiBjb25z dW1lUmFuZ2VTaXplRmVhdHVyZShyYW5nZSk7CisgICAgcmV0dXJuIHNpemVGZWF0dXJlOwogfQog CiBzdGF0aWMgU3RyaW5nIGNvbnN1bWVGZWF0dXJlTmFtZShDU1NQYXJzZXJUb2tlblJhbmdlJiBy YW5nZSkKQEAgLTIwNiw2ICsxOTEsNyBAQCBzdGQ6Om9wdGlvbmFsPENROjpTaXplRmVhdHVyZT4g Q29udGFpbmVyUXVlcnlQYXJzZXI6OmNvbnN1bWVQbGFpblNpemVGZWF0dXJlKENTUwogICAgIGlm IChyYW5nZS5hdEVuZCgpKSB7CiAgICAgICAgIGlmIChvcCAhPSBDUTo6Q29tcGFyaXNvbk9wZXJh dG9yOjpFcXVhbCkKICAgICAgICAgICAgIHJldHVybiB7IH07CisKICAgICAgICAgcmV0dXJuIENR OjpTaXplRmVhdHVyZSB7IGZlYXR1cmVOYW1lLCBDUTo6U3ludGF4OjpCb29sZWFuLCB7IH0sIHsg fSB9OwogICAgIH0KIApAQCAtMjE3LDcgKzIwMyw3IEBAIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVG ZWF0dXJlPiBDb250YWluZXJRdWVyeVBhcnNlcjo6Y29uc3VtZVBsYWluU2l6ZUZlYXR1cmUoQ1NT CiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBhdXRvIHZhbHVlID0gY29uc3VtZVZhbHVlKHJh bmdlKTsKLSAgICAKKwogICAgIHJldHVybiBDUTo6U2l6ZUZlYXR1cmUgeyBmZWF0dXJlTmFtZSwg Q1E6OlN5bnRheDo6Q29sb24sIHsgfSwgQ1E6OkNvbXBhcmlzb24geyBvcCwgV1RGTW92ZSh2YWx1 ZSkgfSB9OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ29udGFpbmVyUXVl cnlQYXJzZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5oCmlu ZGV4IGQ2YjFjMzhhYTAwZDFiZWFjMjRlYTUyNmFiMzY0ODE5ODFkMzA2ZjQuLjg1YzZiYjg3NWEw MzU2ZTYzYmRjZTI0ZWZmZDQ4YjRhNTUyMmM5M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9Db250YWluZXJRdWVyeVBhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Db250 YWluZXJRdWVyeVBhcnNlci5oCkBAIC0zOSw3ICszOSw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgc3RkOjpvcHRpb25hbDxGaWx0ZXJlZENvbnRhaW5lclF1ZXJ5PiBjb25zdW1lRmlsdGVyZWRD b250YWluZXJRdWVyeShDU1NQYXJzZXJUb2tlblJhbmdlJik7CiAgICAgc3RkOjpvcHRpb25hbDxD UTo6Q29udGFpbmVyUXVlcnk+IGNvbnN1bWVDb250YWluZXJRdWVyeShDU1NQYXJzZXJUb2tlblJh bmdlJik7Ci0gICAgc3RkOjpvcHRpb25hbDxDUTo6U2l6ZVF1ZXJ5PiBjb25zdW1lU2l6ZVF1ZXJ5 KENTU1BhcnNlclRva2VuUmFuZ2UmKTsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDb25kaXRpb25U eXBlPiBzdGQ6Om9wdGlvbmFsPENvbmRpdGlvblR5cGU+IGNvbnN1bWVDb25kaXRpb24oQ1NTUGFy c2VyVG9rZW5SYW5nZSYpOwogICAgIHN0ZDo6b3B0aW9uYWw8Q1E6OlNpemVGZWF0dXJlPiBjb25z dW1lU2l6ZUZlYXR1cmUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYpOwogICAgIHN0ZDo6b3B0aW9uYWw8 Q1E6OlNpemVGZWF0dXJlPiBjb25zdW1lUGxhaW5TaXplRmVhdHVyZShDU1NQYXJzZXJUb2tlblJh bmdlJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Db250YWluZXJRdWVyeUV2 YWx1YXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Db250YWluZXJRdWVyeUV2YWx1YXRv ci5jcHAKaW5kZXggZDI5MWFkNGY1Njc4YTFlZDBiNTM1Zjk3NTRhN2VkNTdlMjFkNWU3Mi4uZjQw NWM5M2NlMGNjMmVmMWQxYTEyNDE5NDczZWY4YjFkODljZmQxMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvQ29udGFpbmVyUXVlcnlFdmFsdWF0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmNwcApAQCAtMTQ3LDE5ICsxNDcs MTAgQEAgYXV0byBDb250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVRdWVyeShjb25zdCBD UTo6Q29udGFpbmVyUXVlcnkmIGNvbnRhaW5lclEKIHsKICAgICByZXR1cm4gV1RGOjpzd2l0Y2hP bihjb250YWluZXJRdWVyeSwgWyZdKGNvbnN0IENROjpDb250YWluZXJDb25kaXRpb24mIGNvbnRh aW5lckNvbmRpdGlvbikgewogICAgICAgICByZXR1cm4gZXZhbHVhdGVDb25kaXRpb24oY29udGFp bmVyQ29uZGl0aW9uLCBjb250YWluZXIpOwotICAgIH0sIFsmXShjb25zdCBDUTo6U2l6ZVF1ZXJ5 JiBzaXplUXVlcnkpIHsKLSAgICAgICAgcmV0dXJuIGV2YWx1YXRlUXVlcnkoc2l6ZVF1ZXJ5LCBj b250YWluZXIpOwotICAgIH0sIFsmXShjb25zdCBDUTo6VW5rbm93blF1ZXJ5JikgewotICAgICAg ICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bjsKLSAgICB9KTsKLX0KLQotYXV0byBD b250YWluZXJRdWVyeUV2YWx1YXRvcjo6ZXZhbHVhdGVRdWVyeShjb25zdCBDUTo6U2l6ZVF1ZXJ5 JiBzaXplUXVlcnksIGNvbnN0IFNlbGVjdGVkQ29udGFpbmVyJiBjb250YWluZXIpIGNvbnN0IC0+ IEV2YWx1YXRpb25SZXN1bHQKLXsKLSAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbihzaXplUXVlcnks IFsmXShjb25zdCBDUTo6U2l6ZUNvbmRpdGlvbiYgc2l6ZUNvbmRpdGlvbikgewotICAgICAgICBy ZXR1cm4gZXZhbHVhdGVDb25kaXRpb24oc2l6ZUNvbmRpdGlvbiwgY29udGFpbmVyKTsKICAgICB9 LCBbJl0oY29uc3QgQ1E6OlNpemVGZWF0dXJlJiBzaXplRmVhdHVyZSkgewogICAgICAgICByZXR1 cm4gZXZhbHVhdGVTaXplRmVhdHVyZShzaXplRmVhdHVyZSwgY29udGFpbmVyKTsKKyAgICB9LCBb Jl0oY29uc3QgQ1E6OlVua25vd25RdWVyeSYpIHsKKyAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25S ZXN1bHQ6OlVua25vd247CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9D b250YWluZXJRdWVyeUV2YWx1YXRvci5oCmluZGV4IGM1YjllNDM4MjkyYWZhNDI5ZTM1ZmNiYzNj OTBjNGJmMGRjNzkyMmIuLjNmNTMwZjQ0M2ExYjNhMjI2NjcyZmJjYjcxZWY5ZGViMDZmOWE4MDMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0NvbnRhaW5lclF1ZXJ5RXZhbHVhdG9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvQ29udGFpbmVyUXVlcnlFdmFsdWF0b3IuaApA QCAtNDksNyArNDksNiBAQCBwcml2YXRlOgogICAgIHN0ZDo6b3B0aW9uYWw8U2VsZWN0ZWRDb250 YWluZXI+IHNlbGVjdENvbnRhaW5lcihjb25zdCBGaWx0ZXJlZENvbnRhaW5lclF1ZXJ5JikgY29u c3Q7CiAKICAgICBFdmFsdWF0aW9uUmVzdWx0IGV2YWx1YXRlUXVlcnkoY29uc3QgQ1E6OkNvbnRh aW5lclF1ZXJ5JiwgY29uc3QgU2VsZWN0ZWRDb250YWluZXImKSBjb25zdDsKLSAgICBFdmFsdWF0 aW9uUmVzdWx0IGV2YWx1YXRlUXVlcnkoY29uc3QgQ1E6OlNpemVRdWVyeSYsIGNvbnN0IFNlbGVj dGVkQ29udGFpbmVyJikgY29uc3Q7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgQ29uZGl0aW9uVHlw ZT4gRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZUNvbmRpdGlvbihjb25zdCBDb25kaXRpb25UeXBl JiwgY29uc3QgU2VsZWN0ZWRDb250YWluZXImKSBjb25zdDsKICAgICBFdmFsdWF0aW9uUmVzdWx0 IGV2YWx1YXRlU2l6ZUZlYXR1cmUoY29uc3QgQ1E6OlNpemVGZWF0dXJlJiwgY29uc3QgU2VsZWN0 ZWRDb250YWluZXImKSBjb25zdDsKIAo=