235896 2022-01-31 10:11:29 -0800 [CSS Container Queries] Ensure query containers have valid layout before resolving the subtree 2022-02-01 12:35:46 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto bfulgham cdumez esprehn+autocc ews-watchlist kangil.han webkit-bug-importer zalan oldest_to_newest 1835579 0 koivisto 2022-01-31 10:11:29 -0800 Bounce between style and layout to ensure query containers have valid style. 1835582 1 webkit-bug-importer 2022-01-31 10:27:39 -0800 <rdar://problem/88279976> 1835922 2 450518 koivisto 2022-02-01 05:07:03 -0800 Created attachment 450518 Patch 1836050 3 450518 zalan 2022-02-01 10:38:52 -0800 Comment on attachment 450518 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450518&action=review > Source/WebCore/ChangeLog:24 > + Don't run post-layout tasks when resolving query containers. yeah, I wish there was a disposable layout type of thing where we could just run layout on the tree, produce geometry and let the rest of the update flow take care of the "final" layout including paint invalidation etc. Running the post layout tasks (even on a subsequent runloop) may also produce some unexpected results. > Source/WebCore/dom/Document.cpp:2063 > + if (frameView.layoutContext().isLayoutPending() || renderView()->needsLayout()) I'd just check FrameViewLayoutContext::needsLayout() (in addition to ^^, it also covers things like subtree layout, which may get triggered by containment) 1836082 4 450553 koivisto 2022-02-01 11:23:31 -0800 Created attachment 450553 Patch for landing 1836104 5 ews-feeder 2022-02-01 12:35:41 -0800 Committed r288906 (246648@main): <https://commits.webkit.org/246648@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450553. 450518 2022-02-01 05:07:03 -0800 2022-02-01 11:23:26 -0800 Patch bug-235896-20220201150702.patch text/plain 11439 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTkyYjAzNzQzNDVlZjUz ZGY2NzlkZmU3Y2UxNWZjZDM1OTlmYTJiZi4uMzJkZWQ1MmRiYzE0OGE2ZGNlOGY5MzhkZmQ0MWI4 MTYzMWYzMDllOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIyLTAxLTMxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBFbnN1cmUgcXVlcnkgY29udGFpbmVycyBoYXZlIHZhbGlkIGxheW91dCBiZWZvcmUg cmVzb2x2aW5nIHRoZSBzdWJ0cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzU4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUbyByZXNvbHZlIGNvbnRhaW5lciBxdWVyaWVzIHdlIG5lZWQgdG8gaGF2 ZSB1cC10by1kYXRlIGxheW91dCBmb3IgdGhlIHF1ZXJ5IGNvbnRhaW5lcnMgYmVmb3JlCisgICAg ICAgIHN0eWxlIHJlc29sdXRpb24gYWR2YW5jZXMgdG8gdGhlaXIgZGVzY2VuZGFudHMuCisKKyAg ICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlIGJvdW5jZSBiZXR3ZWVuIHN0eWxlIHJlc29sdXRpb24g YW5kIGxheW91dCB1bnRpbCBhbGwgcXVlcnkgY29udGFpbmVycyBhcmUgcmVzb2x2ZWQuCisKKyAg ICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJl c29sdmVTdHlsZSk6CisKKyAgICAgICAgTG9vcCBzdHlsZSByZXNvbHV0aW9uL3JlbmRlciB0cmVl IHVwZGF0ZS9sYXlvdXQgdW50aWwgd2UgaGF2ZSByZXNvbHZlZCBldmVyeXRoaW5nLgorCisgICAg ICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aXNSZXNv bHZpbmdDb250YWluZXJRdWVyaWVzIGNvbnN0KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlld0xh eW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0Q29udGV4 dDo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OnJ1 bk9yU2NoZWR1bGVBc3luY2hyb25vdXNUYXNrcyk6CisKKyAgICAgICAgRG9uJ3QgcnVuIHBvc3Qt bGF5b3V0IHRhc2tzIHdoZW4gcmVzb2x2aW5nIHF1ZXJ5IGNvbnRhaW5lcnMuCisKKyAgICAgICAg KiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6 VHJlZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlOjpUcmVlUmVzb2x2ZXI6OnVwZGF0ZVF1ZXJ5Q29udGFpbmVyKToKKworICAgICAgICBUcmFj ayB3aGF0IGhhcyBiZWVuIHJlc29sdmVkLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6VHJl ZVJlc29sdmVyOjpyZXNvbHZlKToKKyAgICAgICAgKiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5o OgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6aGFzVW5yZXNvbHZlZFF1 ZXJ5Q29udGFpbmVycyBjb25zdCk6CisgICAgICAgICogc3R5bGUvU3R5bGVVcGRhdGUuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlN0eWxlOjpVcGRhdGU6OmlzRW1wdHkgY29uc3QpOgorCiAyMDIyLTAx LTMxICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T XVtXUF0gUmVzdHJpY3QgaW1hZ2UgZGVjb2RlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4 IGFjNTY0YjFlODc2NjJhZmVkZWY2MmQ5M2IwNDMxN2M0MTkzMTBiYmEuLjg1ZmY3MjAwZGVmYjhj NDA5ODlmNzZhNWZkNGFjNTNjYThjNTNhYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAt MjA1NSw2ICsyMDU1LDE3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5 bGVUeXBlIHR5cGUpCiAgICAgICAgIFN0eWxlOjpUcmVlUmVzb2x2ZXIgcmVzb2x2ZXIoKnRoaXMs IFdURk1vdmUobV9wZW5kaW5nUmVuZGVyVHJlZVRleHRVcGRhdGUpKTsKICAgICAgICAgYXV0byBz dHlsZVVwZGF0ZSA9IHJlc29sdmVyLnJlc29sdmUoKTsKIAorICAgICAgICB3aGlsZSAocmVzb2x2 ZXIuaGFzVW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycygpICYmIHN0eWxlVXBkYXRlKSB7CisgICAg ICAgICAgICBTZXRGb3JTY29wZSByZXNvbHZpbmdDb250YWluZXJRdWVyaWVzU2NvcGUobV9pc1Jl c29sdmluZ0NvbnRhaW5lclF1ZXJpZXMsIHRydWUpOworCisgICAgICAgICAgICB1cGRhdGVSZW5k ZXJUcmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKKworICAgICAgICAgICAgaWYgKGZyYW1lVmll dy5sYXlvdXRDb250ZXh0KCkuaXNMYXlvdXRQZW5kaW5nKCkgfHwgcmVuZGVyVmlldygpLT5uZWVk c0xheW91dCgpKQorICAgICAgICAgICAgICAgIGZyYW1lVmlldy5sYXlvdXRDb250ZXh0KCkubGF5 b3V0KCk7CisKKyAgICAgICAgICAgIHN0eWxlVXBkYXRlID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwor ICAgICAgICB9CisKICAgICAgICAgbV9sYXN0U3R5bGVVcGRhdGVTaXplRm9yVGVzdGluZyA9IHN0 eWxlVXBkYXRlID8gc3R5bGVVcGRhdGUtPnNpemUoKSA6IDA7CiAKICAgICAgICAgc2V0SGFzVmFs aWRTdHlsZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCA4MDE4NDFhN2JjZTlkYTEyNTVmNTZi MTcyNDllODBkMWRlY2IzMTc0Li42OGE0ZjIxYzE1NGNlYmFjYmEwYjBhZjM1Mzc4NmVlM2ZiZDRl ZGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtMTM0NSw2ICsxMzQ1LDcgQEAgcHVibGljOgog CiAgICAgYm9vbCBpblN0eWxlUmVjYWxjKCkgY29uc3QgeyByZXR1cm4gbV9pblN0eWxlUmVjYWxj OyB9CiAgICAgYm9vbCBpblJlbmRlclRyZWVVcGRhdGUoKSBjb25zdCB7IHJldHVybiBtX2luUmVu ZGVyVHJlZVVwZGF0ZTsgfQorICAgIGJvb2wgaXNSZXNvbHZpbmdDb250YWluZXJRdWVyaWVzKCkg Y29uc3QgeyByZXR1cm4gbV9pc1Jlc29sdmluZ0NvbnRhaW5lclF1ZXJpZXM7IH0KICAgICBib29s IGlzUmVzb2x2aW5nVHJlZVN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9pc1Jlc29sdmluZ1RyZWVT dHlsZTsgfQogICAgIHZvaWQgc2V0SXNSZXNvbHZpbmdUcmVlU3R5bGUoYm9vbCk7CiAKQEAgLTIx MzYsNiArMjEzNyw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2luU3R5bGVSZWNhbGMgeyBmYWxz ZSB9OwogICAgIGJvb2wgbV9pblJlbmRlclRyZWVVcGRhdGUgeyBmYWxzZSB9OwogICAgIGJvb2wg bV9pc1Jlc29sdmluZ1RyZWVTdHlsZSB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzUmVzb2x2aW5n Q29udGFpbmVyUXVlcmllcyB7IGZhbHNlIH07CiAKICAgICBib29sIG1fZ290b0FuY2hvck5lZWRl ZEFmdGVyU3R5bGVzaGVldHNMb2FkIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNETlNQcmVmZXRj aEVuYWJsZWQgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXdMYXlvdXRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5 b3V0Q29udGV4dC5jcHAKaW5kZXggZTZkYmRiM2EwNzY1NGFjNjBlYjk4MDE2ZDI0YzFhNzczMmZi ZDIxMy4uNjlhNGMyM2M5YTM2MTgyYzE3MDllMzdhMWFiNGQ4ZTc0ODE4Zjg3MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCkBAIC0yMDQsMTEg KzIwNCwxNCBAQCB2b2lkIEZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91dCgpCiAgICAgewog ICAgICAgICBTZXRGb3JTY29wZTxMYXlvdXRQaGFzZT4gbGF5b3V0UGhhc2UobV9sYXlvdXRQaGFz ZSwgTGF5b3V0UGhhc2U6OkluUHJlTGF5b3V0KTsKIAotICAgICAgICAvLyBJZiB0aGlzIGlzIGEg bmV3IHRvcC1sZXZlbCBsYXlvdXQgYW5kIHRoZXJlIGFyZSBhbnkgcmVtYWluaW5nIHRhc2tzIGZy b20gdGhlIHByZXZpb3VzIGxheW91dCwgZmluaXNoIHRoZW0gbm93LgotICAgICAgICBpZiAoIWlz TGF5b3V0TmVzdGVkKCkgJiYgbV9hc3luY2hyb25vdXNUYXNrc1RpbWVyLmlzQWN0aXZlKCkgJiYg IXZpZXcoKS5pc0luQ2hpbGRGcmFtZVdpdGhGcmFtZUZsYXR0ZW5pbmcoKSkKLSAgICAgICAgICAg IHJ1bkFzeW5jaHJvbm91c1Rhc2tzKCk7CisgICAgICAgIGlmICghZnJhbWUoKS5kb2N1bWVudCgp LT5pc1Jlc29sdmluZ0NvbnRhaW5lclF1ZXJpZXMoKSkgeworICAgICAgICAgICAgLy8gSWYgdGhp cyBpcyBhIG5ldyB0b3AtbGV2ZWwgbGF5b3V0IGFuZCB0aGVyZSBhcmUgYW55IHJlbWFpbmluZyB0 YXNrcyBmcm9tIHRoZSBwcmV2aW91cyBsYXlvdXQsIGZpbmlzaCB0aGVtIG5vdy4KKyAgICAgICAg ICAgIGlmICghaXNMYXlvdXROZXN0ZWQoKSAmJiBtX2FzeW5jaHJvbm91c1Rhc2tzVGltZXIuaXNB Y3RpdmUoKSAmJiAhdmlldygpLmlzSW5DaGlsZEZyYW1lV2l0aEZyYW1lRmxhdHRlbmluZygpKQor ICAgICAgICAgICAgICAgIHJ1bkFzeW5jaHJvbm91c1Rhc2tzKCk7CisKKyAgICAgICAgICAgIHVw ZGF0ZVN0eWxlRm9yTGF5b3V0KCk7CisgICAgICAgIH0KIAotICAgICAgICB1cGRhdGVTdHlsZUZv ckxheW91dCgpOwogICAgICAgICBpZiAodmlldygpLmhhc09uZVJlZigpKQogICAgICAgICAgICAg cmV0dXJuOwogCkBAIC0yNjgsNiArMjcxLDEyIEBAIHZvaWQgRnJhbWVWaWV3TGF5b3V0Q29udGV4 dDo6cnVuT3JTY2hlZHVsZUFzeW5jaHJvbm91c1Rhc2tzKCkKICAgICBpZiAobV9hc3luY2hyb25v dXNUYXNrc1RpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChmcmFt ZSgpLmRvY3VtZW50KCktPmlzUmVzb2x2aW5nQ29udGFpbmVyUXVlcmllcygpKSB7CisgICAgICAg IC8vIFdlIGFyZSBkb2luZyBsYXlvdXQgZnJvbSBzdHlsZSByZXNvbHV0aW9uIHRvIHJlc29sdmUg Y29udGFpbmVyIHF1ZXJpZXMuCisgICAgICAgIG1fYXN5bmNocm9ub3VzVGFza3NUaW1lci5zdGFy dE9uZVNob3QoMF9zKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICh2aWV3KCku aXNJbkNoaWxkRnJhbWVXaXRoRnJhbWVGbGF0dGVuaW5nKCkpIHsKICAgICAgICAgLy8gV2hpbGUg ZmxhdHRlbmluZyBmcmFtZXMsIHdlIGRlZmVyIHBvc3QgbGF5b3V0IHRhc2tzIHRvIGF2b2lkIGdl dHRpbmcgc3R1Y2sgaW4gYSBjeWNsZSwKICAgICAgICAgLy8gZXhjZXB0IHVwZGF0ZVdpZGdldFBv c2l0aW9ucygpIHdoaWNoIGlzIHJlcXVpcmVkIHRvIGtpY2sgb2ZmIHN1YmZyYW1lIGxheW91dCBp biBjZXJ0YWluIGNhc2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVU cmVlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIu Y3BwCmluZGV4IDJkMjM2NmFlNDM4Yjg5ZmJhNTdlNTI0YTdmODVlNzhlMDBmNzUzMDYuLjNlZjg2 ZjMxNDNkNzQ3YzMyYWE2MGQ5ZDZhMDJhNjVmN2YzNzIxM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKQEAgLTU5OCw4ICs1OTgsMTAgQEAgdm9pZCBUcmVl UmVzb2x2ZXI6OnJlc29sdmVDb21wb3NlZFRyZWUoKQogCiAgICAgICAgIGJvb2wgc2hvdWxkSXRl cmF0ZUNoaWxkcmVuID0gc3R5bGUgJiYgKGVsZW1lbnQuY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkg fHwgZGVzY2VuZGFudHNUb1Jlc29sdmUgIT0gRGVzY2VuZGFudHNUb1Jlc29sdmU6Ok5vbmUpOwog Ci0gICAgICAgIGlmIChzaG91bGRJdGVyYXRlQ2hpbGRyZW4pCi0gICAgICAgICAgICB1cGRhdGVR dWVyeUNvbnRhaW5lcihlbGVtZW50LCAqc3R5bGUpOworICAgICAgICBpZiAoc2hvdWxkSXRlcmF0 ZUNoaWxkcmVuKSB7CisgICAgICAgICAgICBpZiAodXBkYXRlUXVlcnlDb250YWluZXIoZWxlbWVu dCwgKnN0eWxlKSA9PSBRdWVyeUNvbnRhaW5lckFjdGlvbjo6TGF5b3V0KQorICAgICAgICAgICAg ICAgIHNob3VsZEl0ZXJhdGVDaGlsZHJlbiA9IGZhbHNlOworICAgICAgICB9CiAKICAgICAgICAg aWYgKCFtX2RpZFNlZVBlbmRpbmdTdHlsZXNoZWV0KQogICAgICAgICAgICAgbV9kaWRTZWVQZW5k aW5nU3R5bGVzaGVldCA9IGhhc0xvYWRpbmdTdHlsZXNoZWV0KG1fZG9jdW1lbnQuc3R5bGVTY29w ZSgpLCBlbGVtZW50LCAhc2hvdWxkSXRlcmF0ZUNoaWxkcmVuKTsKQEAgLTYxOSwxNCArNjIxLDI2 IEBAIHZvaWQgVHJlZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRUcmVlKCkKICAgICBwb3BQYXJl bnRzVG9EZXB0aCgxKTsKIH0KIAotdm9pZCBUcmVlUmVzb2x2ZXI6OnVwZGF0ZVF1ZXJ5Q29udGFp bmVyKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKK2F1 dG8gVHJlZVJlc29sdmVyOjp1cGRhdGVRdWVyeUNvbnRhaW5lcihFbGVtZW50JiBlbGVtZW50LCBj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpIC0+IFF1ZXJ5Q29udGFpbmVyQWN0aW9uCiB7CiAgICAg aWYgKHN0eWxlLmNvbnRhaW5lclR5cGUoKSA9PSBDb250YWluZXJUeXBlOjpOb25lKQotICAgICAg ICByZXR1cm47CisgICAgICAgIHJldHVybiBRdWVyeUNvbnRhaW5lckFjdGlvbjo6Tm9uZTsKIAog ICAgIHNjb3BlKCkuc2VsZWN0b3JNYXRjaGluZ1N0YXRlLnF1ZXJ5Q29udGFpbmVycy5hcHBlbmQo ZWxlbWVudCk7CiAKLSAgICAvLyBGSVhNRTogU2tpcCB0aGUgc3VidHJlZSBhbmQgZW5zdXJlIHRo ZSBjb250YWluZXIgaXMgcmVzb2x2ZWQgYnkgZG9pbmcgYSBsYXlvdXQgaWYgbmVlZGVkLgorICAg IGlmIChtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMucmVtb3ZlKCZlbGVtZW50KSkgeworICAg ICAgICBtX3Jlc29sdmVkUXVlcnlDb250YWluZXJzLmFkZCgmZWxlbWVudCk7CisgICAgICAgIHJl dHVybiBRdWVyeUNvbnRhaW5lckFjdGlvbjo6Q29udGludWU7CisgICAgfQorCisgICAgaWYgKG1f dXBkYXRlLT5pc0VtcHR5KCkpIHsKKyAgICAgICAgbV9yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5h ZGQoJmVsZW1lbnQpOworICAgICAgICByZXR1cm4gUXVlcnlDb250YWluZXJBY3Rpb246OkNvbnRp bnVlOworICAgIH0KKworICAgIG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5hZGQoJmVsZW1l bnQpOworCisgICAgcmV0dXJuIFF1ZXJ5Q29udGFpbmVyQWN0aW9uOjpMYXlvdXQ7CiB9CiAKIHN0 ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IFRyZWVSZXNvbHZlcjo6cmVzb2x2ZSgpCkBAIC02MzgsNiAr NjUyLDExIEBAIHN0ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IFRyZWVSZXNvbHZlcjo6cmVzb2x2ZSgp CiAgICAgICAgIG1fZG9jdW1lbnQuc3R5bGVTY29wZSgpLnJlc29sdmVyKCk7CiAgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIH0KKworICAgIC8vIEZJWE1FOiBKdXN0IG5lZWQgdG8gcmVzdG9y ZSB0aGUgYW5jZXN0b3IgbWFya2luZy4KKyAgICBmb3IgKGF1dG8mIHF1ZXJ5Q29udGFpbmVyIDog bV91bnJlc29sdmVkUXVlcnlDb250YWluZXJzKQorICAgICAgICBxdWVyeUNvbnRhaW5lci0+aW52 YWxpZGF0ZVN0eWxlRm9yU3VidHJlZUludGVybmFsKCk7CisKICAgICBpZiAoIWRvY3VtZW50RWxl bWVudC0+Y2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgJiYgIWRvY3VtZW50RWxlbWVudC0+bmVlZHNT dHlsZVJlY2FsYygpKQogICAgICAgICByZXR1cm4gV1RGTW92ZShtX3VwZGF0ZSk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCmluZGV4IGFmMTg5YTNhNTBiNGY1MjU3 MzFjZDNhZWRlNTYzODE5NzQwZWY5OTYuLjAxOGQ2YWRkYzA0Mjk5OWE4YzMxMWVjY2VkNzY2Y2M2 OGZhYmQxN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29s dmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuaApAQCAt NTUsMTEgKzU1LDE1IEBAIHB1YmxpYzoKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IHJl c29sdmUoKTsKIAorICAgIGJvb2wgaGFzVW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycygpIGNvbnN0 IHsgcmV0dXJuICFtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnMuaXNFbXB0eSgpOyB9CisKIHBy aXZhdGU6CiAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBzdHlsZUZvclN0eWxlYWJs ZShjb25zdCBTdHlsZWFibGUmLCBjb25zdCBSZXNvbHV0aW9uQ29udGV4dCYpOwogCiAgICAgdm9p ZCByZXNvbHZlQ29tcG9zZWRUcmVlKCk7Ci0gICAgdm9pZCB1cGRhdGVRdWVyeUNvbnRhaW5lcihj b25zdCBFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKKworICAgIGVudW0gY2xhc3MgUXVl cnlDb250YWluZXJBY3Rpb24gOiB1aW50OF90IHsgTm9uZSwgQ29udGludWUsIExheW91dCB9Owor ICAgIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIHVwZGF0ZVF1ZXJ5Q29udGFpbmVyKEVsZW1lbnQmLCBj b25zdCBSZW5kZXJTdHlsZSYpOwogCiAgICAgRWxlbWVudFVwZGF0ZXMgcmVzb2x2ZUVsZW1lbnQo RWxlbWVudCYpOwogCkBAIC0xMTMsNiArMTE3LDkgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8UGFy ZW50LCAzMj4gbV9wYXJlbnRTdGFjazsKICAgICBib29sIG1fZGlkU2VlUGVuZGluZ1N0eWxlc2hl ZXQgeyBmYWxzZSB9OwogCisgICAgSGFzaFNldDxSZWZQdHI8RWxlbWVudD4+IG1fdW5yZXNvbHZl ZFF1ZXJ5Q29udGFpbmVyczsKKyAgICBIYXNoU2V0PFJlZlB0cjxFbGVtZW50Pj4gbV9yZXNvbHZl ZFF1ZXJ5Q29udGFpbmVyczsKKwogICAgIHN0ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IG1fdXBkYXRl OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVVcGRhdGUuaCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVXBkYXRlLmgKaW5kZXggN2Y5ZDdhMTc3Y2NmZjU5 ZWE4Mjc2MTY1ODI0YWUzYWNkNTgyYjlhMC4uYzBkNGQwNmVhOGY5YTQ4M2VjMWE5OTU5MTIyZWMz ZjcwODg1OWVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVVcGRhdGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVVwZGF0ZS5oCkBAIC04MCw2ICs4MCw3 IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCgpIGNvbnN0IHsgcmV0 dXJuIG1fZG9jdW1lbnQ7IH0KIAorICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuICFz aXplKCk7IH0KICAgICB1bnNpZ25lZCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50cy5z aXplKCkgKyBtX3RleHRzLnNpemUoKTsgfQogCiAgICAgdm9pZCBhZGRFbGVtZW50KEVsZW1lbnQm LCBFbGVtZW50KiBwYXJlbnQsIEVsZW1lbnRVcGRhdGVzJiYpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cKaW5kZXggNjU0YjUzZTY2MDMyNzA4MDNhYmEwNGU3NzJkY2ZiZjNmNDg0YWIxOC4u OTYxMjc4YTY5ZDQ3ZWE5MWJiODFjZDRjNTg3Mjk0ZDE4MmY5ZTE2NCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjItMDEtMzEgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNd IEVuc3VyZSBxdWVyeSBjb250YWluZXJzIGhhdmUgdmFsaWQgbGF5b3V0IGJlZm9yZSByZXNvbHZp bmcgdGhlIHN1YnRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNTg5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVl cmllcy9jb250YWluZXItdHlwZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0OgorCiAyMDIyLTAx LTMxICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBDaGVjayBmb3IgcXVlcnkgY29udGFpbmVycyB3aGVuIG1hdGNoaW5n IHJ1bGVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWluZXItdHlwZS1p bnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvY29udGFpbmVy LXR5cGUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dAppbmRleCBjMzUxYzIzN2M3OGRjYmY0Zjhl OGY0M2ZmOTQyY2MwY2Y5YWJiNmE5Li43ZTFmYmYxZDIyY2EyYjJiOTVmMmRkZWY2ODcyNThmOWFm MDU4Mzg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWluZXItdHlwZS1p bnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRh aW5lci10eXBlLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw0IEBACiBUZXN0 CiAKLUZBSUwgQ2hhbmdpbmcgdGhlIGNvbnRhaW5lciB0eXBlIGludmFsaWRhdGVzIHJlbGV2YW50 IGRlc2NlbmRhbnRzIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0 IGdvdCAicmdiKDAsIDAsIDApIgorRkFJTCBDaGFuZ2luZyB0aGUgY29udGFpbmVyIHR5cGUgaW52 YWxpZGF0ZXMgcmVsZXZhbnQgZGVzY2VuZGFudHMgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgInJn YigwLCAwLCAwKSIgYnV0IGdvdCAicmdiKDAsIDEyOCwgMCkiCiAK 450553 2022-02-01 11:23:31 -0800 2022-02-01 12:35:43 -0800 Patch for landing bug-235896-20220201212329.patch text/plain 11398 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTkyYjAzNzQzNDVlZjUz ZGY2NzlkZmU3Y2UxNWZjZDM1OTlmYTJiZi4uMWMwYzU1NGM3MGVkNTU3Mzg3NmRjOTA5OGI5YmM1 MGQzMjllYWM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIyLTAxLTMxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBFbnN1cmUgcXVlcnkgY29udGFpbmVycyBoYXZlIHZhbGlkIGxheW91dCBiZWZvcmUg cmVzb2x2aW5nIHRoZSBzdWJ0cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzU4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBBbGFuIEJ1anRhcy4K KworICAgICAgICBUbyByZXNvbHZlIGNvbnRhaW5lciBxdWVyaWVzIHdlIG5lZWQgdG8gaGF2ZSB1 cC10by1kYXRlIGxheW91dCBmb3IgdGhlIHF1ZXJ5IGNvbnRhaW5lcnMgYmVmb3JlCisgICAgICAg IHN0eWxlIHJlc29sdXRpb24gYWR2YW5jZXMgdG8gdGhlaXIgZGVzY2VuZGFudHMuCisKKyAgICAg ICAgV2l0aCB0aGlzIHBhdGNoIHdlIGJvdW5jZSBiZXR3ZWVuIHN0eWxlIHJlc29sdXRpb24gYW5k IGxheW91dCB1bnRpbCBhbGwgcXVlcnkgY29udGFpbmVycyBhcmUgcmVzb2x2ZWQuCisKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlc29s dmVTdHlsZSk6CisKKyAgICAgICAgTG9vcCBzdHlsZSByZXNvbHV0aW9uL3JlbmRlciB0cmVlIHVw ZGF0ZS9sYXlvdXQgdW50aWwgd2UgaGF2ZSByZXNvbHZlZCBldmVyeXRoaW5nLgorCisgICAgICAg ICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aXNSZXNvbHZp bmdDb250YWluZXJRdWVyaWVzIGNvbnN0KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlld0xheW91 dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6 bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OnJ1bk9y U2NoZWR1bGVBc3luY2hyb25vdXNUYXNrcyk6CisKKyAgICAgICAgRG9uJ3QgcnVuIHBvc3QtbGF5 b3V0IHRhc2tzIHdoZW4gcmVzb2x2aW5nIHF1ZXJ5IGNvbnRhaW5lcnMuCisKKyAgICAgICAgKiBz dHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6VHJl ZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl OjpUcmVlUmVzb2x2ZXI6OnVwZGF0ZVF1ZXJ5Q29udGFpbmVyKToKKworICAgICAgICBUcmFjayB3 aGF0IGhhcyBiZWVuIHJlc29sdmVkLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6VHJlZVJl c29sdmVyOjpyZXNvbHZlKToKKyAgICAgICAgKiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6aGFzVW5yZXNvbHZlZFF1ZXJ5 Q29udGFpbmVycyBjb25zdCk6CisgICAgICAgICogc3R5bGUvU3R5bGVVcGRhdGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlOjpVcGRhdGU6OmlzRW1wdHkgY29uc3QpOgorCiAyMDIyLTAxLTMx ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtX UF0gUmVzdHJpY3QgaW1hZ2UgZGVjb2RlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGFj NTY0YjFlODc2NjJhZmVkZWY2MmQ5M2IwNDMxN2M0MTkzMTBiYmEuLmZlODk5YzJlZWZjZDYwMzUw YzFlZDY2YWZiNTkyMjA1Y2E4OWZiZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMjA1 NSw2ICsyMDU1LDE3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGVU eXBlIHR5cGUpCiAgICAgICAgIFN0eWxlOjpUcmVlUmVzb2x2ZXIgcmVzb2x2ZXIoKnRoaXMsIFdU Rk1vdmUobV9wZW5kaW5nUmVuZGVyVHJlZVRleHRVcGRhdGUpKTsKICAgICAgICAgYXV0byBzdHls ZVVwZGF0ZSA9IHJlc29sdmVyLnJlc29sdmUoKTsKIAorICAgICAgICB3aGlsZSAocmVzb2x2ZXIu aGFzVW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycygpICYmIHN0eWxlVXBkYXRlKSB7CisgICAgICAg ICAgICBTZXRGb3JTY29wZSByZXNvbHZpbmdDb250YWluZXJRdWVyaWVzU2NvcGUobV9pc1Jlc29s dmluZ0NvbnRhaW5lclF1ZXJpZXMsIHRydWUpOworCisgICAgICAgICAgICB1cGRhdGVSZW5kZXJU cmVlKFdURk1vdmUoc3R5bGVVcGRhdGUpKTsKKworICAgICAgICAgICAgaWYgKGZyYW1lVmlldy5s YXlvdXRDb250ZXh0KCkubmVlZHNMYXlvdXQoKSkKKyAgICAgICAgICAgICAgICBmcmFtZVZpZXcu bGF5b3V0Q29udGV4dCgpLmxheW91dCgpOworCisgICAgICAgICAgICBzdHlsZVVwZGF0ZSA9IHJl c29sdmVyLnJlc29sdmUoKTsKKyAgICAgICAgfQorCiAgICAgICAgIG1fbGFzdFN0eWxlVXBkYXRl U2l6ZUZvclRlc3RpbmcgPSBzdHlsZVVwZGF0ZSA/IHN0eWxlVXBkYXRlLT5zaXplKCkgOiAwOwog CiAgICAgICAgIHNldEhhc1ZhbGlkU3R5bGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggODAx ODQxYTdiY2U5ZGExMjU1ZjU2YjE3MjQ5ZTgwZDFkZWNiMzE3NC4uNjhhNGYyMWMxNTRjZWJhY2Jh MGIwYWYzNTM3ODZlZTNmYmQ0ZWRmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTEzNDUsNiAr MTM0NSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaW5TdHlsZVJlY2FsYygpIGNvbnN0IHsgcmV0 dXJuIG1faW5TdHlsZVJlY2FsYzsgfQogICAgIGJvb2wgaW5SZW5kZXJUcmVlVXBkYXRlKCkgY29u c3QgeyByZXR1cm4gbV9pblJlbmRlclRyZWVVcGRhdGU7IH0KKyAgICBib29sIGlzUmVzb2x2aW5n Q29udGFpbmVyUXVlcmllcygpIGNvbnN0IHsgcmV0dXJuIG1faXNSZXNvbHZpbmdDb250YWluZXJR dWVyaWVzOyB9CiAgICAgYm9vbCBpc1Jlc29sdmluZ1RyZWVTdHlsZSgpIGNvbnN0IHsgcmV0dXJu IG1faXNSZXNvbHZpbmdUcmVlU3R5bGU7IH0KICAgICB2b2lkIHNldElzUmVzb2x2aW5nVHJlZVN0 eWxlKGJvb2wpOwogCkBAIC0yMTM2LDYgKzIxMzcsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9p blN0eWxlUmVjYWxjIHsgZmFsc2UgfTsKICAgICBib29sIG1faW5SZW5kZXJUcmVlVXBkYXRlIHsg ZmFsc2UgfTsKICAgICBib29sIG1faXNSZXNvbHZpbmdUcmVlU3R5bGUgeyBmYWxzZSB9OworICAg IGJvb2wgbV9pc1Jlc29sdmluZ0NvbnRhaW5lclF1ZXJpZXMgeyBmYWxzZSB9OwogCiAgICAgYm9v bCBtX2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX2lzRE5TUHJlZmV0Y2hFbmFibGVkIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwCmluZGV4IGU2ZGJkYjNhMDc2NTRhYzYw ZWI5ODAxNmQyNGMxYTc3MzJmYmQyMTMuLjY5YTRjMjNjOWEzNjE4MmMxNzA5ZTM3YTFhYjRkOGU3 NDgxOGY4NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0 Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250 ZXh0LmNwcApAQCAtMjA0LDExICsyMDQsMTQgQEAgdm9pZCBGcmFtZVZpZXdMYXlvdXRDb250ZXh0 OjpsYXlvdXQoKQogICAgIHsKICAgICAgICAgU2V0Rm9yU2NvcGU8TGF5b3V0UGhhc2U+IGxheW91 dFBoYXNlKG1fbGF5b3V0UGhhc2UsIExheW91dFBoYXNlOjpJblByZUxheW91dCk7CiAKLSAgICAg ICAgLy8gSWYgdGhpcyBpcyBhIG5ldyB0b3AtbGV2ZWwgbGF5b3V0IGFuZCB0aGVyZSBhcmUgYW55 IHJlbWFpbmluZyB0YXNrcyBmcm9tIHRoZSBwcmV2aW91cyBsYXlvdXQsIGZpbmlzaCB0aGVtIG5v dy4KLSAgICAgICAgaWYgKCFpc0xheW91dE5lc3RlZCgpICYmIG1fYXN5bmNocm9ub3VzVGFza3NU aW1lci5pc0FjdGl2ZSgpICYmICF2aWV3KCkuaXNJbkNoaWxkRnJhbWVXaXRoRnJhbWVGbGF0dGVu aW5nKCkpCi0gICAgICAgICAgICBydW5Bc3luY2hyb25vdXNUYXNrcygpOworICAgICAgICBpZiAo IWZyYW1lKCkuZG9jdW1lbnQoKS0+aXNSZXNvbHZpbmdDb250YWluZXJRdWVyaWVzKCkpIHsKKyAg ICAgICAgICAgIC8vIElmIHRoaXMgaXMgYSBuZXcgdG9wLWxldmVsIGxheW91dCBhbmQgdGhlcmUg YXJlIGFueSByZW1haW5pbmcgdGFza3MgZnJvbSB0aGUgcHJldmlvdXMgbGF5b3V0LCBmaW5pc2gg dGhlbSBub3cuCisgICAgICAgICAgICBpZiAoIWlzTGF5b3V0TmVzdGVkKCkgJiYgbV9hc3luY2hy b25vdXNUYXNrc1RpbWVyLmlzQWN0aXZlKCkgJiYgIXZpZXcoKS5pc0luQ2hpbGRGcmFtZVdpdGhG cmFtZUZsYXR0ZW5pbmcoKSkKKyAgICAgICAgICAgICAgICBydW5Bc3luY2hyb25vdXNUYXNrcygp OworCisgICAgICAgICAgICB1cGRhdGVTdHlsZUZvckxheW91dCgpOworICAgICAgICB9CiAKLSAg ICAgICAgdXBkYXRlU3R5bGVGb3JMYXlvdXQoKTsKICAgICAgICAgaWYgKHZpZXcoKS5oYXNPbmVS ZWYoKSkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMjY4LDYgKzI3MSwxMiBAQCB2b2lkIEZy YW1lVmlld0xheW91dENvbnRleHQ6OnJ1bk9yU2NoZWR1bGVBc3luY2hyb25vdXNUYXNrcygpCiAg ICAgaWYgKG1fYXN5bmNocm9ub3VzVGFza3NUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICByZXR1 cm47CiAKKyAgICBpZiAoZnJhbWUoKS5kb2N1bWVudCgpLT5pc1Jlc29sdmluZ0NvbnRhaW5lclF1 ZXJpZXMoKSkgeworICAgICAgICAvLyBXZSBhcmUgZG9pbmcgbGF5b3V0IGZyb20gc3R5bGUgcmVz b2x1dGlvbiB0byByZXNvbHZlIGNvbnRhaW5lciBxdWVyaWVzLgorICAgICAgICBtX2FzeW5jaHJv bm91c1Rhc2tzVGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKICAgICBpZiAodmlldygpLmlzSW5DaGlsZEZyYW1lV2l0aEZyYW1lRmxhdHRlbmluZygpKSB7 CiAgICAgICAgIC8vIFdoaWxlIGZsYXR0ZW5pbmcgZnJhbWVzLCB3ZSBkZWZlciBwb3N0IGxheW91 dCB0YXNrcyB0byBhdm9pZCBnZXR0aW5nIHN0dWNrIGluIGEgY3ljbGUsCiAgICAgICAgIC8vIGV4 Y2VwdCB1cGRhdGVXaWRnZXRQb3NpdGlvbnMoKSB3aGljaCBpcyByZXF1aXJlZCB0byBraWNrIG9m ZiBzdWJmcmFtZSBsYXlvdXQgaW4gY2VydGFpbiBjYXNlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlVHJlZVJlc29sdmVyLmNwcAppbmRleCAyZDIzNjZhZTQzOGI4OWZiYTU3ZTUyNGE3Zjg1 ZTc4ZTAwZjc1MzA2Li4zZWY4NmYzMTQzZDc0N2MzMmFhNjBkOWQ2YTAyYTY1ZjdmMzcyMTNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCkBAIC01OTgsOCAr NTk4LDEwIEBAIHZvaWQgVHJlZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRUcmVlKCkKIAogICAg ICAgICBib29sIHNob3VsZEl0ZXJhdGVDaGlsZHJlbiA9IHN0eWxlICYmIChlbGVtZW50LmNoaWxk TmVlZHNTdHlsZVJlY2FsYygpIHx8IGRlc2NlbmRhbnRzVG9SZXNvbHZlICE9IERlc2NlbmRhbnRz VG9SZXNvbHZlOjpOb25lKTsKIAotICAgICAgICBpZiAoc2hvdWxkSXRlcmF0ZUNoaWxkcmVuKQot ICAgICAgICAgICAgdXBkYXRlUXVlcnlDb250YWluZXIoZWxlbWVudCwgKnN0eWxlKTsKKyAgICAg ICAgaWYgKHNob3VsZEl0ZXJhdGVDaGlsZHJlbikgeworICAgICAgICAgICAgaWYgKHVwZGF0ZVF1 ZXJ5Q29udGFpbmVyKGVsZW1lbnQsICpzdHlsZSkgPT0gUXVlcnlDb250YWluZXJBY3Rpb246Okxh eW91dCkKKyAgICAgICAgICAgICAgICBzaG91bGRJdGVyYXRlQ2hpbGRyZW4gPSBmYWxzZTsKKyAg ICAgICAgfQogCiAgICAgICAgIGlmICghbV9kaWRTZWVQZW5kaW5nU3R5bGVzaGVldCkKICAgICAg ICAgICAgIG1fZGlkU2VlUGVuZGluZ1N0eWxlc2hlZXQgPSBoYXNMb2FkaW5nU3R5bGVzaGVldCht X2RvY3VtZW50LnN0eWxlU2NvcGUoKSwgZWxlbWVudCwgIXNob3VsZEl0ZXJhdGVDaGlsZHJlbik7 CkBAIC02MTksMTQgKzYyMSwyNiBAQCB2b2lkIFRyZWVSZXNvbHZlcjo6cmVzb2x2ZUNvbXBvc2Vk VHJlZSgpCiAgICAgcG9wUGFyZW50c1RvRGVwdGgoMSk7CiB9CiAKLXZvaWQgVHJlZVJlc29sdmVy Ojp1cGRhdGVRdWVyeUNvbnRhaW5lcihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCithdXRvIFRyZWVSZXNvbHZlcjo6dXBkYXRlUXVlcnlDb250YWluZXIo RWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKSAtPiBRdWVyeUNvbnRh aW5lckFjdGlvbgogewogICAgIGlmIChzdHlsZS5jb250YWluZXJUeXBlKCkgPT0gQ29udGFpbmVy VHlwZTo6Tm9uZSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gUXVlcnlDb250YWlu ZXJBY3Rpb246Ok5vbmU7CiAKICAgICBzY29wZSgpLnNlbGVjdG9yTWF0Y2hpbmdTdGF0ZS5xdWVy eUNvbnRhaW5lcnMuYXBwZW5kKGVsZW1lbnQpOwogCi0gICAgLy8gRklYTUU6IFNraXAgdGhlIHN1 YnRyZWUgYW5kIGVuc3VyZSB0aGUgY29udGFpbmVyIGlzIHJlc29sdmVkIGJ5IGRvaW5nIGEgbGF5 b3V0IGlmIG5lZWRlZC4KKyAgICBpZiAobV91bnJlc29sdmVkUXVlcnlDb250YWluZXJzLnJlbW92 ZSgmZWxlbWVudCkpIHsKKyAgICAgICAgbV9yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycy5hZGQoJmVs ZW1lbnQpOworICAgICAgICByZXR1cm4gUXVlcnlDb250YWluZXJBY3Rpb246OkNvbnRpbnVlOwor ICAgIH0KKworICAgIGlmIChtX3VwZGF0ZS0+aXNFbXB0eSgpKSB7CisgICAgICAgIG1fcmVzb2x2 ZWRRdWVyeUNvbnRhaW5lcnMuYWRkKCZlbGVtZW50KTsKKyAgICAgICAgcmV0dXJuIFF1ZXJ5Q29u dGFpbmVyQWN0aW9uOjpDb250aW51ZTsKKyAgICB9CisKKyAgICBtX3VucmVzb2x2ZWRRdWVyeUNv bnRhaW5lcnMuYWRkKCZlbGVtZW50KTsKKworICAgIHJldHVybiBRdWVyeUNvbnRhaW5lckFjdGlv bjo6TGF5b3V0OwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRlPiBUcmVlUmVzb2x2ZXI6OnJl c29sdmUoKQpAQCAtNjM4LDYgKzY1MiwxMSBAQCBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRlPiBUcmVl UmVzb2x2ZXI6OnJlc29sdmUoKQogICAgICAgICBtX2RvY3VtZW50LnN0eWxlU2NvcGUoKS5yZXNv bHZlcigpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CisKKyAgICAvLyBGSVhNRTog SnVzdCBuZWVkIHRvIHJlc3RvcmUgdGhlIGFuY2VzdG9yIG1hcmtpbmcuCisgICAgZm9yIChhdXRv JiBxdWVyeUNvbnRhaW5lciA6IG1fdW5yZXNvbHZlZFF1ZXJ5Q29udGFpbmVycykKKyAgICAgICAg cXVlcnlDb250YWluZXItPmludmFsaWRhdGVTdHlsZUZvclN1YnRyZWVJbnRlcm5hbCgpOworCiAg ICAgaWYgKCFkb2N1bWVudEVsZW1lbnQtPmNoaWxkTmVlZHNTdHlsZVJlY2FsYygpICYmICFkb2N1 bWVudEVsZW1lbnQtPm5lZWRzU3R5bGVSZWNhbGMoKSkKICAgICAgICAgcmV0dXJuIFdURk1vdmUo bV91cGRhdGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVS ZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuaAppbmRl eCBhZjE4OWEzYTUwYjRmNTI1NzMxY2QzYWVkZTU2MzgxOTc0MGVmOTk2Li4wMThkNmFkZGMwNDI5 OTlhOGMzMTFlY2NlZDc2NmNjNjhmYWJkMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxl VHJlZVJlc29sdmVyLmgKQEAgLTU1LDExICs1NSwxNSBAQCBwdWJsaWM6CiAKICAgICBzdGQ6OnVu aXF1ZV9wdHI8VXBkYXRlPiByZXNvbHZlKCk7CiAKKyAgICBib29sIGhhc1VucmVzb2x2ZWRRdWVy eUNvbnRhaW5lcnMoKSBjb25zdCB7IHJldHVybiAhbV91bnJlc29sdmVkUXVlcnlDb250YWluZXJz LmlzRW1wdHkoKTsgfQorCiBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHls ZT4gc3R5bGVGb3JTdHlsZWFibGUoY29uc3QgU3R5bGVhYmxlJiwgY29uc3QgUmVzb2x1dGlvbkNv bnRleHQmKTsKIAogICAgIHZvaWQgcmVzb2x2ZUNvbXBvc2VkVHJlZSgpOwotICAgIHZvaWQgdXBk YXRlUXVlcnlDb250YWluZXIoY29uc3QgRWxlbWVudCYsIGNvbnN0IFJlbmRlclN0eWxlJik7CisK KyAgICBlbnVtIGNsYXNzIFF1ZXJ5Q29udGFpbmVyQWN0aW9uIDogdWludDhfdCB7IE5vbmUsIENv bnRpbnVlLCBMYXlvdXQgfTsKKyAgICBRdWVyeUNvbnRhaW5lckFjdGlvbiB1cGRhdGVRdWVyeUNv bnRhaW5lcihFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKIAogICAgIEVsZW1lbnRVcGRh dGVzIHJlc29sdmVFbGVtZW50KEVsZW1lbnQmKTsKIApAQCAtMTEzLDYgKzExNyw5IEBAIHByaXZh dGU6CiAgICAgVmVjdG9yPFBhcmVudCwgMzI+IG1fcGFyZW50U3RhY2s7CiAgICAgYm9vbCBtX2Rp ZFNlZVBlbmRpbmdTdHlsZXNoZWV0IHsgZmFsc2UgfTsKIAorICAgIEhhc2hTZXQ8UmVmUHRyPEVs ZW1lbnQ+PiBtX3VucmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnM7CisgICAgSGFzaFNldDxSZWZQdHI8 RWxlbWVudD4+IG1fcmVzb2x2ZWRRdWVyeUNvbnRhaW5lcnM7CisKICAgICBzdGQ6OnVuaXF1ZV9w dHI8VXBkYXRlPiBtX3VwZGF0ZTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlVXBkYXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVVwZGF0ZS5oCmlu ZGV4IDdmOWQ3YTE3N2NjZmY1OWVhODI3NjE2NTgyNGFlM2FjZDU4MmI5YTAuLmMwZDRkMDZlYThm OWE0ODNlYzFhOTk1OTEyMmVjM2Y3MDg4NTllZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlVXBkYXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVVcGRh dGUuaApAQCAtODAsNiArODAsNyBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBEb2N1bWVudCYgZG9j dW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2RvY3VtZW50OyB9CiAKKyAgICBib29sIGlzRW1wdHko KSBjb25zdCB7IHJldHVybiAhc2l6ZSgpOyB9CiAgICAgdW5zaWduZWQgc2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fZWxlbWVudHMuc2l6ZSgpICsgbV90ZXh0cy5zaXplKCk7IH0KIAogICAgIHZvaWQg YWRkRWxlbWVudChFbGVtZW50JiwgRWxlbWVudCogcGFyZW50LCBFbGVtZW50VXBkYXRlcyYmKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDY1NGI1M2U2NjAzMjcwODAzYWJhMDRl NzcyZGNmYmYzZjQ4NGFiMTguLjRhZWE5ZjMxM2ExN2EzY2M3OWVkODk1NTUyZjA5NTJkZjYyYjQ0 ZTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIy LTAxLTMxICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NT IENvbnRhaW5lciBRdWVyaWVzXSBFbnN1cmUgcXVlcnkgY29udGFpbmVycyBoYXZlIHZhbGlkIGxh eW91dCBiZWZvcmUgcmVzb2x2aW5nIHRoZSBzdWJ0cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBB bGFuIEJ1anRhcy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRh aW4vY29udGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLXR5cGUtaW52YWxpZGF0aW9uLWV4cGVjdGVk LnR4dDoKKwogMjAyMi0wMS0zMSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAK ICAgICAgICAgW0NTUyBDb250YWluZXIgUXVlcmllc10gQ2hlY2sgZm9yIHF1ZXJ5IGNvbnRhaW5l cnMgd2hlbiBtYXRjaGluZyBydWxlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMv Y29udGFpbmVyLXR5cGUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1x dWVyaWVzL2NvbnRhaW5lci10eXBlLWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKaW5kZXggYzM1 MWMyMzdjNzhkY2JmNGY4ZThmNDNmZjk0MmNjMGNmOWFiYjZhOS4uN2UxZmJmMWQyMmNhMmIyYjk1 ZjJkZGVmNjg3MjU4ZjlhZjA1ODM4OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMv Y29udGFpbmVyLXR5cGUtaW52YWxpZGF0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWlu ZXItcXVlcmllcy9jb250YWluZXItdHlwZS1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0x LDQgKzEsNCBAQAogVGVzdAogCi1GQUlMIENoYW5naW5nIHRoZSBjb250YWluZXIgdHlwZSBpbnZh bGlkYXRlcyByZWxldmFudCBkZXNjZW5kYW50cyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAicmdi KDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigwLCAwLCAwKSIKK0ZBSUwgQ2hhbmdpbmcgdGhlIGNv bnRhaW5lciB0eXBlIGludmFsaWRhdGVzIHJlbGV2YW50IGRlc2NlbmRhbnRzIGFzc2VydF9lcXVh bHM6IGV4cGVjdGVkICJyZ2IoMCwgMCwgMCkiIGJ1dCBnb3QgInJnYigwLCAxMjgsIDApIgogCg==