241261 2022-06-03 04:16:03 -0700 [CSS Container Queries] Disallow styles using container units from matched declarations cache 2022-06-03 08:30:14 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto cdumez changseok esprehn+autocc ews-watchlist glenn gyuyoung.kim kangil.han kondapallykalyan macpherson menard pdr webkit-bug-importer zalan oldest_to_newest 1873857 0 koivisto 2022-06-03 04:16:03 -0700 Their value depends on the context. 1873858 1 460007 koivisto 2022-06-03 04:26:26 -0700 Created attachment 460007 Patch 1873859 2 460008 koivisto 2022-06-03 04:28:22 -0700 Created attachment 460008 Patch 1873918 3 ews-feeder 2022-06-03 08:29:38 -0700 Committed r295211 (251268@main): <https://commits.webkit.org/251268@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460008. 1873919 4 webkit-bug-importer 2022-06-03 08:30:14 -0700 <rdar://problem/94347059> 460007 2022-06-03 04:26:26 -0700 2022-06-03 04:28:18 -0700 Patch bug-241261-20220603142625.patch text/plain 14983 koivisto RnJvbSAzMDUzYTY4NjgyOGQwNmRmNmUyMWNmMDcwYTZjNjM0ZWJhZGRmNzZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBGcmksIDMgSnVuIDIwMjIgMTQ6MTY6NTggKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBEaXNhbGxvdyBzdHlsZXMgdXNpbmcgY29udGFpbmVyIHVuaXRzCiBm cm9tIG1hdGNoZWQgZGVjbGFyYXRpb25zIGNhY2hlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQxMjYxCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCldlIG1h eSBmYWlsIHRvIGludmFsaWRhdGUgc3R5bGVzIHVzaW5nIGNvbnRhaW5lciB1bml0cyBjb3JyZWN0 bHkgb24gY29udGFpbmVyIHNpemUgY2hhbmdlCmJlY2F1c2UgdGhleSBhcmUgZ2V0dGluZyBjYWNo ZWQuCgoqIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1pbnZhbGlkYXRpb24t ZXhwZWN0ZWQudHh0OgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6 CihXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZU5vbkNhbGNMZW5ndGhEb3VibGUp OgoKTWFyayBzdHlsZXMgdGhhdCB1c2UgY29udGFpbmVyIHVuaXRzLgoKKiBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5jcHA6CihXZWJDb3JlOjpDU1NUb0xlbmd0 aENvbnZlcnNpb25EYXRhOjpkZWZhdWx0Vmlld3BvcnRGYWN0b3IgY29uc3QpOgooV2ViQ29yZTo6 Q1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YTo6c21hbGxWaWV3cG9ydEZhY3RvciBjb25zdCk6CihX ZWJDb3JlOjpDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpsYXJnZVZpZXdwb3J0RmFjdG9yIGNv bnN0KToKKFdlYkNvcmU6OkNTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6OmR5bmFtaWNWaWV3cG9y dEZhY3RvciBjb25zdCk6CihXZWJDb3JlOjpDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpzZXRV c2VzQ29udGFpbmVyVW5pdHMgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0 aENvbnZlcnNpb25EYXRhLmg6CiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoKKFdl YkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVWaWV3cG9ydFVuaXRzT25SZXNpemUpOgoqIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwOgooV2ViQ29yZTo6UmVuZGVySUZyYW1l Ojppc0Z1bGxTY3JlZW5JRnJhbWUgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHA6CihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6UmVuZGVyU3R5bGUp OgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgooV2ViQ29y ZTo6UmVuZGVyU3R5bGU6OnNldFVzZXNWaWV3cG9ydFVuaXRzKToKKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjp1c2VzVmlld3BvcnRVbml0cyBjb25zdCk6CgpBbHNvIHJlbmFtZSBoYXNWaWV3cG9ydFVu aXRzIC0+IHVzZXNWaWV3cG9ydFVuaXRzIGZvciBjbGFyaXR5LgoKKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpzZXRVc2VzQ29udGFpbmVyVW5pdHMpOgooV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnVzZXND b250YWluZXJVbml0cyBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVk RmxhZ3M6Om9wZXJhdG9yPT0gY29uc3QpOgooV2ViQ29yZTo6UmVuZGVyU3R5bGU6Ok5vbkluaGVy aXRlZEZsYWdzOjpjb3B5Tm9uSW5oZXJpdGVkRnJvbSk6CihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 c2V0SGFzVmlld3BvcnRVbml0cyk6IERlbGV0ZWQuCihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6aGFz Vmlld3BvcnRVbml0cyBjb25zdCk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvc3R5bGUvTWF0 Y2hlZERlY2xhcmF0aW9uc0NhY2hlLmNwcDoKKFdlYkNvcmU6OlN0eWxlOjpNYXRjaGVkRGVjbGFy YXRpb25zQ2FjaGU6OmlzQ2FjaGVhYmxlKToKCkRpc2FsbG93IGNhY2hpbmcuCgooV2ViQ29yZTo6 U3R5bGU6Ok1hdGNoZWREZWNsYXJhdGlvbnNDYWNoZTo6Y2xlYXJFbnRyaWVzQWZmZWN0ZWRCeVZp ZXdwb3J0VW5pdHMpOgoqIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwOgoo V2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpzdHlsZUZvckVsZW1lbnQpOgooV2ViQ29yZTo6U3R5 bGU6OlJlc29sdmVyOjpwc2V1ZG9TdHlsZUZvckVsZW1lbnQpOgotLS0KIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAgICAgICAgICAgfCAgMSArCiBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5jcHAgIHwgMTQgKysrKysrKysrKy0tLS0K IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhLmggICAgfCAgMiAr KwogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgICAgICB8ICAy ICstCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcCAgICAgICAgIHwg IDIgKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgICAg fCAgMiArLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggICAg ICB8IDE1ICsrKysrKysrKystLS0tLQogU291cmNlL1dlYkNvcmUvc3R5bGUvTWF0Y2hlZERlY2xh cmF0aW9uc0NhY2hlLmNwcCB8ICA0ICsrKy0KIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVz b2x2ZXIuY3BwICAgICAgICAgICAgfCAgNCArKy0tCiAuLi4vY29udGFpbmVyLXVuaXRzLWludmFs aWRhdGlvbi1leHBlY3RlZC50eHQgICAgIHwgMTAgKysrKystLS0tLQogMTAgZmlsZXMgY2hhbmdl ZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcmltaXRpdmVWYWx1ZS5jcHAKaW5kZXggY2EwZTNhYmEzMzM5Li40ZjYwYmVjMGQ5NzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcApAQCAtODI0LDYgKzgyNCw3 IEBAIGRvdWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZVVuem9vbWVkTm9uQ2FsY0xlbmd0 aERvdWJsZShDU1NVbml0VHlwZSBwcmltaXRpCiBkb3VibGUgQ1NTUHJpbWl0aXZlVmFsdWU6OmNv bXB1dGVOb25DYWxjTGVuZ3RoRG91YmxlKGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEm IGNvbnZlcnNpb25EYXRhLCBDU1NVbml0VHlwZSBwcmltaXRpdmVUeXBlLCBkb3VibGUgdmFsdWUp CiB7CiAgICAgYXV0byBzZWxlY3RDb250YWluZXJSZW5kZXJlciA9IFsmXShDUTo6QXhpcyBheGlz KSAtPiBjb25zdCBSZW5kZXJCb3gqIHsKKyAgICAgICAgY29udmVyc2lvbkRhdGEuc2V0VXNlc0Nv bnRhaW5lclVuaXRzKCk7CiAgICAgICAgIGlmICghY29udmVyc2lvbkRhdGEuZWxlbWVudCgpKQog ICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIC8vIEZJWE1FOiBVc2UgY2FjaGVk IHF1ZXJ5IGNvbnRhaW5lcnMgd2hlbiBhdmFpbGFibGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5jcHAKaW5kZXggMjUwYjM3MmM0N2I4Li5hYjA2 MGM3ZTcwYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0aENvbnZl cnNpb25EYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJz aW9uRGF0YS5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgZmxvYXQgQ1NTVG9MZW5ndGhDb252ZXJzaW9u RGF0YTo6em9vbSgpIGNvbnN0CiBGbG9hdFNpemUgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YTo6 ZGVmYXVsdFZpZXdwb3J0RmFjdG9yKCkgY29uc3QKIHsKICAgICBpZiAobV92aWV3cG9ydERlcGVu ZGVuY3lEZXRlY3Rpb25TdHlsZSkKLSAgICAgICAgbV92aWV3cG9ydERlcGVuZGVuY3lEZXRlY3Rp b25TdHlsZS0+c2V0SGFzVmlld3BvcnRVbml0cygpOworICAgICAgICBtX3ZpZXdwb3J0RGVwZW5k ZW5jeURldGVjdGlvblN0eWxlLT5zZXRVc2VzVmlld3BvcnRVbml0cygpOwogCiAgICAgaWYgKCFt X3JlbmRlclZpZXcpCiAgICAgICAgIHJldHVybiB7IH07CkBAIC03Nyw3ICs3Nyw3IEBAIEZsb2F0 U2l6ZSBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpkZWZhdWx0Vmlld3BvcnRGYWN0b3IoKSBj b25zdAogRmxvYXRTaXplIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6OnNtYWxsVmlld3BvcnRG YWN0b3IoKSBjb25zdAogewogICAgIGlmIChtX3ZpZXdwb3J0RGVwZW5kZW5jeURldGVjdGlvblN0 eWxlKQotICAgICAgICBtX3ZpZXdwb3J0RGVwZW5kZW5jeURldGVjdGlvblN0eWxlLT5zZXRIYXNW aWV3cG9ydFVuaXRzKCk7CisgICAgICAgIG1fdmlld3BvcnREZXBlbmRlbmN5RGV0ZWN0aW9uU3R5 bGUtPnNldFVzZXNWaWV3cG9ydFVuaXRzKCk7CiAKICAgICBpZiAoIW1fcmVuZGVyVmlldykKICAg ICAgICAgcmV0dXJuIHsgfTsKQEAgLTg4LDcgKzg4LDcgQEAgRmxvYXRTaXplIENTU1RvTGVuZ3Ro Q29udmVyc2lvbkRhdGE6OnNtYWxsVmlld3BvcnRGYWN0b3IoKSBjb25zdAogRmxvYXRTaXplIENT U1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6OmxhcmdlVmlld3BvcnRGYWN0b3IoKSBjb25zdAogewog ICAgIGlmIChtX3ZpZXdwb3J0RGVwZW5kZW5jeURldGVjdGlvblN0eWxlKQotICAgICAgICBtX3Zp ZXdwb3J0RGVwZW5kZW5jeURldGVjdGlvblN0eWxlLT5zZXRIYXNWaWV3cG9ydFVuaXRzKCk7Cisg ICAgICAgIG1fdmlld3BvcnREZXBlbmRlbmN5RGV0ZWN0aW9uU3R5bGUtPnNldFVzZXNWaWV3cG9y dFVuaXRzKCk7CiAKICAgICBpZiAoIW1fcmVuZGVyVmlldykKICAgICAgICAgcmV0dXJuIHsgfTsK QEAgLTk5LDcgKzk5LDcgQEAgRmxvYXRTaXplIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6Omxh cmdlVmlld3BvcnRGYWN0b3IoKSBjb25zdAogRmxvYXRTaXplIENTU1RvTGVuZ3RoQ29udmVyc2lv bkRhdGE6OmR5bmFtaWNWaWV3cG9ydEZhY3RvcigpIGNvbnN0CiB7CiAgICAgaWYgKG1fdmlld3Bv cnREZXBlbmRlbmN5RGV0ZWN0aW9uU3R5bGUpCi0gICAgICAgIG1fdmlld3BvcnREZXBlbmRlbmN5 RGV0ZWN0aW9uU3R5bGUtPnNldEhhc1ZpZXdwb3J0VW5pdHMoKTsKKyAgICAgICAgbV92aWV3cG9y dERlcGVuZGVuY3lEZXRlY3Rpb25TdHlsZS0+c2V0VXNlc1ZpZXdwb3J0VW5pdHMoKTsKIAogICAg IGlmICghbV9yZW5kZXJWaWV3KQogICAgICAgICByZXR1cm4geyB9OwpAQCAtMTA3LDQgKzEwNywx MCBAQCBGbG9hdFNpemUgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YTo6ZHluYW1pY1ZpZXdwb3J0 RmFjdG9yKCkgY29uc3QKICAgICByZXR1cm4gbV9yZW5kZXJWaWV3LT5zaXplRm9yQ1NTRHluYW1p Y1ZpZXdwb3J0VW5pdHMoKSAvIDEwMC4wOwogfQogCit2b2lkIENTU1RvTGVuZ3RoQ29udmVyc2lv bkRhdGE6OnNldFVzZXNDb250YWluZXJVbml0cygpIGNvbnN0Cit7CisgICAgaWYgKG1fdmlld3Bv cnREZXBlbmRlbmN5RGV0ZWN0aW9uU3R5bGUpCisgICAgICAgIG1fdmlld3BvcnREZXBlbmRlbmN5 RGV0ZWN0aW9uU3R5bGUtPnNldFVzZXNDb250YWluZXJVbml0cygpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVG9MZW5ndGhD b252ZXJzaW9uRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1RvTGVuZ3RoQ29udmVyc2lv bkRhdGEuaAppbmRleCAxN2NhMjZmMDE0NTcuLjdiNWM5OTQzNTAyOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5oCkBAIC05NCw2ICs5NCw4IEBA IHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGNvcHk7CiAgICAgfQogCisgICAgdm9pZCBzZXRVc2Vz Q29udGFpbmVyVW5pdHMoKSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBjb25zdCBSZW5kZXJTdHls ZSogbV9zdHlsZSB7IG51bGxwdHIgfTsKICAgICBjb25zdCBSZW5kZXJTdHlsZSogbV9yb290U3R5 bGUgeyBudWxscHRyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5ZDA3ZmM4NWUxMWMu LjM2MmI1MzZlMzlkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC00MzUyLDcgKzQzNTIs NyBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVWaWV3cG9ydFVuaXRzT25SZXNpemUoKQogICAgIC8v IEZJWE1FOiBJZGVhbGx5LCB3ZSBzaG91bGQgc2F2ZSB0aGUgbGlzdCBvZiBlbGVtZW50cyB0aGF0 IGhhdmUgdmlld3BvcnQgdW5pdHMgYW5kIG9ubHkgaXRlcmF0ZSBvdmVyIHRob3NlLgogICAgIGZv ciAoUmVmUHRyIGVsZW1lbnQgPSBFbGVtZW50VHJhdmVyc2FsOjpmaXJzdFdpdGhpbihyb290Tm9k ZSgpKTsgZWxlbWVudDsgZWxlbWVudCA9IEVsZW1lbnRUcmF2ZXJzYWw6Om5leHRJbmNsdWRpbmdQ c2V1ZG8oKmVsZW1lbnQpKSB7CiAgICAgICAgIGF1dG8qIHJlbmRlcmVyID0gZWxlbWVudC0+cmVu ZGVyZXIoKTsKLSAgICAgICAgaWYgKHJlbmRlcmVyICYmIHJlbmRlcmVyLT5zdHlsZSgpLmhhc1Zp ZXdwb3J0VW5pdHMoKSkKKyAgICAgICAgaWYgKHJlbmRlcmVyICYmIHJlbmRlcmVyLT5zdHlsZSgp LnVzZXNWaWV3cG9ydFVuaXRzKCkpCiAgICAgICAgICAgICBlbGVtZW50LT5pbnZhbGlkYXRlU3R5 bGUoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVySUZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3Bw CmluZGV4IDE2ZmM4ODBjYzMyNC4uYzM2ZDY5N2NhYTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySUZyYW1lLmNwcApAQCAtNzYsNyArNzYsNyBAQCBib29sIFJlbmRlcklGcmFt ZTo6aXNGdWxsU2NyZWVuSUZyYW1lKCkgY29uc3QKIHsKICAgICAvLyBTb21lIGF1dGhvcnMgaW1w bGVtZW50IGZ1bGxzY3JlZW4gcG9wdXBzIGFzIG91dC1vZi1mbG93IGlmcmFtZXMgd2l0aCBzaXpl IHNldCB0byBmdWxsIHZpZXdwb3J0ICh1c2luZyB2dy92aCB1bml0cykuCiAgICAgLy8gVGhlIHNp emUgdXNlZCBtYXkgbm90IHBlcmZlY3RseSBtYXRjaCB0aGUgdmlld3BvcnQgc2l6ZSBzbyB0aGUg Zm9sbG93aW5nIGhldXJpc3RpYyB1c2VzIGEgcmVsYXhlZCBjb25zdHJhaW50LgotICAgIHJldHVy biBzdHlsZSgpLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkgJiYgc3R5bGUoKS5oYXNWaWV3cG9ydFVu aXRzKCk7CisgICAgcmV0dXJuIHN0eWxlKCkuaGFzT3V0T2ZGbG93UG9zaXRpb24oKSAmJiBzdHls ZSgpLnVzZXNWaWV3cG9ydFVuaXRzKCk7CiB9CiAKIGJvb2wgUmVuZGVySUZyYW1lOjpmbGF0dGVu RnJhbWUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAKaW5kZXggOTgyZDAwMjBlOTYzLi5iMGMxNmM2YTE2YjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMTk4LDcgKzE5OCw3 IEBAIFJlbmRlclN0eWxlOjpSZW5kZXJTdHlsZShDcmVhdGVEZWZhdWx0U3R5bGVUYWcpCiAgICAg bV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0RGlyZWN0aW9uID0gZmFsc2U7CiAg ICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0V3JpdGluZ01vZGUgPSBmYWxz ZTsKICAgICBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRUZXh0QWxpZ24gPSBm YWxzZTsKLSAgICBtX25vbkluaGVyaXRlZEZsYWdzLmhhc1ZpZXdwb3J0VW5pdHMgPSBmYWxzZTsK KyAgICBtX25vbkluaGVyaXRlZEZsYWdzLnVzZXNWaWV3cG9ydFVuaXRzID0gZmFsc2U7CiAgICAg bV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllcyA9IGZh bHNlOwogICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuZGlzYWxsb3dzRmFzdFBhdGhJbmhlcml0YW5j ZSA9IGZhbHNlOwogICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaXNVbmlxdWUgPSBmYWxzZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggNDUzYzNm ZjIxYWYzLi43ZWYzNTNiYzg2NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCkBAIC0xOTcsOCArMTk3LDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIHNl dEluaGVyaXRlZEN1c3RvbVByb3BlcnR5VmFsdWUoY29uc3QgQXRvbVN0cmluZyYgbmFtZSwgUmVm PENTU0N1c3RvbVByb3BlcnR5VmFsdWU+JiYpOwogICAgIHZvaWQgc2V0Tm9uSW5oZXJpdGVkQ3Vz dG9tUHJvcGVydHlWYWx1ZShjb25zdCBBdG9tU3RyaW5nJiBuYW1lLCBSZWY8Q1NTQ3VzdG9tUHJv cGVydHlWYWx1ZT4mJik7CiAKLSAgICB2b2lkIHNldEhhc1ZpZXdwb3J0VW5pdHMoYm9vbCB2ID0g dHJ1ZSkgeyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc1ZpZXdwb3J0VW5pdHMgPSB2OyB9Ci0gICAg Ym9vbCBoYXNWaWV3cG9ydFVuaXRzKCkgY29uc3QgeyByZXR1cm4gbV9ub25Jbmhlcml0ZWRGbGFn cy5oYXNWaWV3cG9ydFVuaXRzOyB9CisgICAgdm9pZCBzZXRVc2VzVmlld3BvcnRVbml0cygpIHsg bV9ub25Jbmhlcml0ZWRGbGFncy51c2VzVmlld3BvcnRVbml0cyA9IHRydWU7IH0KKyAgICBib29s IHVzZXNWaWV3cG9ydFVuaXRzKCkgY29uc3QgeyByZXR1cm4gbV9ub25Jbmhlcml0ZWRGbGFncy51 c2VzVmlld3BvcnRVbml0czsgfQorICAgIHZvaWQgc2V0VXNlc0NvbnRhaW5lclVuaXRzKCkgeyBt X25vbkluaGVyaXRlZEZsYWdzLnVzZXNDb250YWluZXJVbml0cyA9IHRydWU7IH0KKyAgICBib29s IHVzZXNDb250YWluZXJVbml0cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3Mu dXNlc0NvbnRhaW5lclVuaXRzOyB9CiAKICAgICB2b2lkIHNldENvbHVtblN0eWxlc0Zyb21QYWdp bmF0aW9uTW9kZShjb25zdCBQYWdpbmF0aW9uOjpNb2RlJik7CiAgICAgCkBAIC0xOTkyLDcgKzE5 OTQsOCBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShEQVJLX01PREVfQ1NTKQogICAgICAgICB1bnNp Z25lZCBoYXNFeHBsaWNpdGx5U2V0Q29sb3JTY2hlbWUgOiAxOwogI2VuZGlmCi0gICAgICAgIHVu c2lnbmVkIGhhc1ZpZXdwb3J0VW5pdHMgOiAxOworICAgICAgICB1bnNpZ25lZCB1c2VzVmlld3Bv cnRVbml0cyA6IDE7CisgICAgICAgIHVuc2lnbmVkIHVzZXNDb250YWluZXJVbml0cyA6IDE7CiAg ICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlJbmhlcml0ZWRQcm9wZXJ0aWVzIDogMTsgLy8g RXhwbGljaXRseSBpbmhlcml0cyBhIG5vbi1pbmhlcml0ZWQgcHJvcGVydHkuCiAgICAgICAgIHVu c2lnbmVkIGRpc2FsbG93c0Zhc3RQYXRoSW5oZXJpdGFuY2UgOiAxOwogICAgICAgICB1bnNpZ25l ZCBpc1VuaXF1ZSA6IDE7IC8vIFN0eWxlIGNhbm5vdCBiZSBzaGFyZWQuCkBAIC0yMTMzLDcgKzIx MzYsOCBAQCBpbmxpbmUgYm9vbCBSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVkRmxhZ3M6Om9wZXJh dG9yPT0oY29uc3QgTm9uSW5oZXJpdGVkRmxhZ3MmCiAjaWYgRU5BQkxFKERBUktfTU9ERV9DU1Mp CiAgICAgICAgICYmIGhhc0V4cGxpY2l0bHlTZXRDb2xvclNjaGVtZSA9PSBvdGhlci5oYXNFeHBs aWNpdGx5U2V0Q29sb3JTY2hlbWUKICNlbmRpZgotICAgICAgICAmJiBoYXNWaWV3cG9ydFVuaXRz ID09IG90aGVyLmhhc1ZpZXdwb3J0VW5pdHMKKyAgICAgICAgJiYgdXNlc1ZpZXdwb3J0VW5pdHMg PT0gb3RoZXIudXNlc1ZpZXdwb3J0VW5pdHMKKyAgICAgICAgJiYgdXNlc0NvbnRhaW5lclVuaXRz ID09IG90aGVyLnVzZXNDb250YWluZXJVbml0cwogICAgICAgICAmJiBoYXNFeHBsaWNpdGx5SW5o ZXJpdGVkUHJvcGVydGllcyA9PSBvdGhlci5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGll cwogICAgICAgICAmJiBkaXNhbGxvd3NGYXN0UGF0aEluaGVyaXRhbmNlID09IG90aGVyLmRpc2Fs bG93c0Zhc3RQYXRoSW5oZXJpdGFuY2UKICAgICAgICAgJiYgaXNVbmlxdWUgPT0gb3RoZXIuaXNV bmlxdWUKQEAgLTIxNTksNyArMjE2Myw4IEBAIGlubGluZSB2b2lkIFJlbmRlclN0eWxlOjpOb25J bmhlcml0ZWRGbGFnczo6Y29weU5vbkluaGVyaXRlZEZyb20oY29uc3QgTm9uSW5oZXJpCiAgICAg dW5pY29kZUJpZGkgPSBvdGhlci51bmljb2RlQmlkaTsKICAgICBmbG9hdGluZyA9IG90aGVyLmZs b2F0aW5nOwogICAgIHRhYmxlTGF5b3V0ID0gb3RoZXIudGFibGVMYXlvdXQ7Ci0gICAgaGFzVmll d3BvcnRVbml0cyA9IG90aGVyLmhhc1ZpZXdwb3J0VW5pdHM7CisgICAgdXNlc1ZpZXdwb3J0VW5p dHMgPSBvdGhlci51c2VzVmlld3BvcnRVbml0czsKKyAgICB1c2VzQ29udGFpbmVyVW5pdHMgPSBv dGhlci51c2VzQ29udGFpbmVyVW5pdHM7CiAgICAgaGFzRXhwbGljaXRseUluaGVyaXRlZFByb3Bl cnRpZXMgPSBvdGhlci5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllczsKICAgICBkaXNh bGxvd3NGYXN0UGF0aEluaGVyaXRhbmNlID0gb3RoZXIuZGlzYWxsb3dzRmFzdFBhdGhJbmhlcml0 YW5jZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvTWF0Y2hlZERlY2xhcmF0 aW9uc0NhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL01hdGNoZWREZWNsYXJhdGlvbnND YWNoZS5jcHAKaW5kZXggZWM0YTY1MDUwMmZkLi5kZGM4MjdmNGRhNjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL01hdGNoZWREZWNsYXJhdGlvbnNDYWNoZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvTWF0Y2hlZERlY2xhcmF0aW9uc0NhY2hlLmNwcApAQCAtNjEsNiAr NjEsOCBAQCBib29sIE1hdGNoZWREZWNsYXJhdGlvbnNDYWNoZTo6aXNDYWNoZWFibGUoY29uc3Qg RWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVuZGVyUwogICAgIC8vIFRoZSBjYWNoZSBhc3N1bWVz IHN0YXRpYyBrbm93bGVkZ2UgYWJvdXQgd2hpY2ggcHJvcGVydGllcyBhcmUgaW5oZXJpdGVkLgog ICAgIGlmIChzdHlsZS5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllcygpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgaWYgKHN0eWxlLnVzZXNDb250YWluZXJVbml0cygpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBHZXR0aW5nIGNvbXB1dGVkIHN0eWxlIGFmdGVy IGEgZm9udCBlbnZpcm9ubWVudCBjaGFuZ2UgYnV0IGJlZm9yZSBmdWxsIHN0eWxlIHJlc29sdXRp b24gbWF5IGludm9sdmUgc3R5bGVzIHdpdGggbm9uLWN1cnJlbnQgZm9udHMuCiAgICAgLy8gQXZv aWQgY2FjaGluZyB0aGVtLgpAQCAtMTM4LDcgKzE0MCw3IEBAIHZvaWQgTWF0Y2hlZERlY2xhcmF0 aW9uc0NhY2hlOjppbnZhbGlkYXRlKCkKIHZvaWQgTWF0Y2hlZERlY2xhcmF0aW9uc0NhY2hlOjpj bGVhckVudHJpZXNBZmZlY3RlZEJ5Vmlld3BvcnRVbml0cygpCiB7CiAgICAgbV9lbnRyaWVzLnJl bW92ZUlmKFtdKGF1dG8mIGtleVZhbHVlKSB7Ci0gICAgICAgIHJldHVybiBrZXlWYWx1ZS52YWx1 ZS5yZW5kZXJTdHlsZS0+aGFzVmlld3BvcnRVbml0cygpOworICAgICAgICByZXR1cm4ga2V5VmFs dWUudmFsdWUucmVuZGVyU3R5bGUtPnVzZXNWaWV3cG9ydFVuaXRzKCk7CiAgICAgfSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggMjk4OTAyMjIwMmQ3Li5j NTg3OWNmYjI0ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2 ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0y NjksNyArMjY5LDcgQEAgRWxlbWVudFN0eWxlIFJlc29sdmVyOjpzdHlsZUZvckVsZW1lbnQoY29u c3QgRWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVzb2x1dGlvbkMKICAgICBBZGp1c3RlciBhZGp1 c3Rlcihkb2N1bWVudCgpLCAqc3RhdGUucGFyZW50U3R5bGUoKSwgY29udGV4dC5wYXJlbnRCb3hT dHlsZSwgJmVsZW1lbnQpOwogICAgIGFkanVzdGVyLmFkanVzdCgqc3RhdGUuc3R5bGUoKSwgc3Rh dGUudXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKCkpOwogCi0gICAgaWYgKHN0YXRlLnN0eWxlKCkt Pmhhc1ZpZXdwb3J0VW5pdHMoKSkKKyAgICBpZiAoc3RhdGUuc3R5bGUoKS0+dXNlc1ZpZXdwb3J0 VW5pdHMoKSkKICAgICAgICAgZG9jdW1lbnQoKS5zZXRIYXNTdHlsZVdpdGhWaWV3cG9ydFVuaXRz KCk7CiAKICAgICByZXR1cm4geyBzdGF0ZS50YWtlU3R5bGUoKSwgV1RGTW92ZShlbGVtZW50U3R5 bGVSZWxhdGlvbnMpIH07CkBAIC00NjUsNyArNDY1LDcgQEAgc3RkOjp1bmlxdWVfcHRyPFJlbmRl clN0eWxlPiBSZXNvbHZlcjo6cHNldWRvU3R5bGVGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQmIGVs ZW0KICAgICBBZGp1c3RlciBhZGp1c3Rlcihkb2N1bWVudCgpLCAqc3RhdGUucGFyZW50U3R5bGUo KSwgY29udGV4dC5wYXJlbnRCb3hTdHlsZSwgbnVsbHB0cik7CiAgICAgYWRqdXN0ZXIuYWRqdXN0 KCpzdGF0ZS5zdHlsZSgpLCBzdGF0ZS51c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUoKSk7CiAKLSAg ICBpZiAoc3RhdGUuc3R5bGUoKS0+aGFzVmlld3BvcnRVbml0cygpKQorICAgIGlmIChzdGF0ZS5z dHlsZSgpLT51c2VzVmlld3BvcnRVbml0cygpKQogICAgICAgICBkb2N1bWVudCgpLnNldEhhc1N0 eWxlV2l0aFZpZXdwb3J0VW5pdHMoKTsKIAogICAgIHJldHVybiBzdGF0ZS50YWtlU3R5bGUoKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1pbnZhbGlk YXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLXVuaXRz LWludmFsaWRhdGlvbi1leHBlY3RlZC50eHQKaW5kZXggMjg5Yjc0M2E0ZWM2Li4zOTJhYTIzZWMz NGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1pbnZh bGlkYXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5l ci11bml0cy1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDggKzEsOCBAQAogVGVzdAog Ci1GQUlMIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5nZXMgdHlwZSAo aW5saW5lLXNpemUgLT4gbm9uZSkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjUwcHgiIGJ1dCBn b3QgIjMwcHgiCi1GQUlMIGNxYiByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5n ZXMgdHlwZSAoc2l6ZSAtPiBub25lKSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiNjBweCIgYnV0 IGdvdCAiNDBweCIKLUZBSUwgY3FiIHJlc3BvbmQgd2hlbiBpbnRlcm1lZGlhdGUgY29udGFpbmVy IGNoYW5nZXMgdHlwZSAoaW5saW5lLXNpemUgLT4gc2l6ZSkgYXNzZXJ0X2VxdWFsczogZXhwZWN0 ZWQgIjIwcHgiIGJ1dCBnb3QgIjQwcHgiCi1GQUlMIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQg Y29udGFpbmVyIGNoYW5nZXMgaW5saW5lLXNpemUgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjVw eCIgYnV0IGdvdCAiMzBweCIKLUZBSUwgY3FiIHJlc3BvbmQgd2hlbiBzZWxlY3RlZCBjb250YWlu ZXIgY2hhbmdlcyBibG9jay1zaXplIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICI1cHgiIGJ1dCBn b3QgIjQwcHgiCitQQVNTIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5n ZXMgdHlwZSAoaW5saW5lLXNpemUgLT4gbm9uZSkKK1BBU1MgY3FiIHJlc3BvbmQgd2hlbiBzZWxl Y3RlZCBjb250YWluZXIgY2hhbmdlcyB0eXBlIChzaXplIC0+IG5vbmUpCitQQVNTIGNxYiByZXNw b25kIHdoZW4gaW50ZXJtZWRpYXRlIGNvbnRhaW5lciBjaGFuZ2VzIHR5cGUgKGlubGluZS1zaXpl IC0+IHNpemUpCitQQVNTIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5n ZXMgaW5saW5lLXNpemUKK1BBU1MgY3FiIHJlc3BvbmQgd2hlbiBzZWxlY3RlZCBjb250YWluZXIg Y2hhbmdlcyBibG9jay1zaXplCiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg== 460008 2022-06-03 04:28:22 -0700 2022-06-03 08:29:39 -0700 Patch bug-241261-20220603142820.patch text/plain 15037 koivisto RnJvbSAyOWVlNjA3NmY2M2RjYTNjZWUxOTAyNTZhYTFiMjBiYTczMGQ3ZjA0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBGcmksIDMgSnVuIDIwMjIgMTQ6MTY6NTggKzAzMDAKU3ViamVjdDogW1BBVENIXSBbQ1NTIENv bnRhaW5lciBRdWVyaWVzXSBEaXNhbGxvdyBzdHlsZXMgdXNpbmcgY29udGFpbmVyIHVuaXRzCiBm cm9tIG1hdGNoZWQgZGVjbGFyYXRpb25zIGNhY2hlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQxMjYxCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCldlIG1h eSBmYWlsIHRvIGludmFsaWRhdGUgc3R5bGVzIHVzaW5nIGNvbnRhaW5lciB1bml0cyBjb3JyZWN0 bHkgb24gY29udGFpbmVyIHNpemUgY2hhbmdlCmJlY2F1c2UgdGhleSBhcmUgZ2V0dGluZyBjYWNo ZWQuCgoqIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1pbnZhbGlkYXRpb24t ZXhwZWN0ZWQudHh0OgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6 CihXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZU5vbkNhbGNMZW5ndGhEb3VibGUp OgoKTWFyayBzdHlsZXMgdGhhdCB1c2UgY29udGFpbmVyIHVuaXRzLgoKKiBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5jcHA6CihXZWJDb3JlOjpDU1NUb0xlbmd0 aENvbnZlcnNpb25EYXRhOjpkZWZhdWx0Vmlld3BvcnRGYWN0b3IgY29uc3QpOgooV2ViQ29yZTo6 Q1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YTo6c21hbGxWaWV3cG9ydEZhY3RvciBjb25zdCk6CihX ZWJDb3JlOjpDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpsYXJnZVZpZXdwb3J0RmFjdG9yIGNv bnN0KToKKFdlYkNvcmU6OkNTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6OmR5bmFtaWNWaWV3cG9y dEZhY3RvciBjb25zdCk6CihXZWJDb3JlOjpDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpzZXRV c2VzQ29udGFpbmVyVW5pdHMgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0 aENvbnZlcnNpb25EYXRhLmg6CiogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoKKFdl YkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVWaWV3cG9ydFVuaXRzT25SZXNpemUpOgoqIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwOgooV2ViQ29yZTo6UmVuZGVySUZyYW1l Ojppc0Z1bGxTY3JlZW5JRnJhbWUgY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHA6CihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6UmVuZGVyU3R5bGUp OgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgooV2ViQ29y ZTo6UmVuZGVyU3R5bGU6OnNldFVzZXNWaWV3cG9ydFVuaXRzKToKKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjp1c2VzVmlld3BvcnRVbml0cyBjb25zdCk6CgpBbHNvIHJlbmFtZSBoYXNWaWV3cG9ydFVu aXRzIC0+IHVzZXNWaWV3cG9ydFVuaXRzIGZvciBjbGFyaXR5LgoKKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpzZXRVc2VzQ29udGFpbmVyVW5pdHMpOgooV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnVzZXND b250YWluZXJVbml0cyBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVk RmxhZ3M6Om9wZXJhdG9yPT0gY29uc3QpOgooV2ViQ29yZTo6UmVuZGVyU3R5bGU6Ok5vbkluaGVy aXRlZEZsYWdzOjpjb3B5Tm9uSW5oZXJpdGVkRnJvbSk6CihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 c2V0SGFzVmlld3BvcnRVbml0cyk6IERlbGV0ZWQuCihXZWJDb3JlOjpSZW5kZXJTdHlsZTo6aGFz Vmlld3BvcnRVbml0cyBjb25zdCk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvc3R5bGUvTWF0 Y2hlZERlY2xhcmF0aW9uc0NhY2hlLmNwcDoKKFdlYkNvcmU6OlN0eWxlOjpNYXRjaGVkRGVjbGFy YXRpb25zQ2FjaGU6OmlzQ2FjaGVhYmxlKToKCkRpc2FsbG93IGNhY2hpbmcuCgooV2ViQ29yZTo6 U3R5bGU6Ok1hdGNoZWREZWNsYXJhdGlvbnNDYWNoZTo6Y2xlYXJFbnRyaWVzQWZmZWN0ZWRCeVZp ZXdwb3J0VW5pdHMpOgoqIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwOgoo V2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpzdHlsZUZvckVsZW1lbnQpOgooV2ViQ29yZTo6U3R5 bGU6OlJlc29sdmVyOjpwc2V1ZG9TdHlsZUZvckVsZW1lbnQpOgotLS0KIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAgICAgICAgICAgfCAgMSArCiBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YS5jcHAgIHwgMTQgKysrKysrKysrKy0tLS0K IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhLmggICAgfCAgMiAr KwogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCAgICAgICAgICAgICAgICAgICB8ICAy ICstCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcCAgICAgICAgIHwg IDIgKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgICAg fCAgMyArKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oICAg ICAgfCAxNSArKysrKysrKysrLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3N0eWxlL01hdGNoZWREZWNs YXJhdGlvbnNDYWNoZS5jcHAgfCAgNCArKystCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJl c29sdmVyLmNwcCAgICAgICAgICAgIHwgIDQgKystLQogLi4uL2NvbnRhaW5lci11bml0cy1pbnZh bGlkYXRpb24tZXhwZWN0ZWQudHh0ICAgICB8IDEwICsrKysrLS0tLS0KIDEwIGZpbGVzIGNoYW5n ZWQsIDM3IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJpbWl0aXZlVmFsdWUuY3BwCmluZGV4IGNhMGUzYWJhMzMzOS4uNGY2MGJlYzBkOTcxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAKQEAgLTgyNCw2ICs4MjQs NyBAQCBkb3VibGUgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVVbnpvb21lZE5vbkNhbGNMZW5n dGhEb3VibGUoQ1NTVW5pdFR5cGUgcHJpbWl0aQogZG91YmxlIENTU1ByaW1pdGl2ZVZhbHVlOjpj b21wdXRlTm9uQ2FsY0xlbmd0aERvdWJsZShjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRh JiBjb252ZXJzaW9uRGF0YSwgQ1NTVW5pdFR5cGUgcHJpbWl0aXZlVHlwZSwgZG91YmxlIHZhbHVl KQogewogICAgIGF1dG8gc2VsZWN0Q29udGFpbmVyUmVuZGVyZXIgPSBbJl0oQ1E6OkF4aXMgYXhp cykgLT4gY29uc3QgUmVuZGVyQm94KiB7CisgICAgICAgIGNvbnZlcnNpb25EYXRhLnNldFVzZXND b250YWluZXJVbml0cygpOwogICAgICAgICBpZiAoIWNvbnZlcnNpb25EYXRhLmVsZW1lbnQoKSkK ICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAvLyBGSVhNRTogVXNlIGNhY2hl ZCBxdWVyeSBjb250YWluZXJzIHdoZW4gYXZhaWxhYmxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEuY3BwCmluZGV4IDI1MGIzNzJjNDdiOC4uYWIw NjBjN2U3MGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVG9MZW5ndGhDb252 ZXJzaW9uRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1RvTGVuZ3RoQ29udmVy c2lvbkRhdGEuY3BwCkBAIC02Niw3ICs2Niw3IEBAIGZsb2F0IENTU1RvTGVuZ3RoQ29udmVyc2lv bkRhdGE6Onpvb20oKSBjb25zdAogRmxvYXRTaXplIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6 OmRlZmF1bHRWaWV3cG9ydEZhY3RvcigpIGNvbnN0CiB7CiAgICAgaWYgKG1fdmlld3BvcnREZXBl bmRlbmN5RGV0ZWN0aW9uU3R5bGUpCi0gICAgICAgIG1fdmlld3BvcnREZXBlbmRlbmN5RGV0ZWN0 aW9uU3R5bGUtPnNldEhhc1ZpZXdwb3J0VW5pdHMoKTsKKyAgICAgICAgbV92aWV3cG9ydERlcGVu ZGVuY3lEZXRlY3Rpb25TdHlsZS0+c2V0VXNlc1ZpZXdwb3J0VW5pdHMoKTsKIAogICAgIGlmICgh bV9yZW5kZXJWaWV3KQogICAgICAgICByZXR1cm4geyB9OwpAQCAtNzcsNyArNzcsNyBAQCBGbG9h dFNpemUgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YTo6ZGVmYXVsdFZpZXdwb3J0RmFjdG9yKCkg Y29uc3QKIEZsb2F0U2l6ZSBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpzbWFsbFZpZXdwb3J0 RmFjdG9yKCkgY29uc3QKIHsKICAgICBpZiAobV92aWV3cG9ydERlcGVuZGVuY3lEZXRlY3Rpb25T dHlsZSkKLSAgICAgICAgbV92aWV3cG9ydERlcGVuZGVuY3lEZXRlY3Rpb25TdHlsZS0+c2V0SGFz Vmlld3BvcnRVbml0cygpOworICAgICAgICBtX3ZpZXdwb3J0RGVwZW5kZW5jeURldGVjdGlvblN0 eWxlLT5zZXRVc2VzVmlld3BvcnRVbml0cygpOwogCiAgICAgaWYgKCFtX3JlbmRlclZpZXcpCiAg ICAgICAgIHJldHVybiB7IH07CkBAIC04OCw3ICs4OCw3IEBAIEZsb2F0U2l6ZSBDU1NUb0xlbmd0 aENvbnZlcnNpb25EYXRhOjpzbWFsbFZpZXdwb3J0RmFjdG9yKCkgY29uc3QKIEZsb2F0U2l6ZSBD U1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjpsYXJnZVZpZXdwb3J0RmFjdG9yKCkgY29uc3QKIHsK ICAgICBpZiAobV92aWV3cG9ydERlcGVuZGVuY3lEZXRlY3Rpb25TdHlsZSkKLSAgICAgICAgbV92 aWV3cG9ydERlcGVuZGVuY3lEZXRlY3Rpb25TdHlsZS0+c2V0SGFzVmlld3BvcnRVbml0cygpOwor ICAgICAgICBtX3ZpZXdwb3J0RGVwZW5kZW5jeURldGVjdGlvblN0eWxlLT5zZXRVc2VzVmlld3Bv cnRVbml0cygpOwogCiAgICAgaWYgKCFtX3JlbmRlclZpZXcpCiAgICAgICAgIHJldHVybiB7IH07 CkBAIC05OSw3ICs5OSw3IEBAIEZsb2F0U2l6ZSBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhOjps YXJnZVZpZXdwb3J0RmFjdG9yKCkgY29uc3QKIEZsb2F0U2l6ZSBDU1NUb0xlbmd0aENvbnZlcnNp b25EYXRhOjpkeW5hbWljVmlld3BvcnRGYWN0b3IoKSBjb25zdAogewogICAgIGlmIChtX3ZpZXdw b3J0RGVwZW5kZW5jeURldGVjdGlvblN0eWxlKQotICAgICAgICBtX3ZpZXdwb3J0RGVwZW5kZW5j eURldGVjdGlvblN0eWxlLT5zZXRIYXNWaWV3cG9ydFVuaXRzKCk7CisgICAgICAgIG1fdmlld3Bv cnREZXBlbmRlbmN5RGV0ZWN0aW9uU3R5bGUtPnNldFVzZXNWaWV3cG9ydFVuaXRzKCk7CiAKICAg ICBpZiAoIW1fcmVuZGVyVmlldykKICAgICAgICAgcmV0dXJuIHsgfTsKQEAgLTEwNyw0ICsxMDcs MTAgQEAgRmxvYXRTaXplIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGE6OmR5bmFtaWNWaWV3cG9y dEZhY3RvcigpIGNvbnN0CiAgICAgcmV0dXJuIG1fcmVuZGVyVmlldy0+c2l6ZUZvckNTU0R5bmFt aWNWaWV3cG9ydFVuaXRzKCkgLyAxMDAuMDsKIH0KIAordm9pZCBDU1NUb0xlbmd0aENvbnZlcnNp b25EYXRhOjpzZXRVc2VzQ29udGFpbmVyVW5pdHMoKSBjb25zdAoreworICAgIGlmIChtX3ZpZXdw b3J0RGVwZW5kZW5jeURldGVjdGlvblN0eWxlKQorICAgICAgICBtX3ZpZXdwb3J0RGVwZW5kZW5j eURldGVjdGlvblN0eWxlLT5zZXRVc2VzQ29udGFpbmVyVW5pdHMoKTsKK30KKwogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1RvTGVuZ3Ro Q29udmVyc2lvbkRhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0aENvbnZlcnNp b25EYXRhLmgKaW5kZXggMTdjYTI2ZjAxNDU3Li43YjVjOTk0MzUwMjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhLmgKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEuaApAQCAtOTQsNiArOTQsOCBA QCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBjb3B5OwogICAgIH0KIAorICAgIHZvaWQgc2V0VXNl c0NvbnRhaW5lclVuaXRzKCkgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgY29uc3QgUmVuZGVyU3R5 bGUqIG1fc3R5bGUgeyBudWxscHRyIH07CiAgICAgY29uc3QgUmVuZGVyU3R5bGUqIG1fcm9vdFN0 eWxlIHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggOWQwN2ZjODVlMTFj Li4zNjJiNTM2ZTM5ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDM1Miw3ICs0MzUy LDcgQEAgdm9pZCBEb2N1bWVudDo6dXBkYXRlVmlld3BvcnRVbml0c09uUmVzaXplKCkKICAgICAv LyBGSVhNRTogSWRlYWxseSwgd2Ugc2hvdWxkIHNhdmUgdGhlIGxpc3Qgb2YgZWxlbWVudHMgdGhh dCBoYXZlIHZpZXdwb3J0IHVuaXRzIGFuZCBvbmx5IGl0ZXJhdGUgb3ZlciB0aG9zZS4KICAgICBm b3IgKFJlZlB0ciBlbGVtZW50ID0gRWxlbWVudFRyYXZlcnNhbDo6Zmlyc3RXaXRoaW4ocm9vdE5v ZGUoKSk7IGVsZW1lbnQ7IGVsZW1lbnQgPSBFbGVtZW50VHJhdmVyc2FsOjpuZXh0SW5jbHVkaW5n UHNldWRvKCplbGVtZW50KSkgewogICAgICAgICBhdXRvKiByZW5kZXJlciA9IGVsZW1lbnQtPnJl bmRlcmVyKCk7Ci0gICAgICAgIGlmIChyZW5kZXJlciAmJiByZW5kZXJlci0+c3R5bGUoKS5oYXNW aWV3cG9ydFVuaXRzKCkpCisgICAgICAgIGlmIChyZW5kZXJlciAmJiByZW5kZXJlci0+c3R5bGUo KS51c2VzVmlld3BvcnRVbml0cygpKQogICAgICAgICAgICAgZWxlbWVudC0+aW52YWxpZGF0ZVN0 eWxlKCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlcklGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNw cAppbmRleCAxNmZjODgwY2MzMjQuLmMzNmQ2OTdjYWE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAKQEAgLTc2LDcgKzc2LDcgQEAgYm9vbCBSZW5kZXJJRnJh bWU6OmlzRnVsbFNjcmVlbklGcmFtZSgpIGNvbnN0CiB7CiAgICAgLy8gU29tZSBhdXRob3JzIGlt cGxlbWVudCBmdWxsc2NyZWVuIHBvcHVwcyBhcyBvdXQtb2YtZmxvdyBpZnJhbWVzIHdpdGggc2l6 ZSBzZXQgdG8gZnVsbCB2aWV3cG9ydCAodXNpbmcgdncvdmggdW5pdHMpLgogICAgIC8vIFRoZSBz aXplIHVzZWQgbWF5IG5vdCBwZXJmZWN0bHkgbWF0Y2ggdGhlIHZpZXdwb3J0IHNpemUgc28gdGhl IGZvbGxvd2luZyBoZXVyaXN0aWMgdXNlcyBhIHJlbGF4ZWQgY29uc3RyYWludC4KLSAgICByZXR1 cm4gc3R5bGUoKS5oYXNPdXRPZkZsb3dQb3NpdGlvbigpICYmIHN0eWxlKCkuaGFzVmlld3BvcnRV bml0cygpOworICAgIHJldHVybiBzdHlsZSgpLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkgJiYgc3R5 bGUoKS51c2VzVmlld3BvcnRVbml0cygpOwogfQogCiBib29sIFJlbmRlcklGcmFtZTo6ZmxhdHRl bkZyYW1lKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuY3BwCmluZGV4IDk4MmQwMDIwZTk2My4uOTg2ODcyOTY3NWVlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKQEAgLTE5OCw3ICsxOTgs OCBAQCBSZW5kZXJTdHlsZTo6UmVuZGVyU3R5bGUoQ3JlYXRlRGVmYXVsdFN0eWxlVGFnKQogICAg IG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldERpcmVjdGlvbiA9IGZhbHNlOwog ICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldFdyaXRpbmdNb2RlID0gZmFs c2U7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0VGV4dEFsaWduID0g ZmFsc2U7Ci0gICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNWaWV3cG9ydFVuaXRzID0gZmFsc2U7 CisgICAgbV9ub25Jbmhlcml0ZWRGbGFncy51c2VzVmlld3BvcnRVbml0cyA9IGZhbHNlOworICAg IG1fbm9uSW5oZXJpdGVkRmxhZ3MudXNlc0NvbnRhaW5lclVuaXRzID0gZmFsc2U7CiAgICAgbV9u b25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllcyA9IGZhbHNl OwogICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuZGlzYWxsb3dzRmFzdFBhdGhJbmhlcml0YW5jZSA9 IGZhbHNlOwogICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaXNVbmlxdWUgPSBmYWxzZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggNDUzYzNmZjIx YWYzLi43ZWYzNTNiYzg2NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oCkBAIC0xOTcsOCArMTk3LDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldElu aGVyaXRlZEN1c3RvbVByb3BlcnR5VmFsdWUoY29uc3QgQXRvbVN0cmluZyYgbmFtZSwgUmVmPENT U0N1c3RvbVByb3BlcnR5VmFsdWU+JiYpOwogICAgIHZvaWQgc2V0Tm9uSW5oZXJpdGVkQ3VzdG9t UHJvcGVydHlWYWx1ZShjb25zdCBBdG9tU3RyaW5nJiBuYW1lLCBSZWY8Q1NTQ3VzdG9tUHJvcGVy dHlWYWx1ZT4mJik7CiAKLSAgICB2b2lkIHNldEhhc1ZpZXdwb3J0VW5pdHMoYm9vbCB2ID0gdHJ1 ZSkgeyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc1ZpZXdwb3J0VW5pdHMgPSB2OyB9Ci0gICAgYm9v bCBoYXNWaWV3cG9ydFVuaXRzKCkgY29uc3QgeyByZXR1cm4gbV9ub25Jbmhlcml0ZWRGbGFncy5o YXNWaWV3cG9ydFVuaXRzOyB9CisgICAgdm9pZCBzZXRVc2VzVmlld3BvcnRVbml0cygpIHsgbV9u b25Jbmhlcml0ZWRGbGFncy51c2VzVmlld3BvcnRVbml0cyA9IHRydWU7IH0KKyAgICBib29sIHVz ZXNWaWV3cG9ydFVuaXRzKCkgY29uc3QgeyByZXR1cm4gbV9ub25Jbmhlcml0ZWRGbGFncy51c2Vz Vmlld3BvcnRVbml0czsgfQorICAgIHZvaWQgc2V0VXNlc0NvbnRhaW5lclVuaXRzKCkgeyBtX25v bkluaGVyaXRlZEZsYWdzLnVzZXNDb250YWluZXJVbml0cyA9IHRydWU7IH0KKyAgICBib29sIHVz ZXNDb250YWluZXJVbml0cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MudXNl c0NvbnRhaW5lclVuaXRzOyB9CiAKICAgICB2b2lkIHNldENvbHVtblN0eWxlc0Zyb21QYWdpbmF0 aW9uTW9kZShjb25zdCBQYWdpbmF0aW9uOjpNb2RlJik7CiAgICAgCkBAIC0xOTkyLDcgKzE5OTQs OCBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShEQVJLX01PREVfQ1NTKQogICAgICAgICB1bnNpZ25l ZCBoYXNFeHBsaWNpdGx5U2V0Q29sb3JTY2hlbWUgOiAxOwogI2VuZGlmCi0gICAgICAgIHVuc2ln bmVkIGhhc1ZpZXdwb3J0VW5pdHMgOiAxOworICAgICAgICB1bnNpZ25lZCB1c2VzVmlld3BvcnRV bml0cyA6IDE7CisgICAgICAgIHVuc2lnbmVkIHVzZXNDb250YWluZXJVbml0cyA6IDE7CiAgICAg ICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlJbmhlcml0ZWRQcm9wZXJ0aWVzIDogMTsgLy8gRXhw bGljaXRseSBpbmhlcml0cyBhIG5vbi1pbmhlcml0ZWQgcHJvcGVydHkuCiAgICAgICAgIHVuc2ln bmVkIGRpc2FsbG93c0Zhc3RQYXRoSW5oZXJpdGFuY2UgOiAxOwogICAgICAgICB1bnNpZ25lZCBp c1VuaXF1ZSA6IDE7IC8vIFN0eWxlIGNhbm5vdCBiZSBzaGFyZWQuCkBAIC0yMTMzLDcgKzIxMzYs OCBAQCBpbmxpbmUgYm9vbCBSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVkRmxhZ3M6Om9wZXJhdG9y PT0oY29uc3QgTm9uSW5oZXJpdGVkRmxhZ3MmCiAjaWYgRU5BQkxFKERBUktfTU9ERV9DU1MpCiAg ICAgICAgICYmIGhhc0V4cGxpY2l0bHlTZXRDb2xvclNjaGVtZSA9PSBvdGhlci5oYXNFeHBsaWNp dGx5U2V0Q29sb3JTY2hlbWUKICNlbmRpZgotICAgICAgICAmJiBoYXNWaWV3cG9ydFVuaXRzID09 IG90aGVyLmhhc1ZpZXdwb3J0VW5pdHMKKyAgICAgICAgJiYgdXNlc1ZpZXdwb3J0VW5pdHMgPT0g b3RoZXIudXNlc1ZpZXdwb3J0VW5pdHMKKyAgICAgICAgJiYgdXNlc0NvbnRhaW5lclVuaXRzID09 IG90aGVyLnVzZXNDb250YWluZXJVbml0cwogICAgICAgICAmJiBoYXNFeHBsaWNpdGx5SW5oZXJp dGVkUHJvcGVydGllcyA9PSBvdGhlci5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllcwog ICAgICAgICAmJiBkaXNhbGxvd3NGYXN0UGF0aEluaGVyaXRhbmNlID09IG90aGVyLmRpc2FsbG93 c0Zhc3RQYXRoSW5oZXJpdGFuY2UKICAgICAgICAgJiYgaXNVbmlxdWUgPT0gb3RoZXIuaXNVbmlx dWUKQEAgLTIxNTksNyArMjE2Myw4IEBAIGlubGluZSB2b2lkIFJlbmRlclN0eWxlOjpOb25Jbmhl cml0ZWRGbGFnczo6Y29weU5vbkluaGVyaXRlZEZyb20oY29uc3QgTm9uSW5oZXJpCiAgICAgdW5p Y29kZUJpZGkgPSBvdGhlci51bmljb2RlQmlkaTsKICAgICBmbG9hdGluZyA9IG90aGVyLmZsb2F0 aW5nOwogICAgIHRhYmxlTGF5b3V0ID0gb3RoZXIudGFibGVMYXlvdXQ7Ci0gICAgaGFzVmlld3Bv cnRVbml0cyA9IG90aGVyLmhhc1ZpZXdwb3J0VW5pdHM7CisgICAgdXNlc1ZpZXdwb3J0VW5pdHMg PSBvdGhlci51c2VzVmlld3BvcnRVbml0czsKKyAgICB1c2VzQ29udGFpbmVyVW5pdHMgPSBvdGhl ci51c2VzQ29udGFpbmVyVW5pdHM7CiAgICAgaGFzRXhwbGljaXRseUluaGVyaXRlZFByb3BlcnRp ZXMgPSBvdGhlci5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllczsKICAgICBkaXNhbGxv d3NGYXN0UGF0aEluaGVyaXRhbmNlID0gb3RoZXIuZGlzYWxsb3dzRmFzdFBhdGhJbmhlcml0YW5j ZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvTWF0Y2hlZERlY2xhcmF0aW9u c0NhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL01hdGNoZWREZWNsYXJhdGlvbnNDYWNo ZS5jcHAKaW5kZXggZWM0YTY1MDUwMmZkLi5kZGM4MjdmNGRhNjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL01hdGNoZWREZWNsYXJhdGlvbnNDYWNoZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvc3R5bGUvTWF0Y2hlZERlY2xhcmF0aW9uc0NhY2hlLmNwcApAQCAtNjEsNiArNjEs OCBAQCBib29sIE1hdGNoZWREZWNsYXJhdGlvbnNDYWNoZTo6aXNDYWNoZWFibGUoY29uc3QgRWxl bWVudCYgZWxlbWVudCwgY29uc3QgUmVuZGVyUwogICAgIC8vIFRoZSBjYWNoZSBhc3N1bWVzIHN0 YXRpYyBrbm93bGVkZ2UgYWJvdXQgd2hpY2ggcHJvcGVydGllcyBhcmUgaW5oZXJpdGVkLgogICAg IGlmIChzdHlsZS5oYXNFeHBsaWNpdGx5SW5oZXJpdGVkUHJvcGVydGllcygpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgaWYgKHN0eWxlLnVzZXNDb250YWluZXJVbml0cygpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBHZXR0aW5nIGNvbXB1dGVkIHN0eWxlIGFmdGVyIGEg Zm9udCBlbnZpcm9ubWVudCBjaGFuZ2UgYnV0IGJlZm9yZSBmdWxsIHN0eWxlIHJlc29sdXRpb24g bWF5IGludm9sdmUgc3R5bGVzIHdpdGggbm9uLWN1cnJlbnQgZm9udHMuCiAgICAgLy8gQXZvaWQg Y2FjaGluZyB0aGVtLgpAQCAtMTM4LDcgKzE0MCw3IEBAIHZvaWQgTWF0Y2hlZERlY2xhcmF0aW9u c0NhY2hlOjppbnZhbGlkYXRlKCkKIHZvaWQgTWF0Y2hlZERlY2xhcmF0aW9uc0NhY2hlOjpjbGVh ckVudHJpZXNBZmZlY3RlZEJ5Vmlld3BvcnRVbml0cygpCiB7CiAgICAgbV9lbnRyaWVzLnJlbW92 ZUlmKFtdKGF1dG8mIGtleVZhbHVlKSB7Ci0gICAgICAgIHJldHVybiBrZXlWYWx1ZS52YWx1ZS5y ZW5kZXJTdHlsZS0+aGFzVmlld3BvcnRVbml0cygpOworICAgICAgICByZXR1cm4ga2V5VmFsdWUu dmFsdWUucmVuZGVyU3R5bGUtPnVzZXNWaWV3cG9ydFVuaXRzKCk7CiAgICAgfSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggMjk4OTAyMjIwMmQ3Li5jNTg3 OWNmYjI0ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0yNjks NyArMjY5LDcgQEAgRWxlbWVudFN0eWxlIFJlc29sdmVyOjpzdHlsZUZvckVsZW1lbnQoY29uc3Qg RWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVzb2x1dGlvbkMKICAgICBBZGp1c3RlciBhZGp1c3Rl cihkb2N1bWVudCgpLCAqc3RhdGUucGFyZW50U3R5bGUoKSwgY29udGV4dC5wYXJlbnRCb3hTdHls ZSwgJmVsZW1lbnQpOwogICAgIGFkanVzdGVyLmFkanVzdCgqc3RhdGUuc3R5bGUoKSwgc3RhdGUu dXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKCkpOwogCi0gICAgaWYgKHN0YXRlLnN0eWxlKCktPmhh c1ZpZXdwb3J0VW5pdHMoKSkKKyAgICBpZiAoc3RhdGUuc3R5bGUoKS0+dXNlc1ZpZXdwb3J0VW5p dHMoKSkKICAgICAgICAgZG9jdW1lbnQoKS5zZXRIYXNTdHlsZVdpdGhWaWV3cG9ydFVuaXRzKCk7 CiAKICAgICByZXR1cm4geyBzdGF0ZS50YWtlU3R5bGUoKSwgV1RGTW92ZShlbGVtZW50U3R5bGVS ZWxhdGlvbnMpIH07CkBAIC00NjUsNyArNDY1LDcgQEAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0 eWxlPiBSZXNvbHZlcjo6cHNldWRvU3R5bGVGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQmIGVsZW0K ICAgICBBZGp1c3RlciBhZGp1c3Rlcihkb2N1bWVudCgpLCAqc3RhdGUucGFyZW50U3R5bGUoKSwg Y29udGV4dC5wYXJlbnRCb3hTdHlsZSwgbnVsbHB0cik7CiAgICAgYWRqdXN0ZXIuYWRqdXN0KCpz dGF0ZS5zdHlsZSgpLCBzdGF0ZS51c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUoKSk7CiAKLSAgICBp ZiAoc3RhdGUuc3R5bGUoKS0+aGFzVmlld3BvcnRVbml0cygpKQorICAgIGlmIChzdGF0ZS5zdHls ZSgpLT51c2VzVmlld3BvcnRVbml0cygpKQogICAgICAgICBkb2N1bWVudCgpLnNldEhhc1N0eWxl V2l0aFZpZXdwb3J0VW5pdHMoKTsKIAogICAgIHJldHVybiBzdGF0ZS50YWtlU3R5bGUoKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1pbnZhbGlkYXRp b24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLXVuaXRzLWlu dmFsaWRhdGlvbi1leHBlY3RlZC50eHQKaW5kZXggMjg5Yjc0M2E0ZWM2Li4zOTJhYTIzZWMzNGQg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11bml0cy1pbnZhbGlk YXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRhaW5lci11 bml0cy1pbnZhbGlkYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDggKzEsOCBAQAogVGVzdAogCi1G QUlMIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5nZXMgdHlwZSAoaW5s aW5lLXNpemUgLT4gbm9uZSkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjUwcHgiIGJ1dCBnb3Qg IjMwcHgiCi1GQUlMIGNxYiByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5nZXMg dHlwZSAoc2l6ZSAtPiBub25lKSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiNjBweCIgYnV0IGdv dCAiNDBweCIKLUZBSUwgY3FiIHJlc3BvbmQgd2hlbiBpbnRlcm1lZGlhdGUgY29udGFpbmVyIGNo YW5nZXMgdHlwZSAoaW5saW5lLXNpemUgLT4gc2l6ZSkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQg IjIwcHgiIGJ1dCBnb3QgIjQwcHgiCi1GQUlMIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29u dGFpbmVyIGNoYW5nZXMgaW5saW5lLXNpemUgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIjVweCIg YnV0IGdvdCAiMzBweCIKLUZBSUwgY3FiIHJlc3BvbmQgd2hlbiBzZWxlY3RlZCBjb250YWluZXIg Y2hhbmdlcyBibG9jay1zaXplIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICI1cHgiIGJ1dCBnb3Qg IjQwcHgiCitQQVNTIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5nZXMg dHlwZSAoaW5saW5lLXNpemUgLT4gbm9uZSkKK1BBU1MgY3FiIHJlc3BvbmQgd2hlbiBzZWxlY3Rl ZCBjb250YWluZXIgY2hhbmdlcyB0eXBlIChzaXplIC0+IG5vbmUpCitQQVNTIGNxYiByZXNwb25k IHdoZW4gaW50ZXJtZWRpYXRlIGNvbnRhaW5lciBjaGFuZ2VzIHR5cGUgKGlubGluZS1zaXplIC0+ IHNpemUpCitQQVNTIGNxaSByZXNwb25kIHdoZW4gc2VsZWN0ZWQgY29udGFpbmVyIGNoYW5nZXMg aW5saW5lLXNpemUKK1BBU1MgY3FiIHJlc3BvbmQgd2hlbiBzZWxlY3RlZCBjb250YWluZXIgY2hh bmdlcyBibG9jay1zaXplCiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg==