231865 2021-10-16 11:21:34 -0700 Share stacking context code between RenderLayer & StyleAdjuster 2021-10-16 15:52:44 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 ntim ntim bfulgham changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1805283 0 ntim 2021-10-16 11:21:34 -0700 Situations where CSS should create stacking contexts are written in 3 different places: RenderLayer, StyleAdjuster, WillChangeData Let's introduce a single method in RenderStyle that RenderLayer & StyleAdjuster can both consult. 1805284 1 webkit-bug-importer 2021-10-16 11:21:44 -0700 <rdar://problem/84334466> 1805285 2 441497 ntim 2021-10-16 11:31:07 -0700 Created attachment 441497 Patch 1805286 3 441498 ntim 2021-10-16 11:42:06 -0700 Created attachment 441498 Patch 1805287 4 441498 simon.fraser 2021-10-16 11:46:34 -0700 Comment on attachment 441498 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441498&action=review > Source/WebCore/rendering/style/RenderStyle.cpp:2790 > + || hasTransformRelatedProperty() I think this is a behavior change because renderer.hasTransformRelatedProperty() is not always equivalent to style.hasTransformRelatedProperty() since transforms don't apply to non-atomic lines. 1805288 5 441499 ntim 2021-10-16 12:11:33 -0700 Created attachment 441499 Patch 1805317 6 441499 simon.fraser 2021-10-16 15:52:44 -0700 Comment on attachment 441499 Patch Test failures show this isn't right. 441497 2021-10-16 11:31:07 -0700 2021-10-16 11:50:29 -0700 Patch bug-231865-20211016203106.patch text/plain 10201 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NlMTNjNmFkOGMzZmMz MzVmNjYzOTljYTU3NmIwZmVjOTUzYTE4YS4uYzNkYmVmYWM2MTE5YjAyZDA3MTE4NzI0NjBkNGYy OTdkMDg5ODBlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEwLTE2ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hhcmUgc3RhY2tpbmcgY29udGV4 dCBjb2RlIGJldHdlZW4gUmVuZGVyTGF5ZXIgJiBTdHlsZUFkanVzdGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4NjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBtZXRob2QgaW4gUmVuZGVy U3R5bGUgdGhhdCBjYW4gYmUgdXNlZCBieSBib3RoIFJlbmRlckxheWVyICYgU3R5bGVBZGp1c3Rl ci4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6c2hvdWxkQmVOb3JtYWxGbG93T25seSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpjYW5DcmVhdGVTdGFja2luZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAq IHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6Y3JlYXRlc1N0YWNraW5nQ29udGV4dCBjb25zdCk6CisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1dpbGxD aGFuZ2VEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldpbGxDaGFuZ2VEYXRhOjpwcm9wZXJ0 eUNyZWF0ZXNTdGFja2luZ0NvbnRleHQpOgorICAgICAgICAqIHN0eWxlL1N0eWxlQWRqdXN0ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmNvbXB1dGVFZmZlY3RpdmVUb3VjaEFjdGlv bnMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3QgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmlzU2Nyb2xsYWJsZU92ZXJmbG93KTogRGVsZXRlZC4K KwogMjAyMS0xMC0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHN1cmUgY2hpbGQgbGF5ZXJzIG9mIHRvcCBsYXllciBlbGVtZW50cyBhcmUg cmVuZGVyZWQgYW5kIGNvcnJlY3RseSB6LW9yZGVyZWQgKHRvcC1sYXllci1zdGFja2luZy5odG1s IGZhaWxzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMDJj NWMxNWNmNjg3ODE5MGM1YTJlMjIyODIyOTNjNGZlY2Q4YTgwYy4uMjU2MjIzMjk0MjdlMDM2Mjg0 OGZjZTM1YTExMWQ1OTM5NmZiZTljYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCkBAIC01NDEsMjYgKzU0MSw2IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnJlbW92ZU9u bHlUaGlzTGF5ZXIoTGF5ZXJDaGFuZ2VUaW1pbmcgdGltaW5nKQogICAgIHJlbmRlcmVyKCkuZGVz dHJveUxheWVyKCk7CiB9CiAKLXN0YXRpYyBib29sIGNhbkNyZWF0ZVN0YWNraW5nQ29udGV4dChj b25zdCBSZW5kZXJMYXllciYgbGF5ZXIpCi17Ci0gICAgYXV0byYgcmVuZGVyZXIgPSBsYXllci5y ZW5kZXJlcigpOwotICAgIHJldHVybiByZW5kZXJlci5oYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVy dHkoKQotICAgICAgICB8fCByZW5kZXJlci5oYXNDbGlwUGF0aCgpCi0gICAgICAgIHx8IHJlbmRl cmVyLmhhc0ZpbHRlcigpCi0gICAgICAgIHx8IHJlbmRlcmVyLmhhc01hc2soKQotICAgICAgICB8 fCByZW5kZXJlci5oYXNCYWNrZHJvcEZpbHRlcigpCi0jaWYgRU5BQkxFKENTU19DT01QT1NJVElO RykKLSAgICAgICAgfHwgcmVuZGVyZXIuaGFzQmxlbmRNb2RlKCkKLSNlbmRpZgotICAgICAgICB8 fCByZW5kZXJlci5pc1RyYW5zcGFyZW50KCkKLSAgICAgICAgfHwgcmVuZGVyZXIuaXNQb3NpdGlv bmVkKCkgLy8gTm90ZSB0aGF0IHRoaXMgb25seSBjcmVhdGVzIHN0YWNraW5nIGNvbnRleHQgaW4g Y29uanVuY3Rpb24gd2l0aCBleHBsaWNpdCB6LWluZGV4LgotICAgICAgICB8fCByZW5kZXJlci5o YXNSZWZsZWN0aW9uKCkKLSAgICAgICAgfHwgcmVuZGVyZXIuc3R5bGUoKS5oYXNJc29sYXRpb24o KQotICAgICAgICB8fCAhcmVuZGVyZXIuc3R5bGUoKS5oYXNBdXRvVXNlZFpJbmRleCgpCi0gICAg ICAgIHx8IChyZW5kZXJlci5zdHlsZSgpLndpbGxDaGFuZ2UoKSAmJiByZW5kZXJlci5zdHlsZSgp LndpbGxDaGFuZ2UoKS0+Y2FuQ3JlYXRlU3RhY2tpbmdDb250ZXh0KCkpCi0gICAgICAgIHx8IGxh eWVyLmVzdGFibGlzaGVzVG9wTGF5ZXIoKTsKLX0KLQogc3RhdGljIHZvaWQgZXhwYW5kU2Nyb2xs UmVjdFRvVmlzaWJsZVRhcmdldFJlY3RUb0luY2x1ZGVTY3JvbGxQYWRkaW5nKFJlbmRlckJveCog cmVuZGVyQm94LCBjb25zdCBMYXlvdXRSZWN0JiB2aWV3UmVjdCwgTGF5b3V0UmVjdCYgdGFyZ2V0 UmVjdCkKIHsKICAgICBpZiAoIXJlbmRlckJveCkKQEAgLTU3Myw3ICs1NTMsOCBAQCBzdGF0aWMg dm9pZCBleHBhbmRTY3JvbGxSZWN0VG9WaXNpYmxlVGFyZ2V0UmVjdFRvSW5jbHVkZVNjcm9sbFBh ZGRpbmcoUmVuZGVyQm94KgogCiBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZU5vcm1hbEZsb3dP bmx5KCkgY29uc3QKIHsKLSAgICBpZiAoY2FuQ3JlYXRlU3RhY2tpbmdDb250ZXh0KCp0aGlzKSkK KyAgICBib29sIGNhbkNyZWF0ZVN0YWNraW5nQ29udGV4dCA9IHJlbmRlcmVyKCkuc3R5bGUoKS5j cmVhdGVzU3RhY2tpbmdDb250ZXh0KCkgfHwgZXN0YWJsaXNoZXNUb3BMYXllcigpOworICAgIGlm IChjYW5DcmVhdGVTdGFja2luZ0NvbnRleHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IHJldHVybiByZW5kZXJlcigpLmhhc05vblZpc2libGVPdmVyZmxvdygpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCA3NTQ2ZjVhZjY5Y2E3 NjU3N2U2M2U4YmMwMzk0NzdlYTAyMDhiZTlhLi5jNGZjOGFlNzBkOGQ5OTMyNWE1MDgyNjAxOWEw NzNmYjFmMzM2N2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5jcHAKQEAgLTI3NjIsNCArMjc2MiwzOCBAQCBVc2VkRmxvYXQgUmVuZGVyU3R5bGU6 OnVzZWRGbG9hdChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQogCiAgICAgUkVMRUFTRV9B U1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KKworYm9vbCBSZW5kZXJTdHlsZTo6Y3JlYXRlc1N0YWNr aW5nQ29udGV4dCgpIGNvbnN0Cit7CisjaWYgRU5BQkxFKE9WRVJGTE9XX1NDUk9MTElOR19UT1VD SCkKKyAgICBhdXRvIGlzU2Nyb2xsYWJsZU92ZXJmbG93ID0gW10gKE92ZXJmbG93IG92ZXJmbG93 KSAtPiBib29sIHsKKyAgICAgICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93OjpTY3JvbGwg fHwgb3ZlcmZsb3cgPT0gT3ZlcmZsb3c6OkF1dG87CisgICAgfTsKKyNlbmRpZgorCisgICAgLy8g VGhpcyBsaXN0IHNob3VsZCBiZSBpbiBzeW5jIHdpdGggV2lsbENoYW5nZURhdGE6OnByb3BlcnR5 Q3JlYXRlc1N0YWNraW5nQ29udGV4dCgpCisgICAgcmV0dXJuIGNsaXBQYXRoKCkKKyAgICAgICAg Ly8gRklYTUU6IGNvbnRhaW46IHBhaW50OyBzaG91bGQgYWxzbyBjcmVhdGUgYSBzdGFja2luZyBj b250ZXh0LgorICAgICAgICB8fCBjb250YWluc0xheW91dCgpCisgICAgICAgIHx8IGJveFJlZmxl Y3QoKQorICAgICAgICB8fCAhaGFzQXV0b1VzZWRaSW5kZXgoKQorI2lmIEVOQUJMRShGSUxURVJT X0xFVkVMXzIpCisgICAgICAgIHx8IGhhc0JhY2tkcm9wRmlsdGVyKCkKKyNlbmRpZgorI2lmIEVO QUJMRShDU1NfQ09NUE9TSVRJTkcpCisgICAgICAgIHx8IGhhc0JsZW5kTW9kZSgpCisjZW5kaWYK KyAgICAgICAgfHwgaGFzRmlsdGVyKCkKKyAgICAgICAgfHwgaGFzSXNvbGF0aW9uKCkKKyAgICAg ICAgfHwgaGFzTWFzaygpCisgICAgICAgIHx8IGhhc09wYWNpdHkoKQorICAgICAgICB8fCBoYXNU cmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoKQorICAgICAgICB8fCAoKHBvc2l0aW9uKCkgPT0gUG9z aXRpb25UeXBlOjpBYnNvbHV0ZSB8fCBwb3NpdGlvbigpID09IFBvc2l0aW9uVHlwZTo6UmVsYXRp dmUpICYmICFoYXNBdXRvVXNlZFpJbmRleCgpKQorICAgICAgICB8fCBwb3NpdGlvbigpID09IFBv c2l0aW9uVHlwZTo6U3RpY2t5IHx8IHBvc2l0aW9uKCkgPT0gUG9zaXRpb25UeXBlOjpGaXhlZAor I2lmIEVOQUJMRShPVkVSRkxPV19TQ1JPTExJTkdfVE9VQ0gpCisgICAgICAgIC8vIFRvdWNoIG92 ZXJmbG93IHNjcm9sbGluZyBjcmVhdGVzIGEgc3RhY2tpbmcgY29udGV4dC4KKyAgICAgICAgfHwg dXNlVG91Y2hPdmVyZmxvd1Njcm9sbGluZygpICYmIChpc1Njcm9sbGFibGVPdmVyZmxvdyhvdmVy Zmxvd1goKSkgfHwgaXNTY3JvbGxhYmxlT3ZlcmZsb3cob3ZlcmZsb3dZKCkpKQorI2VuZGlmCisg ICAgICAgIHx8IHdpbGxDaGFuZ2VDcmVhdGVzU3RhY2tpbmdDb250ZXh0KCk7Cit9CiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5oCmluZGV4IDI0Nzk3ZjUzYjE3YTU3NzNkMzExNzdlYWJmYThlYzE3N2QyODJlNGMuLjg3 NTgzZmI3NWJkZmIwZjI1ODU0MjY0OWQyNDU4OTM0Mzg0MzVkNmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC0yMzcsNiArMjM3LDggQEAgcHVi bGljOgogICAgIHZvaWQgc2V0SGFzUHNldWRvU3R5bGVzKFBzZXVkb0lkU2V0KTsKICAgICBib29s IGhhc1VuaXF1ZVBzZXVkb1N0eWxlKCkgY29uc3Q7CiAKKyAgICBib29sIGNyZWF0ZXNTdGFja2lu Z0NvbnRleHQoKSBjb25zdDsKKwogICAgIC8vIGF0dHJpYnV0ZSBnZXR0ZXIgbWV0aG9kcwogCiAg ICAgRGlzcGxheVR5cGUgZGlzcGxheSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PERpc3Bs YXlUeXBlPihtX25vbkluaGVyaXRlZEZsYWdzLmVmZmVjdGl2ZURpc3BsYXkpOyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvV2lsbENoYW5nZURhdGEuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1dpbGxDaGFuZ2VEYXRhLmNwcAppbmRleCBm YjQ2MTY2OTcyNDI4MjI0Nzk2YjFlMWEyMTcyZmQ1ODMwZmZkZmE4Li40ZDUxYWRlZTNkZmM3MDFi NTZlNGFiOWVhN2EzYWM4NzlmNTA3M2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvV2lsbENoYW5nZURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9XaWxsQ2hhbmdlRGF0YS5jcHAKQEAgLTg4LDYgKzg4LDcgQEAgYm9vbCBXaWxs Q2hhbmdlRGF0YTo6Y3JlYXRlc0NvbnRhaW5pbmdCbG9ja0Zvck91dE9mRmxvd1Bvc2l0aW9uZWQo KSBjb25zdAogLy8gc3BlY2lmeWluZyB0aGF0IHByb3BlcnR5IGluIHdpbGwtY2hhbmdlIG11c3Qg Y3JlYXRlIGEgc3RhY2tpbmcgY29udGV4dCBvbiB0aGUgZWxlbWVudC4iCiBib29sIFdpbGxDaGFu Z2VEYXRhOjpwcm9wZXJ0eUNyZWF0ZXNTdGFja2luZ0NvbnRleHQoQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0eSkKIHsKKyAgICAvLyBUaGlzIGxpc3Qgc2hvdWxkIGJlIGluIHN5bmMgd2l0aCBSZW5kZXJT dHlsZTo6Y3JlYXRlc0NTU1N0YWNraW5nQ29udGV4dCgpLgogICAgIHN3aXRjaCAocHJvcGVydHkp IHsKICAgICBjYXNlIENTU1Byb3BlcnR5UGVyc3BlY3RpdmU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVNjYWxlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVBZGp1c3Rlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcAppbmRleCBmNWQ0NzA3 MDI3NjcwM2RkODllN2I3NzJlMWZiNTAyY2RjN2Y3ODU1Li43NDNjYWM0NzUwZTI3NWY2MzhlNmRi MTRiMjg4NTEyZTlkNjk5ZTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls ZUFkanVzdGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNw cApAQCAtMTcyLDExICsxNzIsNiBAQCBzdGF0aWMgYm9vbCBzaG91bGRJbmhlcml0VGV4dERlY29y YXRpb25zSW5FZmZlY3QoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdAogICAgIHJldHVy biB0cnVlOwogfQogCi1zdGF0aWMgYm9vbCBpc1Njcm9sbGFibGVPdmVyZmxvdyhPdmVyZmxvdyBv dmVyZmxvdykKLXsKLSAgICByZXR1cm4gb3ZlcmZsb3cgPT0gT3ZlcmZsb3c6OlNjcm9sbCB8fCBv dmVyZmxvdyA9PSBPdmVyZmxvdzo6QXV0bzsKLX0KLQogc3RhdGljIE9wdGlvblNldDxUb3VjaEFj dGlvbj4gY29tcHV0ZUVmZmVjdGl2ZVRvdWNoQWN0aW9ucyhjb25zdCBSZW5kZXJTdHlsZSYgc3R5 bGUsIE9wdGlvblNldDxUb3VjaEFjdGlvbj4gZWZmZWN0aXZlVG91Y2hBY3Rpb25zKQogewogICAg IC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9wb2ludGVyZXZlbnRzLyNkZXRlcm1pbmluZy1zdXBw b3J0ZWQtdG91Y2gtYmVoYXZpb3IKQEAgLTE4NCw2ICsxNzksOSBAQCBzdGF0aWMgT3B0aW9uU2V0 PFRvdWNoQWN0aW9uPiBjb21wdXRlRWZmZWN0aXZlVG91Y2hBY3Rpb25zKGNvbnN0IFJlbmRlclN0 eWxlJiBzdAogICAgIC8vIHRoZSBoaXQgdGVzdGVkIGVsZW1lbnQgYW5kIGl0cyBuZWFyZXN0IGFu Y2VzdG9yIHdpdGggdGhlIGRlZmF1bHQgdG91Y2ggYmVoYXZpb3IgKGluY2x1ZGluZyBib3RoIHRo ZQogICAgIC8vIGhpdCB0ZXN0ZWQgZWxlbWVudCBhbmQgdGhlIGVsZW1lbnQgd2l0aCB0aGUgZGVm YXVsdCB0b3VjaCBiZWhhdmlvcikuIgogCisgICAgYXV0byBpc1Njcm9sbGFibGVPdmVyZmxvdyA9 IFtdIChPdmVyZmxvdyBvdmVyZmxvdykgLT4gYm9vbCB7CisgICAgICAgIHJldHVybiBvdmVyZmxv dyA9PSBPdmVyZmxvdzo6U2Nyb2xsIHx8IG92ZXJmbG93ID09IE92ZXJmbG93OjpBdXRvOworICAg IH07CiAgICAgYm9vbCBoYXNEZWZhdWx0VG91Y2hCZWhhdmlvciA9IGlzU2Nyb2xsYWJsZU92ZXJm bG93KHN0eWxlLm92ZXJmbG93WCgpKSB8fCBpc1Njcm9sbGFibGVPdmVyZmxvdyhzdHlsZS5vdmVy Zmxvd1koKSk7CiAgICAgaWYgKGhhc0RlZmF1bHRUb3VjaEJlaGF2aW9yKQogICAgICAgICBlZmZl Y3RpdmVUb3VjaEFjdGlvbnMgPSBSZW5kZXJTdHlsZTo6aW5pdGlhbFRvdWNoQWN0aW9ucygpOwpA QCAtMzYzLDI2ICszNjEsMTUgQEAgdm9pZCBBZGp1c3Rlcjo6YWRqdXN0KFJlbmRlclN0eWxlJiBz dHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHVzZXJBZ2VudEFwcGVhcmFuY2UKICAgICBlbHNlCiAg ICAgICAgIHN0eWxlLnNldFVzZWRaSW5kZXgoc3R5bGUuc3BlY2lmaWVkWkluZGV4KCkpOwogCi0g ICAgLy8gQXV0byB6LWluZGV4IGJlY29tZXMgMCBmb3IgdGhlIHJvb3QgZWxlbWVudCBhbmQgdHJh bnNwYXJlbnQgb2JqZWN0cy4gVGhpcyBwcmV2ZW50cwotICAgIC8vIGNhc2VzIHdoZXJlIG9iamVj dHMgdGhhdCBzaG91bGQgYmUgYmxlbmRlZCBhcyBhIHNpbmdsZSB1bml0IGVuZCB1cCB3aXRoIGEg bm9uLXRyYW5zcGFyZW50Ci0gICAgLy8gb2JqZWN0IHdlZGdlZCBpbiBiZXR3ZWVuIHRoZW0uIEF1 dG8gei1pbmRleCBhbHNvIGJlY29tZXMgMCBmb3Igb2JqZWN0cyB0aGF0IHNwZWNpZnkgdHJhbnNm b3Jtcy9tYXNrcy9yZWZsZWN0aW9ucy4KKyAgICAvLyBBdXRvIHotaW5kZXggYmVjb21lcyAwIGZv ciBhbGwgZWxlbWVudHMgY3JlYXRpbmcgYSBzdGFja2luZyBjb250ZXh0OgorICAgIC8vIC0gdGhl IHJvb3QgZWxlbWVudCAmIGVsZW1lbnRzIGluIHRoZSB0b3AgbGF5ZXIKKyAgICAvLyAtIGVsZW1l bnRzIHdpdGggQ1NTIHRoYXQgY2FuIGNyZWF0ZSBhIHN0YWNraW5nIGNvbnRleHQKKyAgICAvLyBU aGlzIHByZXZlbnRzIGNhc2VzIHdoZXJlIG9iamVjdHMgdGhhdCBzaG91bGQgYmUgYmxlbmRlZCBh cyBhIHNpbmdsZSB1bml0IGVuZCB1cCB3aXRoIGEgbm9uLXRyYW5zcGFyZW50CisgICAgLy8gb2Jq ZWN0IHdlZGdlZCBpbiBiZXR3ZWVuIHRoZW0uCiAgICAgaWYgKHN0eWxlLmhhc0F1dG9Vc2VkWklu ZGV4KCkpIHsKLSAgICAgICAgaWYgKChtX2VsZW1lbnQgJiYgbV9kb2N1bWVudC5kb2N1bWVudEVs ZW1lbnQoKSA9PSBtX2VsZW1lbnQpCi0gICAgICAgICAgICB8fCBzdHlsZS5oYXNPcGFjaXR5KCkK LSAgICAgICAgICAgIHx8IHN0eWxlLmhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0eSgpCi0gICAg ICAgICAgICB8fCBzdHlsZS5oYXNNYXNrKCkKLSAgICAgICAgICAgIHx8IHN0eWxlLmNsaXBQYXRo KCkKLSAgICAgICAgICAgIHx8IHN0eWxlLmJveFJlZmxlY3QoKQotICAgICAgICAgICAgfHwgc3R5 bGUuaGFzRmlsdGVyKCkKLSNpZiBFTkFCTEUoRklMVEVSU19MRVZFTF8yKQotICAgICAgICAgICAg fHwgc3R5bGUuaGFzQmFja2Ryb3BGaWx0ZXIoKQotI2VuZGlmCi0gICAgICAgICAgICB8fCBzdHls ZS5oYXNCbGVuZE1vZGUoKQotICAgICAgICAgICAgfHwgc3R5bGUuaGFzSXNvbGF0aW9uKCkKLSAg ICAgICAgICAgIHx8IHN0eWxlLnBvc2l0aW9uKCkgPT0gUG9zaXRpb25UeXBlOjpTdGlja3kKLSAg ICAgICAgICAgIHx8IHN0eWxlLnBvc2l0aW9uKCkgPT0gUG9zaXRpb25UeXBlOjpGaXhlZAotICAg ICAgICAgICAgfHwgc3R5bGUud2lsbENoYW5nZUNyZWF0ZXNTdGFja2luZ0NvbnRleHQoKQotICAg ICAgICAgICAgfHwgaXNJblRvcExheWVyT3JCYWNrZHJvcChzdHlsZSwgbV9lbGVtZW50KSkKKyAg ICAgICAgaWYgKG1fZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkgPT0gbV9lbGVtZW50CisgICAg ICAgICAgICB8fCBpc0luVG9wTGF5ZXJPckJhY2tkcm9wKHN0eWxlLCBtX2VsZW1lbnQpCisgICAg ICAgICAgICB8fCBzdHlsZS5jcmVhdGVzU3RhY2tpbmdDb250ZXh0KCkpCiAgICAgICAgICAgICBz dHlsZS5zZXRVc2VkWkluZGV4KDApOwogICAgIH0KIApAQCAtNDY0LDE2ICs0NTEsNiBAQCB2b2lk IEFkanVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSog dXNlckFnZW50QXBwZWFyYW5jZQogICAgICAgICBzdHlsZS5zZXRPdmVyZmxvd1koT3ZlcmZsb3c6 OlZpc2libGUpOwogICAgIH0KIAotI2lmIEVOQUJMRShPVkVSRkxPV19TQ1JPTExJTkdfVE9VQ0gp Ci0gICAgLy8gVG91Y2ggb3ZlcmZsb3cgc2Nyb2xsaW5nIGNyZWF0ZXMgYSBzdGFja2luZyBjb250 ZXh0LgotICAgIGlmIChzdHlsZS5oYXNBdXRvVXNlZFpJbmRleCgpICYmIHN0eWxlLnVzZVRvdWNo T3ZlcmZsb3dTY3JvbGxpbmcoKSAmJiAoaXNTY3JvbGxhYmxlT3ZlcmZsb3coc3R5bGUub3ZlcmZs b3dYKCkpIHx8IGlzU2Nyb2xsYWJsZU92ZXJmbG93KHN0eWxlLm92ZXJmbG93WSgpKSkpCi0gICAg ICAgIHN0eWxlLnNldFVzZWRaSW5kZXgoMCk7Ci0jZW5kaWYKLQotICAgIC8vIGNvbnRhaW46IGxh eW91dCBjcmVhdGVzIGEgc3RhY2tpbmcgY29udGV4dC4KLSAgICBpZiAoc3R5bGUuaGFzQXV0b1Vz ZWRaSW5kZXgoKSAmJiBzdHlsZS5jb250YWluc0xheW91dCgpKQotICAgICAgICBzdHlsZS5zZXRV c2VkWkluZGV4KDApOwotCiAgICAgLy8gQ3VsbCBvdXQgYW55IHVzZWxlc3MgbGF5ZXJzIGFuZCBh bHNvIHJlcGVhdCBwYXR0ZXJucyBpbnRvIGFkZGl0aW9uYWwgbGF5ZXJzLgogICAgIHN0eWxlLmFk anVzdEJhY2tncm91bmRMYXllcnMoKTsKICAgICBzdHlsZS5hZGp1c3RNYXNrTGF5ZXJzKCk7Cg== 441498 2021-10-16 11:42:06 -0700 2021-10-16 12:11:28 -0700 Patch bug-231865-20211016204205.patch text/plain 10203 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NlMTNjNmFkOGMzZmMz MzVmNjYzOTljYTU3NmIwZmVjOTUzYTE4YS4uYzNkYmVmYWM2MTE5YjAyZDA3MTE4NzI0NjBkNGYy OTdkMDg5ODBlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEwLTE2ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hhcmUgc3RhY2tpbmcgY29udGV4 dCBjb2RlIGJldHdlZW4gUmVuZGVyTGF5ZXIgJiBTdHlsZUFkanVzdGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4NjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBtZXRob2QgaW4gUmVuZGVy U3R5bGUgdGhhdCBjYW4gYmUgdXNlZCBieSBib3RoIFJlbmRlckxheWVyICYgU3R5bGVBZGp1c3Rl ci4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6c2hvdWxkQmVOb3JtYWxGbG93T25seSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpjYW5DcmVhdGVTdGFja2luZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAq IHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6Y3JlYXRlc1N0YWNraW5nQ29udGV4dCBjb25zdCk6CisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1dpbGxD aGFuZ2VEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldpbGxDaGFuZ2VEYXRhOjpwcm9wZXJ0 eUNyZWF0ZXNTdGFja2luZ0NvbnRleHQpOgorICAgICAgICAqIHN0eWxlL1N0eWxlQWRqdXN0ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmNvbXB1dGVFZmZlY3RpdmVUb3VjaEFjdGlv bnMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3QgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmlzU2Nyb2xsYWJsZU92ZXJmbG93KTogRGVsZXRlZC4K KwogMjAyMS0xMC0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHN1cmUgY2hpbGQgbGF5ZXJzIG9mIHRvcCBsYXllciBlbGVtZW50cyBhcmUg cmVuZGVyZWQgYW5kIGNvcnJlY3RseSB6LW9yZGVyZWQgKHRvcC1sYXllci1zdGFja2luZy5odG1s IGZhaWxzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMDJj NWMxNWNmNjg3ODE5MGM1YTJlMjIyODIyOTNjNGZlY2Q4YTgwYy4uMjU2MjIzMjk0MjdlMDM2Mjg0 OGZjZTM1YTExMWQ1OTM5NmZiZTljYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCkBAIC01NDEsMjYgKzU0MSw2IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnJlbW92ZU9u bHlUaGlzTGF5ZXIoTGF5ZXJDaGFuZ2VUaW1pbmcgdGltaW5nKQogICAgIHJlbmRlcmVyKCkuZGVz dHJveUxheWVyKCk7CiB9CiAKLXN0YXRpYyBib29sIGNhbkNyZWF0ZVN0YWNraW5nQ29udGV4dChj b25zdCBSZW5kZXJMYXllciYgbGF5ZXIpCi17Ci0gICAgYXV0byYgcmVuZGVyZXIgPSBsYXllci5y ZW5kZXJlcigpOwotICAgIHJldHVybiByZW5kZXJlci5oYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVy dHkoKQotICAgICAgICB8fCByZW5kZXJlci5oYXNDbGlwUGF0aCgpCi0gICAgICAgIHx8IHJlbmRl cmVyLmhhc0ZpbHRlcigpCi0gICAgICAgIHx8IHJlbmRlcmVyLmhhc01hc2soKQotICAgICAgICB8 fCByZW5kZXJlci5oYXNCYWNrZHJvcEZpbHRlcigpCi0jaWYgRU5BQkxFKENTU19DT01QT1NJVElO RykKLSAgICAgICAgfHwgcmVuZGVyZXIuaGFzQmxlbmRNb2RlKCkKLSNlbmRpZgotICAgICAgICB8 fCByZW5kZXJlci5pc1RyYW5zcGFyZW50KCkKLSAgICAgICAgfHwgcmVuZGVyZXIuaXNQb3NpdGlv bmVkKCkgLy8gTm90ZSB0aGF0IHRoaXMgb25seSBjcmVhdGVzIHN0YWNraW5nIGNvbnRleHQgaW4g Y29uanVuY3Rpb24gd2l0aCBleHBsaWNpdCB6LWluZGV4LgotICAgICAgICB8fCByZW5kZXJlci5o YXNSZWZsZWN0aW9uKCkKLSAgICAgICAgfHwgcmVuZGVyZXIuc3R5bGUoKS5oYXNJc29sYXRpb24o KQotICAgICAgICB8fCAhcmVuZGVyZXIuc3R5bGUoKS5oYXNBdXRvVXNlZFpJbmRleCgpCi0gICAg ICAgIHx8IChyZW5kZXJlci5zdHlsZSgpLndpbGxDaGFuZ2UoKSAmJiByZW5kZXJlci5zdHlsZSgp LndpbGxDaGFuZ2UoKS0+Y2FuQ3JlYXRlU3RhY2tpbmdDb250ZXh0KCkpCi0gICAgICAgIHx8IGxh eWVyLmVzdGFibGlzaGVzVG9wTGF5ZXIoKTsKLX0KLQogc3RhdGljIHZvaWQgZXhwYW5kU2Nyb2xs UmVjdFRvVmlzaWJsZVRhcmdldFJlY3RUb0luY2x1ZGVTY3JvbGxQYWRkaW5nKFJlbmRlckJveCog cmVuZGVyQm94LCBjb25zdCBMYXlvdXRSZWN0JiB2aWV3UmVjdCwgTGF5b3V0UmVjdCYgdGFyZ2V0 UmVjdCkKIHsKICAgICBpZiAoIXJlbmRlckJveCkKQEAgLTU3Myw3ICs1NTMsOCBAQCBzdGF0aWMg dm9pZCBleHBhbmRTY3JvbGxSZWN0VG9WaXNpYmxlVGFyZ2V0UmVjdFRvSW5jbHVkZVNjcm9sbFBh ZGRpbmcoUmVuZGVyQm94KgogCiBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZU5vcm1hbEZsb3dP bmx5KCkgY29uc3QKIHsKLSAgICBpZiAoY2FuQ3JlYXRlU3RhY2tpbmdDb250ZXh0KCp0aGlzKSkK KyAgICBib29sIGNhbkNyZWF0ZVN0YWNraW5nQ29udGV4dCA9IHJlbmRlcmVyKCkuc3R5bGUoKS5j cmVhdGVzU3RhY2tpbmdDb250ZXh0KCkgfHwgZXN0YWJsaXNoZXNUb3BMYXllcigpOworICAgIGlm IChjYW5DcmVhdGVTdGFja2luZ0NvbnRleHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IHJldHVybiByZW5kZXJlcigpLmhhc05vblZpc2libGVPdmVyZmxvdygpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCA3NTQ2ZjVhZjY5Y2E3 NjU3N2U2M2U4YmMwMzk0NzdlYTAyMDhiZTlhLi40ZDk4YzE0NTI3ZWY4Y2M2YTM4ZTU3MTk1ZGUw M2IzOWUzYWRhNGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5jcHAKQEAgLTI3NjIsNCArMjc2MiwzOCBAQCBVc2VkRmxvYXQgUmVuZGVyU3R5bGU6 OnVzZWRGbG9hdChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQogCiAgICAgUkVMRUFTRV9B U1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KKworYm9vbCBSZW5kZXJTdHlsZTo6Y3JlYXRlc1N0YWNr aW5nQ29udGV4dCgpIGNvbnN0Cit7CisjaWYgRU5BQkxFKE9WRVJGTE9XX1NDUk9MTElOR19UT1VD SCkKKyAgICBhdXRvIGlzU2Nyb2xsYWJsZU92ZXJmbG93ID0gW10gKE92ZXJmbG93IG92ZXJmbG93 KSAtPiBib29sIHsKKyAgICAgICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93OjpTY3JvbGwg fHwgb3ZlcmZsb3cgPT0gT3ZlcmZsb3c6OkF1dG87CisgICAgfTsKKyNlbmRpZgorCisgICAgLy8g VGhpcyBsaXN0IHNob3VsZCBiZSBpbiBzeW5jIHdpdGggV2lsbENoYW5nZURhdGE6OnByb3BlcnR5 Q3JlYXRlc1N0YWNraW5nQ29udGV4dCgpCisgICAgcmV0dXJuIGNsaXBQYXRoKCkKKyAgICAgICAg Ly8gRklYTUU6IGNvbnRhaW46IHBhaW50OyBzaG91bGQgYWxzbyBjcmVhdGUgYSBzdGFja2luZyBj b250ZXh0LgorICAgICAgICB8fCBjb250YWluc0xheW91dCgpCisgICAgICAgIHx8IGJveFJlZmxl Y3QoKQorICAgICAgICB8fCAhaGFzQXV0b1VzZWRaSW5kZXgoKQorI2lmIEVOQUJMRShGSUxURVJT X0xFVkVMXzIpCisgICAgICAgIHx8IGhhc0JhY2tkcm9wRmlsdGVyKCkKKyNlbmRpZgorI2lmIEVO QUJMRShDU1NfQ09NUE9TSVRJTkcpCisgICAgICAgIHx8IGhhc0JsZW5kTW9kZSgpCisjZW5kaWYK KyAgICAgICAgfHwgaGFzRmlsdGVyKCkKKyAgICAgICAgfHwgaGFzSXNvbGF0aW9uKCkKKyAgICAg ICAgfHwgaGFzTWFzaygpCisgICAgICAgIHx8IGhhc09wYWNpdHkoKQorICAgICAgICB8fCBoYXNU cmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoKQorICAgICAgICB8fCAoKHBvc2l0aW9uKCkgPT0gUG9z aXRpb25UeXBlOjpBYnNvbHV0ZSB8fCBwb3NpdGlvbigpID09IFBvc2l0aW9uVHlwZTo6UmVsYXRp dmUpICYmICFoYXNBdXRvVXNlZFpJbmRleCgpKQorICAgICAgICB8fCBwb3NpdGlvbigpID09IFBv c2l0aW9uVHlwZTo6U3RpY2t5IHx8IHBvc2l0aW9uKCkgPT0gUG9zaXRpb25UeXBlOjpGaXhlZAor I2lmIEVOQUJMRShPVkVSRkxPV19TQ1JPTExJTkdfVE9VQ0gpCisgICAgICAgIC8vIFRvdWNoIG92 ZXJmbG93IHNjcm9sbGluZyBjcmVhdGVzIGEgc3RhY2tpbmcgY29udGV4dC4KKyAgICAgICAgfHwg KHVzZVRvdWNoT3ZlcmZsb3dTY3JvbGxpbmcoKSAmJiAoaXNTY3JvbGxhYmxlT3ZlcmZsb3cob3Zl cmZsb3dYKCkpIHx8IGlzU2Nyb2xsYWJsZU92ZXJmbG93KG92ZXJmbG93WSgpKSkpCisjZW5kaWYK KyAgICAgICAgfHwgd2lsbENoYW5nZUNyZWF0ZXNTdGFja2luZ0NvbnRleHQoKTsKK30KIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmgKaW5kZXggMjQ3OTdmNTNiMTdhNTc3M2QzMTE3N2VhYmZhOGVjMTc3ZDI4MmU0Yy4u ODc1ODNmYjc1YmRmYjBmMjU4NTQyNjQ5ZDI0NTg5MzQzODQzNWQ2ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTIzNyw2ICsyMzcsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRIYXNQc2V1ZG9TdHlsZXMoUHNldWRvSWRTZXQpOwogICAgIGJv b2wgaGFzVW5pcXVlUHNldWRvU3R5bGUoKSBjb25zdDsKIAorICAgIGJvb2wgY3JlYXRlc1N0YWNr aW5nQ29udGV4dCgpIGNvbnN0OworCiAgICAgLy8gYXR0cmlidXRlIGdldHRlciBtZXRob2RzCiAK ICAgICBEaXNwbGF5VHlwZSBkaXNwbGF5KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RGlz cGxheVR5cGU+KG1fbm9uSW5oZXJpdGVkRmxhZ3MuZWZmZWN0aXZlRGlzcGxheSk7IH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9XaWxsQ2hhbmdlRGF0YS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvV2lsbENoYW5nZURhdGEuY3BwCmluZGV4 IGZiNDYxNjY5NzI0MjgyMjQ3OTZiMWUxYTIxNzJmZDU4MzBmZmRmYTguLjRkNTFhZGVlM2RmYzcw MWI1NmU0YWI5ZWE3YTNhYzg3OWY1MDczYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9XaWxsQ2hhbmdlRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1dpbGxDaGFuZ2VEYXRhLmNwcApAQCAtODgsNiArODgsNyBAQCBib29sIFdp bGxDaGFuZ2VEYXRhOjpjcmVhdGVzQ29udGFpbmluZ0Jsb2NrRm9yT3V0T2ZGbG93UG9zaXRpb25l ZCgpIGNvbnN0CiAvLyBzcGVjaWZ5aW5nIHRoYXQgcHJvcGVydHkgaW4gd2lsbC1jaGFuZ2UgbXVz dCBjcmVhdGUgYSBzdGFja2luZyBjb250ZXh0IG9uIHRoZSBlbGVtZW50LiIKIGJvb2wgV2lsbENo YW5nZURhdGE6OnByb3BlcnR5Q3JlYXRlc1N0YWNraW5nQ29udGV4dChDU1NQcm9wZXJ0eUlEIHBy b3BlcnR5KQogeworICAgIC8vIFRoaXMgbGlzdCBzaG91bGQgYmUgaW4gc3luYyB3aXRoIFJlbmRl clN0eWxlOjpjcmVhdGVzQ1NTU3RhY2tpbmdDb250ZXh0KCkuCiAgICAgc3dpdGNoIChwcm9wZXJ0 eSkgewogICAgIGNhc2UgQ1NTUHJvcGVydHlQZXJzcGVjdGl2ZToKICAgICBjYXNlIENTU1Byb3Bl cnR5U2NhbGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCmluZGV4IGY1ZDQ3 MDcwMjc2NzAzZGQ4OWU3Yjc3MmUxZmI1MDJjZGM3Zjc4NTUuLjc0M2NhYzQ3NTBlMjc1ZjYzOGU2 ZGIxNGIyODg1MTJlOWQ2OTllMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlQWRqdXN0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIu Y3BwCkBAIC0xNzIsMTEgKzE3Miw2IEBAIHN0YXRpYyBib29sIHNob3VsZEluaGVyaXRUZXh0RGVj b3JhdGlvbnNJbkVmZmVjdChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0CiAgICAgcmV0 dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBib29sIGlzU2Nyb2xsYWJsZU92ZXJmbG93KE92ZXJmbG93 IG92ZXJmbG93KQotewotICAgIHJldHVybiBvdmVyZmxvdyA9PSBPdmVyZmxvdzo6U2Nyb2xsIHx8 IG92ZXJmbG93ID09IE92ZXJmbG93OjpBdXRvOwotfQotCiBzdGF0aWMgT3B0aW9uU2V0PFRvdWNo QWN0aW9uPiBjb21wdXRlRWZmZWN0aXZlVG91Y2hBY3Rpb25zKGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSwgT3B0aW9uU2V0PFRvdWNoQWN0aW9uPiBlZmZlY3RpdmVUb3VjaEFjdGlvbnMpCiB7CiAg ICAgLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3BvaW50ZXJldmVudHMvI2RldGVybWluaW5nLXN1 cHBvcnRlZC10b3VjaC1iZWhhdmlvcgpAQCAtMTg0LDYgKzE3OSw5IEBAIHN0YXRpYyBPcHRpb25T ZXQ8VG91Y2hBY3Rpb24+IGNvbXB1dGVFZmZlY3RpdmVUb3VjaEFjdGlvbnMoY29uc3QgUmVuZGVy U3R5bGUmIHN0CiAgICAgLy8gdGhlIGhpdCB0ZXN0ZWQgZWxlbWVudCBhbmQgaXRzIG5lYXJlc3Qg YW5jZXN0b3Igd2l0aCB0aGUgZGVmYXVsdCB0b3VjaCBiZWhhdmlvciAoaW5jbHVkaW5nIGJvdGgg dGhlCiAgICAgLy8gaGl0IHRlc3RlZCBlbGVtZW50IGFuZCB0aGUgZWxlbWVudCB3aXRoIHRoZSBk ZWZhdWx0IHRvdWNoIGJlaGF2aW9yKS4iCiAKKyAgICBhdXRvIGlzU2Nyb2xsYWJsZU92ZXJmbG93 ID0gW10gKE92ZXJmbG93IG92ZXJmbG93KSAtPiBib29sIHsKKyAgICAgICAgcmV0dXJuIG92ZXJm bG93ID09IE92ZXJmbG93OjpTY3JvbGwgfHwgb3ZlcmZsb3cgPT0gT3ZlcmZsb3c6OkF1dG87Cisg ICAgfTsKICAgICBib29sIGhhc0RlZmF1bHRUb3VjaEJlaGF2aW9yID0gaXNTY3JvbGxhYmxlT3Zl cmZsb3coc3R5bGUub3ZlcmZsb3dYKCkpIHx8IGlzU2Nyb2xsYWJsZU92ZXJmbG93KHN0eWxlLm92 ZXJmbG93WSgpKTsKICAgICBpZiAoaGFzRGVmYXVsdFRvdWNoQmVoYXZpb3IpCiAgICAgICAgIGVm ZmVjdGl2ZVRvdWNoQWN0aW9ucyA9IFJlbmRlclN0eWxlOjppbml0aWFsVG91Y2hBY3Rpb25zKCk7 CkBAIC0zNjMsMjYgKzM2MSwxNSBAQCB2b2lkIEFkanVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUm IHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogdXNlckFnZW50QXBwZWFyYW5jZQogICAgIGVsc2UK ICAgICAgICAgc3R5bGUuc2V0VXNlZFpJbmRleChzdHlsZS5zcGVjaWZpZWRaSW5kZXgoKSk7CiAK LSAgICAvLyBBdXRvIHotaW5kZXggYmVjb21lcyAwIGZvciB0aGUgcm9vdCBlbGVtZW50IGFuZCB0 cmFuc3BhcmVudCBvYmplY3RzLiBUaGlzIHByZXZlbnRzCi0gICAgLy8gY2FzZXMgd2hlcmUgb2Jq ZWN0cyB0aGF0IHNob3VsZCBiZSBibGVuZGVkIGFzIGEgc2luZ2xlIHVuaXQgZW5kIHVwIHdpdGgg YSBub24tdHJhbnNwYXJlbnQKLSAgICAvLyBvYmplY3Qgd2VkZ2VkIGluIGJldHdlZW4gdGhlbS4g QXV0byB6LWluZGV4IGFsc28gYmVjb21lcyAwIGZvciBvYmplY3RzIHRoYXQgc3BlY2lmeSB0cmFu c2Zvcm1zL21hc2tzL3JlZmxlY3Rpb25zLgorICAgIC8vIEF1dG8gei1pbmRleCBiZWNvbWVzIDAg Zm9yIGFsbCBlbGVtZW50cyBjcmVhdGluZyBhIHN0YWNraW5nIGNvbnRleHQ6CisgICAgLy8gLSB0 aGUgcm9vdCBlbGVtZW50ICYgZWxlbWVudHMgaW4gdGhlIHRvcCBsYXllcgorICAgIC8vIC0gZWxl bWVudHMgd2l0aCBDU1MgdGhhdCBjYW4gY3JlYXRlIGEgc3RhY2tpbmcgY29udGV4dAorICAgIC8v IFRoaXMgcHJldmVudHMgY2FzZXMgd2hlcmUgb2JqZWN0cyB0aGF0IHNob3VsZCBiZSBibGVuZGVk IGFzIGEgc2luZ2xlIHVuaXQgZW5kIHVwIHdpdGggYSBub24tdHJhbnNwYXJlbnQKKyAgICAvLyBv YmplY3Qgd2VkZ2VkIGluIGJldHdlZW4gdGhlbS4KICAgICBpZiAoc3R5bGUuaGFzQXV0b1VzZWRa SW5kZXgoKSkgewotICAgICAgICBpZiAoKG1fZWxlbWVudCAmJiBtX2RvY3VtZW50LmRvY3VtZW50 RWxlbWVudCgpID09IG1fZWxlbWVudCkKLSAgICAgICAgICAgIHx8IHN0eWxlLmhhc09wYWNpdHko KQotICAgICAgICAgICAgfHwgc3R5bGUuaGFzVHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkKLSAg ICAgICAgICAgIHx8IHN0eWxlLmhhc01hc2soKQotICAgICAgICAgICAgfHwgc3R5bGUuY2xpcFBh dGgoKQotICAgICAgICAgICAgfHwgc3R5bGUuYm94UmVmbGVjdCgpCi0gICAgICAgICAgICB8fCBz dHlsZS5oYXNGaWx0ZXIoKQotI2lmIEVOQUJMRShGSUxURVJTX0xFVkVMXzIpCi0gICAgICAgICAg ICB8fCBzdHlsZS5oYXNCYWNrZHJvcEZpbHRlcigpCi0jZW5kaWYKLSAgICAgICAgICAgIHx8IHN0 eWxlLmhhc0JsZW5kTW9kZSgpCi0gICAgICAgICAgICB8fCBzdHlsZS5oYXNJc29sYXRpb24oKQot ICAgICAgICAgICAgfHwgc3R5bGUucG9zaXRpb24oKSA9PSBQb3NpdGlvblR5cGU6OlN0aWNreQot ICAgICAgICAgICAgfHwgc3R5bGUucG9zaXRpb24oKSA9PSBQb3NpdGlvblR5cGU6OkZpeGVkCi0g ICAgICAgICAgICB8fCBzdHlsZS53aWxsQ2hhbmdlQ3JlYXRlc1N0YWNraW5nQ29udGV4dCgpCi0g ICAgICAgICAgICB8fCBpc0luVG9wTGF5ZXJPckJhY2tkcm9wKHN0eWxlLCBtX2VsZW1lbnQpKQor ICAgICAgICBpZiAobV9kb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKSA9PSBtX2VsZW1lbnQKKyAg ICAgICAgICAgIHx8IGlzSW5Ub3BMYXllck9yQmFja2Ryb3Aoc3R5bGUsIG1fZWxlbWVudCkKKyAg ICAgICAgICAgIHx8IHN0eWxlLmNyZWF0ZXNTdGFja2luZ0NvbnRleHQoKSkKICAgICAgICAgICAg IHN0eWxlLnNldFVzZWRaSW5kZXgoMCk7CiAgICAgfQogCkBAIC00NjQsMTYgKzQ1MSw2IEBAIHZv aWQgQWRqdXN0ZXI6OmFkanVzdChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxl KiB1c2VyQWdlbnRBcHBlYXJhbmNlCiAgICAgICAgIHN0eWxlLnNldE92ZXJmbG93WShPdmVyZmxv dzo6VmlzaWJsZSk7CiAgICAgfQogCi0jaWYgRU5BQkxFKE9WRVJGTE9XX1NDUk9MTElOR19UT1VD SCkKLSAgICAvLyBUb3VjaCBvdmVyZmxvdyBzY3JvbGxpbmcgY3JlYXRlcyBhIHN0YWNraW5nIGNv bnRleHQuCi0gICAgaWYgKHN0eWxlLmhhc0F1dG9Vc2VkWkluZGV4KCkgJiYgc3R5bGUudXNlVG91 Y2hPdmVyZmxvd1Njcm9sbGluZygpICYmIChpc1Njcm9sbGFibGVPdmVyZmxvdyhzdHlsZS5vdmVy Zmxvd1goKSkgfHwgaXNTY3JvbGxhYmxlT3ZlcmZsb3coc3R5bGUub3ZlcmZsb3dZKCkpKSkKLSAg ICAgICAgc3R5bGUuc2V0VXNlZFpJbmRleCgwKTsKLSNlbmRpZgotCi0gICAgLy8gY29udGFpbjog bGF5b3V0IGNyZWF0ZXMgYSBzdGFja2luZyBjb250ZXh0LgotICAgIGlmIChzdHlsZS5oYXNBdXRv VXNlZFpJbmRleCgpICYmIHN0eWxlLmNvbnRhaW5zTGF5b3V0KCkpCi0gICAgICAgIHN0eWxlLnNl dFVzZWRaSW5kZXgoMCk7Ci0KICAgICAvLyBDdWxsIG91dCBhbnkgdXNlbGVzcyBsYXllcnMgYW5k IGFsc28gcmVwZWF0IHBhdHRlcm5zIGludG8gYWRkaXRpb25hbCBsYXllcnMuCiAgICAgc3R5bGUu YWRqdXN0QmFja2dyb3VuZExheWVycygpOwogICAgIHN0eWxlLmFkanVzdE1hc2tMYXllcnMoKTsK 441499 2021-10-16 12:11:33 -0700 2021-10-16 15:52:44 -0700 Patch bug-231865-20211016211132.patch text/plain 10385 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NlMTNjNmFkOGMzZmMz MzVmNjYzOTljYTU3NmIwZmVjOTUzYTE4YS4uZGQxZWE0NmYyYTU3YzczNDMwYWQzNDYxNDVlNjcx YTkzM2VmNDgzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTEwLTE2ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hhcmUgc3RhY2tpbmcgY29udGV4 dCBjb2RlIGJldHdlZW4gUmVuZGVyTGF5ZXIgJiBTdHlsZUFkanVzdGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE4NjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBtZXRob2QgaW4gUmVuZGVy U3R5bGUgdGhhdCBjYW4gYmUgdXNlZCBieSBib3RoIFJlbmRlckxheWVyICYgU3R5bGVBZGp1c3Rl ci4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6c2hvdWxkQmVOb3JtYWxGbG93T25seSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpjYW5DcmVhdGVTdGFja2luZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAq IHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6Y3JlYXRlc1N0YWNraW5nQ29udGV4dCBjb25zdCk6CisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 Y3JlYXRlc1N0YWNraW5nQ29udGV4dCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L1dpbGxDaGFuZ2VEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldpbGxDaGFuZ2VEYXRhOjpw cm9wZXJ0eUNyZWF0ZXNTdGFja2luZ0NvbnRleHQpOgorICAgICAgICAqIHN0eWxlL1N0eWxlQWRq dXN0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmNvbXB1dGVFZmZlY3RpdmVUb3Vj aEFjdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3QgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmlzU2Nyb2xsYWJsZU92ZXJmbG93KTogRGVs ZXRlZC4KKwogMjAyMS0xMC0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBNYWtlIHN1cmUgY2hpbGQgbGF5ZXJzIG9mIHRvcCBsYXllciBlbGVtZW50 cyBhcmUgcmVuZGVyZWQgYW5kIGNvcnJlY3RseSB6LW9yZGVyZWQgKHRvcC1sYXllci1zdGFja2lu Zy5odG1sIGZhaWxzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5k ZXggMDJjNWMxNWNmNjg3ODE5MGM1YTJlMjIyODIyOTNjNGZlY2Q4YTgwYy4uMTllNDAxZWEzOWM1 ZWE3ZjBlNzgwZjliZTE5ZDc2ODM5Y2ZkMjY0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCkBAIC01NDEsMjYgKzU0MSw2IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnJl bW92ZU9ubHlUaGlzTGF5ZXIoTGF5ZXJDaGFuZ2VUaW1pbmcgdGltaW5nKQogICAgIHJlbmRlcmVy KCkuZGVzdHJveUxheWVyKCk7CiB9CiAKLXN0YXRpYyBib29sIGNhbkNyZWF0ZVN0YWNraW5nQ29u dGV4dChjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpCi17Ci0gICAgYXV0byYgcmVuZGVyZXIgPSBs YXllci5yZW5kZXJlcigpOwotICAgIHJldHVybiByZW5kZXJlci5oYXNUcmFuc2Zvcm1SZWxhdGVk UHJvcGVydHkoKQotICAgICAgICB8fCByZW5kZXJlci5oYXNDbGlwUGF0aCgpCi0gICAgICAgIHx8 IHJlbmRlcmVyLmhhc0ZpbHRlcigpCi0gICAgICAgIHx8IHJlbmRlcmVyLmhhc01hc2soKQotICAg ICAgICB8fCByZW5kZXJlci5oYXNCYWNrZHJvcEZpbHRlcigpCi0jaWYgRU5BQkxFKENTU19DT01Q T1NJVElORykKLSAgICAgICAgfHwgcmVuZGVyZXIuaGFzQmxlbmRNb2RlKCkKLSNlbmRpZgotICAg ICAgICB8fCByZW5kZXJlci5pc1RyYW5zcGFyZW50KCkKLSAgICAgICAgfHwgcmVuZGVyZXIuaXNQ b3NpdGlvbmVkKCkgLy8gTm90ZSB0aGF0IHRoaXMgb25seSBjcmVhdGVzIHN0YWNraW5nIGNvbnRl eHQgaW4gY29uanVuY3Rpb24gd2l0aCBleHBsaWNpdCB6LWluZGV4LgotICAgICAgICB8fCByZW5k ZXJlci5oYXNSZWZsZWN0aW9uKCkKLSAgICAgICAgfHwgcmVuZGVyZXIuc3R5bGUoKS5oYXNJc29s YXRpb24oKQotICAgICAgICB8fCAhcmVuZGVyZXIuc3R5bGUoKS5oYXNBdXRvVXNlZFpJbmRleCgp Ci0gICAgICAgIHx8IChyZW5kZXJlci5zdHlsZSgpLndpbGxDaGFuZ2UoKSAmJiByZW5kZXJlci5z dHlsZSgpLndpbGxDaGFuZ2UoKS0+Y2FuQ3JlYXRlU3RhY2tpbmdDb250ZXh0KCkpCi0gICAgICAg IHx8IGxheWVyLmVzdGFibGlzaGVzVG9wTGF5ZXIoKTsKLX0KLQogc3RhdGljIHZvaWQgZXhwYW5k U2Nyb2xsUmVjdFRvVmlzaWJsZVRhcmdldFJlY3RUb0luY2x1ZGVTY3JvbGxQYWRkaW5nKFJlbmRl ckJveCogcmVuZGVyQm94LCBjb25zdCBMYXlvdXRSZWN0JiB2aWV3UmVjdCwgTGF5b3V0UmVjdCYg dGFyZ2V0UmVjdCkKIHsKICAgICBpZiAoIXJlbmRlckJveCkKQEAgLTU3Myw3ICs1NTMsOCBAQCBz dGF0aWMgdm9pZCBleHBhbmRTY3JvbGxSZWN0VG9WaXNpYmxlVGFyZ2V0UmVjdFRvSW5jbHVkZVNj cm9sbFBhZGRpbmcoUmVuZGVyQm94KgogCiBib29sIFJlbmRlckxheWVyOjpzaG91bGRCZU5vcm1h bEZsb3dPbmx5KCkgY29uc3QKIHsKLSAgICBpZiAoY2FuQ3JlYXRlU3RhY2tpbmdDb250ZXh0KCp0 aGlzKSkKKyAgICBib29sIGNhbkNyZWF0ZVN0YWNraW5nQ29udGV4dCA9IHJlbmRlcmVyKCkuc3R5 bGUoKS5jcmVhdGVzU3RhY2tpbmdDb250ZXh0KCZyZW5kZXJlcigpKSB8fCBlc3RhYmxpc2hlc1Rv cExheWVyKCk7CisgICAgaWYgKGNhbkNyZWF0ZVN0YWNraW5nQ29udGV4dCkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHJlbmRlcmVyKCkuaGFzTm9uVmlzaWJsZU92ZXJmbG93 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCmlu ZGV4IDc1NDZmNWFmNjljYTc2NTc3ZTYzZThiYzAzOTQ3N2VhMDIwOGJlOWEuLmNkZDk3YjljZmE5 ZTkwNjUyOTI0ZTgwOWQzYTZiYzA2NzFmOTI4M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMjc2Miw0ICsyNzYyLDM3IEBAIFVzZWRG bG9hdCBSZW5kZXJTdHlsZTo6dXNlZEZsb2F0KGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIp CiAKICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQorCitib29sIFJlbmRlclN0 eWxlOjpjcmVhdGVzU3RhY2tpbmdDb250ZXh0KFJlbmRlck9iamVjdCogcmVuZGVyZXIpIGNvbnN0 Cit7CisjaWYgRU5BQkxFKE9WRVJGTE9XX1NDUk9MTElOR19UT1VDSCkKKyAgICBhdXRvIGlzU2Ny b2xsYWJsZU92ZXJmbG93ID0gW10gKE92ZXJmbG93IG92ZXJmbG93KSAtPiBib29sIHsKKyAgICAg ICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93OjpTY3JvbGwgfHwgb3ZlcmZsb3cgPT0gT3Zl cmZsb3c6OkF1dG87CisgICAgfTsKKyNlbmRpZgorCisgICAgLy8gVGhpcyBsaXN0IHNob3VsZCBi ZSBpbiBzeW5jIHdpdGggV2lsbENoYW5nZURhdGE6OnByb3BlcnR5Q3JlYXRlc1N0YWNraW5nQ29u dGV4dCgpCisgICAgcmV0dXJuIGNsaXBQYXRoKCkKKyAgICAgICAgLy8gRklYTUU6IGNvbnRhaW46 IHBhaW50OyBzaG91bGQgYWxzbyBjcmVhdGUgYSBzdGFja2luZyBjb250ZXh0LgorICAgICAgICB8 fCBjb250YWluc0xheW91dCgpCisgICAgICAgIHx8IChyZW5kZXJlciA/IHJlbmRlcmVyLT5oYXNS ZWZsZWN0aW9uKCkgOiAhIWJveFJlZmxlY3QoKSkKKyAgICAgICAgfHwgIWhhc0F1dG9Vc2VkWklu ZGV4KCkKKyNpZiBFTkFCTEUoRklMVEVSU19MRVZFTF8yKQorICAgICAgICB8fCBoYXNCYWNrZHJv cEZpbHRlcigpCisjZW5kaWYKKyNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQorICAgICAgICB8 fCBoYXNCbGVuZE1vZGUoKQorI2VuZGlmCisgICAgICAgIHx8IGhhc0ZpbHRlcigpCisgICAgICAg IHx8IGhhc0lzb2xhdGlvbigpCisgICAgICAgIHx8IGhhc01hc2soKQorICAgICAgICB8fCBoYXNP cGFjaXR5KCkKKyAgICAgICAgfHwgKHJlbmRlcmVyID8gcmVuZGVyZXItPmhhc1RyYW5zZm9ybVJl bGF0ZWRQcm9wZXJ0eSgpIDogaGFzVHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkpCisgICAgICAg IHx8IHBvc2l0aW9uKCkgPT0gUG9zaXRpb25UeXBlOjpTdGlja3kgfHwgcG9zaXRpb24oKSA9PSBQ b3NpdGlvblR5cGU6OkZpeGVkCisjaWYgRU5BQkxFKE9WRVJGTE9XX1NDUk9MTElOR19UT1VDSCkK KyAgICAgICAgLy8gVG91Y2ggb3ZlcmZsb3cgc2Nyb2xsaW5nIGNyZWF0ZXMgYSBzdGFja2luZyBj b250ZXh0LgorICAgICAgICB8fCAodXNlVG91Y2hPdmVyZmxvd1Njcm9sbGluZygpICYmIChpc1Nj cm9sbGFibGVPdmVyZmxvdyhvdmVyZmxvd1goKSkgfHwgaXNTY3JvbGxhYmxlT3ZlcmZsb3cob3Zl cmZsb3dZKCkpKSkKKyNlbmRpZgorICAgICAgICB8fCB3aWxsQ2hhbmdlQ3JlYXRlc1N0YWNraW5n Q29udGV4dCgpOworfQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCAyNDc5N2Y1M2IxN2E1NzczZDMxMTc3 ZWFiZmE4ZWMxNzdkMjgyZTRjLi4wZGU1MjVmMGI2OTA3NzM2YjAzZDJkMjNiYmFhN2U4ZWIxMTFm MjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApA QCAtMjM3LDYgKzIzNyw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEhhc1BzZXVkb1N0eWxlcyhQ c2V1ZG9JZFNldCk7CiAgICAgYm9vbCBoYXNVbmlxdWVQc2V1ZG9TdHlsZSgpIGNvbnN0OwogCisg ICAgYm9vbCBjcmVhdGVzU3RhY2tpbmdDb250ZXh0KFJlbmRlck9iamVjdCogcmVuZGVyZXIpIGNv bnN0OworICAgIGJvb2wgY3JlYXRlc1N0YWNraW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGNy ZWF0ZXNTdGFja2luZ0NvbnRleHQobnVsbHB0cik7IH07CisKICAgICAvLyBhdHRyaWJ1dGUgZ2V0 dGVyIG1ldGhvZHMKIAogICAgIERpc3BsYXlUeXBlIGRpc3BsYXkoKSBjb25zdCB7IHJldHVybiBz dGF0aWNfY2FzdDxEaXNwbGF5VHlwZT4obV9ub25Jbmhlcml0ZWRGbGFncy5lZmZlY3RpdmVEaXNw bGF5KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1dpbGxD aGFuZ2VEYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9XaWxsQ2hhbmdl RGF0YS5jcHAKaW5kZXggZmI0NjE2Njk3MjQyODIyNDc5NmIxZTFhMjE3MmZkNTgzMGZmZGZhOC4u NWJkYzczMzlmMzFhYTZiNWVhNWZlYWM1MTJmYTU5YmY3NTcxZGI2MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1dpbGxDaGFuZ2VEYXRhLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvV2lsbENoYW5nZURhdGEuY3BwCkBAIC04OCw2ICs4 OCw3IEBAIGJvb2wgV2lsbENoYW5nZURhdGE6OmNyZWF0ZXNDb250YWluaW5nQmxvY2tGb3JPdXRP ZkZsb3dQb3NpdGlvbmVkKCkgY29uc3QKIC8vIHNwZWNpZnlpbmcgdGhhdCBwcm9wZXJ0eSBpbiB3 aWxsLWNoYW5nZSBtdXN0IGNyZWF0ZSBhIHN0YWNraW5nIGNvbnRleHQgb24gdGhlIGVsZW1lbnQu IgogYm9vbCBXaWxsQ2hhbmdlRGF0YTo6cHJvcGVydHlDcmVhdGVzU3RhY2tpbmdDb250ZXh0KENT U1Byb3BlcnR5SUQgcHJvcGVydHkpCiB7CisgICAgLy8gVGhpcyBsaXN0IHNob3VsZCBiZSBpbiBz eW5jIHdpdGggUmVuZGVyU3R5bGU6OmNyZWF0ZXNTdGFja2luZ0NvbnRleHQoKS4KICAgICBzd2l0 Y2ggKHByb3BlcnR5KSB7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVBlcnNwZWN0aXZlOgogICAgIGNh c2UgQ1NTUHJvcGVydHlTY2FsZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlQWRqdXN0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVBZGp1c3Rlci5jcHAK aW5kZXggZjVkNDcwNzAyNzY3MDNkZDg5ZTdiNzcyZTFmYjUwMmNkYzdmNzg1NS4uNzQzY2FjNDc1 MGUyNzVmNjM4ZTZkYjE0YjI4ODUxMmU5ZDY5OWUxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVBZGp1c3Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVBZGp1c3Rlci5jcHAKQEAgLTE3MiwxMSArMTcyLDYgQEAgc3RhdGljIGJvb2wgc2hvdWxkSW5o ZXJpdFRleHREZWNvcmF0aW9uc0luRWZmZWN0KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29u c3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgaXNTY3JvbGxhYmxlT3ZlcmZs b3coT3ZlcmZsb3cgb3ZlcmZsb3cpCi17Ci0gICAgcmV0dXJuIG92ZXJmbG93ID09IE92ZXJmbG93 OjpTY3JvbGwgfHwgb3ZlcmZsb3cgPT0gT3ZlcmZsb3c6OkF1dG87Ci19Ci0KIHN0YXRpYyBPcHRp b25TZXQ8VG91Y2hBY3Rpb24+IGNvbXB1dGVFZmZlY3RpdmVUb3VjaEFjdGlvbnMoY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlLCBPcHRpb25TZXQ8VG91Y2hBY3Rpb24+IGVmZmVjdGl2ZVRvdWNoQWN0 aW9ucykKIHsKICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vcG9pbnRlcmV2ZW50cy8jZGV0 ZXJtaW5pbmctc3VwcG9ydGVkLXRvdWNoLWJlaGF2aW9yCkBAIC0xODQsNiArMTc5LDkgQEAgc3Rh dGljIE9wdGlvblNldDxUb3VjaEFjdGlvbj4gY29tcHV0ZUVmZmVjdGl2ZVRvdWNoQWN0aW9ucyhj b25zdCBSZW5kZXJTdHlsZSYgc3QKICAgICAvLyB0aGUgaGl0IHRlc3RlZCBlbGVtZW50IGFuZCBp dHMgbmVhcmVzdCBhbmNlc3RvciB3aXRoIHRoZSBkZWZhdWx0IHRvdWNoIGJlaGF2aW9yIChpbmNs dWRpbmcgYm90aCB0aGUKICAgICAvLyBoaXQgdGVzdGVkIGVsZW1lbnQgYW5kIHRoZSBlbGVtZW50 IHdpdGggdGhlIGRlZmF1bHQgdG91Y2ggYmVoYXZpb3IpLiIKIAorICAgIGF1dG8gaXNTY3JvbGxh YmxlT3ZlcmZsb3cgPSBbXSAoT3ZlcmZsb3cgb3ZlcmZsb3cpIC0+IGJvb2wgeworICAgICAgICBy ZXR1cm4gb3ZlcmZsb3cgPT0gT3ZlcmZsb3c6OlNjcm9sbCB8fCBvdmVyZmxvdyA9PSBPdmVyZmxv dzo6QXV0bzsKKyAgICB9OwogICAgIGJvb2wgaGFzRGVmYXVsdFRvdWNoQmVoYXZpb3IgPSBpc1Nj cm9sbGFibGVPdmVyZmxvdyhzdHlsZS5vdmVyZmxvd1goKSkgfHwgaXNTY3JvbGxhYmxlT3ZlcmZs b3coc3R5bGUub3ZlcmZsb3dZKCkpOwogICAgIGlmIChoYXNEZWZhdWx0VG91Y2hCZWhhdmlvcikK ICAgICAgICAgZWZmZWN0aXZlVG91Y2hBY3Rpb25zID0gUmVuZGVyU3R5bGU6OmluaXRpYWxUb3Vj aEFjdGlvbnMoKTsKQEAgLTM2MywyNiArMzYxLDE1IEBAIHZvaWQgQWRqdXN0ZXI6OmFkanVzdChS ZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNl CiAgICAgZWxzZQogICAgICAgICBzdHlsZS5zZXRVc2VkWkluZGV4KHN0eWxlLnNwZWNpZmllZFpJ bmRleCgpKTsKIAotICAgIC8vIEF1dG8gei1pbmRleCBiZWNvbWVzIDAgZm9yIHRoZSByb290IGVs ZW1lbnQgYW5kIHRyYW5zcGFyZW50IG9iamVjdHMuIFRoaXMgcHJldmVudHMKLSAgICAvLyBjYXNl cyB3aGVyZSBvYmplY3RzIHRoYXQgc2hvdWxkIGJlIGJsZW5kZWQgYXMgYSBzaW5nbGUgdW5pdCBl bmQgdXAgd2l0aCBhIG5vbi10cmFuc3BhcmVudAotICAgIC8vIG9iamVjdCB3ZWRnZWQgaW4gYmV0 d2VlbiB0aGVtLiBBdXRvIHotaW5kZXggYWxzbyBiZWNvbWVzIDAgZm9yIG9iamVjdHMgdGhhdCBz cGVjaWZ5IHRyYW5zZm9ybXMvbWFza3MvcmVmbGVjdGlvbnMuCisgICAgLy8gQXV0byB6LWluZGV4 IGJlY29tZXMgMCBmb3IgYWxsIGVsZW1lbnRzIGNyZWF0aW5nIGEgc3RhY2tpbmcgY29udGV4dDoK KyAgICAvLyAtIHRoZSByb290IGVsZW1lbnQgJiBlbGVtZW50cyBpbiB0aGUgdG9wIGxheWVyCisg ICAgLy8gLSBlbGVtZW50cyB3aXRoIENTUyB0aGF0IGNhbiBjcmVhdGUgYSBzdGFja2luZyBjb250 ZXh0CisgICAgLy8gVGhpcyBwcmV2ZW50cyBjYXNlcyB3aGVyZSBvYmplY3RzIHRoYXQgc2hvdWxk IGJlIGJsZW5kZWQgYXMgYSBzaW5nbGUgdW5pdCBlbmQgdXAgd2l0aCBhIG5vbi10cmFuc3BhcmVu dAorICAgIC8vIG9iamVjdCB3ZWRnZWQgaW4gYmV0d2VlbiB0aGVtLgogICAgIGlmIChzdHlsZS5o YXNBdXRvVXNlZFpJbmRleCgpKSB7Ci0gICAgICAgIGlmICgobV9lbGVtZW50ICYmIG1fZG9jdW1l bnQuZG9jdW1lbnRFbGVtZW50KCkgPT0gbV9lbGVtZW50KQotICAgICAgICAgICAgfHwgc3R5bGUu aGFzT3BhY2l0eSgpCi0gICAgICAgICAgICB8fCBzdHlsZS5oYXNUcmFuc2Zvcm1SZWxhdGVkUHJv cGVydHkoKQotICAgICAgICAgICAgfHwgc3R5bGUuaGFzTWFzaygpCi0gICAgICAgICAgICB8fCBz dHlsZS5jbGlwUGF0aCgpCi0gICAgICAgICAgICB8fCBzdHlsZS5ib3hSZWZsZWN0KCkKLSAgICAg ICAgICAgIHx8IHN0eWxlLmhhc0ZpbHRlcigpCi0jaWYgRU5BQkxFKEZJTFRFUlNfTEVWRUxfMikK LSAgICAgICAgICAgIHx8IHN0eWxlLmhhc0JhY2tkcm9wRmlsdGVyKCkKLSNlbmRpZgotICAgICAg ICAgICAgfHwgc3R5bGUuaGFzQmxlbmRNb2RlKCkKLSAgICAgICAgICAgIHx8IHN0eWxlLmhhc0lz b2xhdGlvbigpCi0gICAgICAgICAgICB8fCBzdHlsZS5wb3NpdGlvbigpID09IFBvc2l0aW9uVHlw ZTo6U3RpY2t5Ci0gICAgICAgICAgICB8fCBzdHlsZS5wb3NpdGlvbigpID09IFBvc2l0aW9uVHlw ZTo6Rml4ZWQKLSAgICAgICAgICAgIHx8IHN0eWxlLndpbGxDaGFuZ2VDcmVhdGVzU3RhY2tpbmdD b250ZXh0KCkKLSAgICAgICAgICAgIHx8IGlzSW5Ub3BMYXllck9yQmFja2Ryb3Aoc3R5bGUsIG1f ZWxlbWVudCkpCisgICAgICAgIGlmIChtX2RvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpID09IG1f ZWxlbWVudAorICAgICAgICAgICAgfHwgaXNJblRvcExheWVyT3JCYWNrZHJvcChzdHlsZSwgbV9l bGVtZW50KQorICAgICAgICAgICAgfHwgc3R5bGUuY3JlYXRlc1N0YWNraW5nQ29udGV4dCgpKQog ICAgICAgICAgICAgc3R5bGUuc2V0VXNlZFpJbmRleCgwKTsKICAgICB9CiAKQEAgLTQ2NCwxNiAr NDUxLDYgQEAgdm9pZCBBZGp1c3Rlcjo6YWRqdXN0KFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3Qg UmVuZGVyU3R5bGUqIHVzZXJBZ2VudEFwcGVhcmFuY2UKICAgICAgICAgc3R5bGUuc2V0T3ZlcmZs b3dZKE92ZXJmbG93OjpWaXNpYmxlKTsKICAgICB9CiAKLSNpZiBFTkFCTEUoT1ZFUkZMT1dfU0NS T0xMSU5HX1RPVUNIKQotICAgIC8vIFRvdWNoIG92ZXJmbG93IHNjcm9sbGluZyBjcmVhdGVzIGEg c3RhY2tpbmcgY29udGV4dC4KLSAgICBpZiAoc3R5bGUuaGFzQXV0b1VzZWRaSW5kZXgoKSAmJiBz dHlsZS51c2VUb3VjaE92ZXJmbG93U2Nyb2xsaW5nKCkgJiYgKGlzU2Nyb2xsYWJsZU92ZXJmbG93 KHN0eWxlLm92ZXJmbG93WCgpKSB8fCBpc1Njcm9sbGFibGVPdmVyZmxvdyhzdHlsZS5vdmVyZmxv d1koKSkpKQotICAgICAgICBzdHlsZS5zZXRVc2VkWkluZGV4KDApOwotI2VuZGlmCi0KLSAgICAv LyBjb250YWluOiBsYXlvdXQgY3JlYXRlcyBhIHN0YWNraW5nIGNvbnRleHQuCi0gICAgaWYgKHN0 eWxlLmhhc0F1dG9Vc2VkWkluZGV4KCkgJiYgc3R5bGUuY29udGFpbnNMYXlvdXQoKSkKLSAgICAg ICAgc3R5bGUuc2V0VXNlZFpJbmRleCgwKTsKLQogICAgIC8vIEN1bGwgb3V0IGFueSB1c2VsZXNz IGxheWVycyBhbmQgYWxzbyByZXBlYXQgcGF0dGVybnMgaW50byBhZGRpdGlvbmFsIGxheWVycy4K ICAgICBzdHlsZS5hZGp1c3RCYWNrZ3JvdW5kTGF5ZXJzKCk7CiAgICAgc3R5bGUuYWRqdXN0TWFz a0xheWVycygpOwo=