242209 2022-06-30 14:50:43 -0700 Remove GraphicsLayer::supportsRoundedClip and RenderLayerBacking::m_childClippingMaskLayer 2022-07-19 20:39:06 -0700 1 1 1 Unclassified WebKit Compositing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=242832 InRadar P2 Normal --- 1 fujii fujii changseok darin esprehn+autocc ews-watchlist fred.wang glenn jenner kondapallykalyan pdr sergio simon.fraser webkit-bug-importer oldest_to_newest 1879532 0 fujii 2022-06-30 14:50:43 -0700 After 252014@main (bug#242097), GraphicsLayer::supportsRoundedClip returns true for all ports. We can remove it. 1879536 1 460589 fujii 2022-06-30 14:55:57 -0700 Created attachment 460589 Patch 1880138 2 ews-feeder 2022-07-01 14:06:19 -0700 Committed 252070@main (c1a2e7ae525f): <https://commits.webkit.org/252070@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460589. 1880139 3 webkit-bug-importer 2022-07-01 14:07:13 -0700 <rdar://problem/96313350> 1884535 4 jenner 2022-07-15 23:42:59 -0700 I am re-opening this bug because I had to do a partial revert of 25070@main. The changes committed to updateGeometry at that change caused testing on iOS 16 Debug beta to crash and never complete. I added the crashlog text to this bug: https://bugs.webkit.org/show_bug.cgi?id=242832 Additionally I added the revert needed to that bug, and it is currently going through testing. 1884544 5 fujii 2022-07-16 05:52:44 -0700 I can't believe. My change just removed unused code. I should have no effect. 1884581 6 darin 2022-07-16 14:27:10 -0700 I agree. This doesn’t make logical sense. 1885288 7 fujii 2022-07-19 20:39:06 -0700 bug#242832 was resolved. Closed this bug again. 460589 2022-06-30 14:55:57 -0700 2022-07-01 14:06:20 -0700 Patch bug-242209-20220701065556.patch text/plain 12441 fujii RnJvbSA3ODZhNDY0ZTMyZmU4YWI0YmI3YWQzNDcyNjQ3NGVjNjMyZTI5MWNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBIaXJvbm9yaSA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CkRhdGU6IEZyaSwgMSBKdWwgMjAyMiAwNjo1MzozOSArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IFJlbW92ZSBHcmFwaGljc0xheWVyOjpzdXBwb3J0c1JvdW5kZWRDbGlwIGFuZAogUmVuZGVyTGF5 ZXJCYWNraW5nOjptX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXIKIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDIyMDkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK QWZ0ZXIgMjUyMDE0QG1haW4gKGJ1ZyMyNDIwOTcpLCBHcmFwaGljc0xheWVyOjpzdXBwb3J0c1Jv dW5kZWRDbGlwCnJldHVybnMgdHJ1ZSBmb3IgYWxsIHBvcnRzLiBXZSBjYW4gcmVtb3ZlIGl0LiBB bmQsCm1fY2hpbGRDbGlwcGluZ01hc2tMYXllciB3YXMgY3JlYXRlZCBvbmx5IGlmIHN1cHBvcnRz Um91bmRlZENsaXAKcmV0dXJucyBmYWxzZS4gV2UgY2FuIHJlbW92ZSBpdCB0b2dldGhlci4KCiog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHA6CihXZWJD b3JlOjpHcmFwaGljc0xheWVyOjpzdXBwb3J0c1JvdW5kZWRDbGlwKTogRGVsZXRlZC4KKiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmg6CiogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXI6OnN1cHBvcnRzUm91bmRlZENsaXApOiBEZWxldGVkLgoqIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgooV2ViQ29yZTo6UmVuZGVy TGF5ZXJCYWNraW5nOjp+UmVuZGVyTGF5ZXJCYWNraW5nKToKKFdlYkNvcmU6OlJlbmRlckxheWVy QmFja2luZzo6ZGVzdHJveUdyYXBoaWNzTGF5ZXJzKToKKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbik6CihXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6 OnVwZGF0ZUdlb21ldHJ5KToKKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlUGFp bnRpbmdQaGFzZXMpOgooV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpzZXRDb250ZW50c05l ZWREaXNwbGF5KToKKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNOZWVk RGlzcGxheUluUmVjdCk6CihXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVu dHMpOgooV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpiYWNraW5nU3RvcmVNZW1vcnlFc3Rp bWF0ZSBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNoaWxkQ2xp cHBpbmdTdHJhdGVneSk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5oOgotLS0KIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy LmNwcCAgICAgICB8ICA1IC0tCiAuLi4vV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0xheWVyLmggfCAgMSAtCiAuLi4vcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNB LmNwcCAgfCAgNSAtLQogLi4uL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAgIHwgNTIgKy0tLS0tLS0tLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5oIHwgIDMgLS0KIDUgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRpb25z KCspLCA2NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDE4NjdiZGE4NTU0YS4uMTExMmZjNjM0YjI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xh eWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xh eWVyLmNwcApAQCAtODgsMTEgKzg4LDYgQEAgYm9vbCBHcmFwaGljc0xheWVyOjpzdXBwb3J0c0xh eWVyVHlwZShUeXBlIHR5cGUpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEdyYXBoaWNz TGF5ZXI6OnN1cHBvcnRzUm91bmRlZENsaXAoKQotewotICAgIHJldHVybiB0cnVlOwotfQotCiBi b29sIEdyYXBoaWNzTGF5ZXI6OnN1cHBvcnRzQmFja2dyb3VuZENvbG9yQ29udGVudCgpCiB7CiAj aWYgVVNFKFRFWFRVUkVfTUFQUEVSKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllci5oCmluZGV4IDM2ZGE1MDlkNzc5OC4uYzdiNDA1YTI3NjJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5o CkBAIC02MzAsNyArNjMwLDYgQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXRUcmFja2VkUmVwYWlu dHMoKTsKICAgICB2b2lkIGFkZFJlcGFpbnRSZWN0KGNvbnN0IEZsb2F0UmVjdCYpOwogCi0gICAg c3RhdGljIGJvb2wgc3VwcG9ydHNSb3VuZGVkQ2xpcCgpOwogICAgIHN0YXRpYyBib29sIHN1cHBv cnRzQmFja2dyb3VuZENvbG9yQ29udGVudCgpOwogICAgIHN0YXRpYyBib29sIHN1cHBvcnRzTGF5 ZXJUeXBlKFR5cGUpOwogICAgIHN0YXRpYyBib29sIHN1cHBvcnRzQ29udGVudHNUaWxpbmcoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNz TGF5ZXJDQS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGlj c0xheWVyQ0EuY3BwCmluZGV4IDhlODU0N2M1NzJiMC4uYWRhOTY1NGMyZGU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJD QS5jcHAKQEAgLTM0MSwxMSArMzQxLDYgQEAgYm9vbCBHcmFwaGljc0xheWVyOjpzdXBwb3J0c0Jh Y2tncm91bmRDb2xvckNvbnRlbnQoKQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEdyYXBo aWNzTGF5ZXI6OnN1cHBvcnRzUm91bmRlZENsaXAoKQotewotICAgIHJldHVybiB0cnVlOwotfQot CiBib29sIEdyYXBoaWNzTGF5ZXI6OnN1cHBvcnRzU3VicGl4ZWxBbnRpYWxpYXNlZExheWVyVGV4 dCgpCiB7CiAjaWYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCA1OTYzNmY0YzI2MzYuLjdmMTI5YTdjYWQzZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAK QEAgLTI1NCw3ICsyNTQsNiBAQCBSZW5kZXJMYXllckJhY2tpbmc6On5SZW5kZXJMYXllckJhY2tp bmcoKQogI2VuZGlmCiAgICAgLy8gTm90ZSB0aGF0IG1fb3duaW5nTGF5ZXItPmJhY2tpbmcoKSBp cyBudWxsIGhlcmUuCiAgICAgdXBkYXRlQW5jZXN0b3JDbGlwcGluZyhmYWxzZSwgbnVsbHB0cik7 Ci0gICAgdXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0ZWd5KGZhbHNlKTsKICAgICB1cGRhdGVEZXNj ZW5kYW50Q2xpcHBpbmdMYXllcihmYWxzZSk7CiAgICAgdXBkYXRlT3ZlcmZsb3dDb250cm9sc0xh eWVycyhmYWxzZSwgZmFsc2UsIGZhbHNlKTsKICAgICB1cGRhdGVGb3JlZ3JvdW5kTGF5ZXIoZmFs c2UpOwpAQCAtNjAyLDcgKzYwMSw2IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpkZXN0cm95 R3JhcGhpY3NMYXllcnMoKQogICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9m b3JlZ3JvdW5kTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9i YWNrZ3JvdW5kTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9j aGlsZENvbnRhaW5tZW50TGF5ZXIpOwotICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xl YXIobV9jaGlsZENsaXBwaW5nTWFza0xheWVyKTsKICAgICBHcmFwaGljc0xheWVyOjp1bnBhcmVu dEFuZENsZWFyKG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXI6OnVu cGFyZW50QW5kQ2xlYXIobV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5 ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9ncmFwaGljc0xheWVyKTsKQEAgLTEwNTIsOCArMTA1MCw2 IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVDb25maWd1cmF0aW9uKGNvbnN0IFJl bmRlckxheWVyKiBjb21wb3NpdGluZ0FuY2VzCiAgICAgaWYgKHVwZGF0ZU1hc2tpbmdMYXllcihy ZW5kZXJlcigpLmhhc01hc2soKSwgcmVuZGVyZXIoKS5oYXNDbGlwUGF0aCgpKSkKICAgICAgICAg bGF5ZXJDb25maWdDaGFuZ2VkID0gdHJ1ZTsKIAotICAgIHVwZGF0ZUNoaWxkQ2xpcHBpbmdTdHJh dGVneShuZWVkc0Rlc2NlbmRhbnRzQ2xpcHBpbmdMYXllcik7Ci0KICAgICBpZiAobV9vd25pbmdM YXllci5oYXNSZWZsZWN0aW9uKCkpIHsKICAgICAgICAgaWYgKG1fb3duaW5nTGF5ZXIucmVmbGVj dGlvbkxheWVyKCktPmJhY2tpbmcoKSkgewogICAgICAgICAgICAgYXV0byogcmVmbGVjdGlvbkxh eWVyID0gbV9vd25pbmdMYXllci5yZWZsZWN0aW9uTGF5ZXIoKS0+YmFja2luZygpLT5ncmFwaGlj c0xheWVyKCk7CkBAIC0xMzkxLDcgKzEzODcsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlR2VvbWV0cnkoY29uc3QgUmVuZGVyTGF5ZXIqIGNvbXBvc2l0ZWRBbmNlc3RvcikKICAg ICAgICAgY2xpcExheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIodG9MYXlvdXRTaXplKGNsaXBw aW5nQm94LmxvY2F0aW9uKCkgLSBzbmFwcGVkQ2xpcHBpbmdHcmFwaGljc0xheWVyLm1fc25hcERl bHRhKSk7CiAKICAgICAgICAgYXV0byBjb21wdXRlTWFza3NUb0JvdW5kc1JlY3QgPSBbJl0gewot ICAgICAgICAgICAgaWYgKChyZW5kZXJlcigpLnN0eWxlKCkuY2xpcFBhdGgoKSB8fCByZW5kZXJl cigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpICYmICFtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5 ZXIpIHsKKyAgICAgICAgICAgIGlmICgocmVuZGVyZXIoKS5zdHlsZSgpLmNsaXBQYXRoKCkgfHwg cmVuZGVyZXIoKS5zdHlsZSgpLmhhc0JvcmRlclJhZGl1cygpKSkgewogICAgICAgICAgICAgICAg IGF1dG8gY29udGVudHNDbGlwcGluZ1JlY3QgPSBGbG9hdFJvdW5kZWRSZWN0KHJlbmRlcmVyKCku c3R5bGUoKS5nZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IobV9vd25pbmdMYXllci5yZW5kZXJlckJv cmRlckJveFJlY3QoKSkpOwogICAgICAgICAgICAgICAgIGNvbnRlbnRzQ2xpcHBpbmdSZWN0Lm1v dmUoTGF5b3V0U2l6ZSgtY2xpcExheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKSkpOwogICAgICAg ICAgICAgICAgIHJldHVybiBjb250ZW50c0NsaXBwaW5nUmVjdDsKQEAgLTE0MDEsMTIgKzEzOTcs NiBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkoY29uc3QgUmVuZGVy TGF5ZXIqIGNvbXBvc2l0ZWRBbmNlc3RvcikKICAgICAgICAgfTsKIAogICAgICAgICBjbGlwTGF5 ZXItPnNldENvbnRlbnRzQ2xpcHBpbmdSZWN0KGNvbXB1dGVNYXNrc1RvQm91bmRzUmVjdCgpKTsK LQotICAgICAgICBpZiAobV9jaGlsZENsaXBwaW5nTWFza0xheWVyICYmICFtX3Njcm9sbENvbnRh aW5lckxheWVyKSB7Ci0gICAgICAgICAgICBtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXItPnNldFNp emUoY2xpcExheWVyLT5zaXplKCkpOwotICAgICAgICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xh eWVyLT5zZXRQb3NpdGlvbih7IH0pOwotICAgICAgICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xh eWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIoY2xpcExheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIo KSk7Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV9tYXNrTGF5ZXIpCkBAIC0xNDQzLDEy ICsxNDMzLDYgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdlb21ldHJ5KGNvbnN0 IFJlbmRlckxheWVyKiBjb21wb3NpdGVkQW5jZXN0b3IpCiAgICAgICAgIEZsb2F0U2l6ZSBvbGRT Y3JvbGxpbmdMYXllck9mZnNldCA9IG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXItPm9mZnNldEZyb21S ZW5kZXJlcigpOwogICAgICAgICBtX3Njcm9sbENvbnRhaW5lckxheWVyLT5zZXRPZmZzZXRGcm9t UmVuZGVyZXIodG9GbG9hdFNpemUoc2Nyb2xsQ29udGFpbmVyQm94LmxvY2F0aW9uKCkpKTsKIAot ICAgICAgICBpZiAobV9jaGlsZENsaXBwaW5nTWFza0xheWVyKSB7Ci0gICAgICAgICAgICBtX2No aWxkQ2xpcHBpbmdNYXNrTGF5ZXItPnNldFBvc2l0aW9uKG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIt PnBvc2l0aW9uKCkpOwotICAgICAgICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xheWVyLT5zZXRT aXplKG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXItPnNpemUoKSk7Ci0gICAgICAgICAgICBtX2NoaWxk Q2xpcHBpbmdNYXNrTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b0Zsb2F0U2l6ZShzY3Jv bGxDb250YWluZXJCb3gubG9jYXRpb24oKSkpOwotICAgICAgICB9Ci0KICAgICAgICAgYm9vbCBw YWRkaW5nQm94T2Zmc2V0Q2hhbmdlZCA9IG9sZFNjcm9sbGluZ0xheWVyT2Zmc2V0ICE9IG1fc2Ny b2xsQ29udGFpbmVyTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpOwogCiAgICAgICAgIEludFNp emUgc2Nyb2xsU2l6ZTsKQEAgLTIzMjEsMjYgKzIzMDUsNiBAQCBib29sIFJlbmRlckxheWVyQmFj a2luZzo6dXBkYXRlTWFza2luZ0xheWVyKGJvb2wgaGFzTWFzaywgYm9vbCBoYXNDbGlwUGF0aCkK ICAgICByZXR1cm4gbGF5ZXJDaGFuZ2VkOwogfQogCi12b2lkIFJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0ZWd5KGJvb2wgbmVlZHNEZXNjZW5kYW50c0NsaXBwaW5n TGF5ZXIpCi17Ci0gICAgYXV0byBuZWVkc0NsaXBNYXNrTGF5ZXIgPSBbJl0gewotICAgICAgICBy ZXR1cm4gbmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIgJiYgIUdyYXBoaWNzTGF5ZXI6OnN1 cHBvcnRzUm91bmRlZENsaXAoKSAmJiBpczxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpICYmIChyZW5k ZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkgfHwgcmVuZGVyZXIoKS5zdHlsZSgpLmNs aXBQYXRoKCkpOwotICAgIH07Ci0KLSAgICBhdXRvKiBjbGlwcGluZ0xheWVyID0gdGhpcy0+Y2xp cHBpbmdMYXllcigpOwotICAgIGlmIChuZWVkc0NsaXBNYXNrTGF5ZXIoKSkgewotICAgICAgICBt X2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXIgPSBjcmVhdGVHcmFwaGljc0xheWVyKCJjaGlsZCBjbGlw cGluZyBtYXNrIl9zKTsKLSAgICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xheWVyLT5zZXREcmF3 c0NvbnRlbnQodHJ1ZSk7Ci0gICAgICAgIG1fY2hpbGRDbGlwcGluZ01hc2tMYXllci0+c2V0UGFp bnRpbmdQaGFzZSh7IEdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlOjpDaGlsZENsaXBwaW5nTWFz ayB9KTsKLSAgICAgICAgaWYgKGNsaXBwaW5nTGF5ZXIpCi0gICAgICAgICAgICBjbGlwcGluZ0xh eWVyLT5zZXRNYXNrTGF5ZXIobV9jaGlsZENsaXBwaW5nTWFza0xheWVyLmNvcHlSZWYoKSk7Ci0g ICAgfSBlbHNlIGlmIChtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXIpIHsKLSAgICAgICAgaWYgKGNs aXBwaW5nTGF5ZXIpCi0gICAgICAgICAgICBjbGlwcGluZ0xheWVyLT5zZXRNYXNrTGF5ZXIobnVs bHB0cik7Ci0gICAgICAgIEdyYXBoaWNzTGF5ZXI6OmNsZWFyKG1fY2hpbGRDbGlwcGluZ01hc2tM YXllcik7Ci0gICAgfQotfQotCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlU2Nyb2xs aW5nTGF5ZXJzKGJvb2wgbmVlZHNTY3JvbGxpbmdMYXllcnMpCiB7CiAgICAgaWYgKG5lZWRzU2Ny b2xsaW5nTGF5ZXJzID09ICEhbV9zY3JvbGxDb250YWluZXJMYXllcikKQEAgLTI2NDcsNyArMjYx MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVSb290TGF5ZXJDb25maWd1cmF0 aW9uKCkKIAogdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZVBhaW50aW5nUGhhc2VzKCkK IHsKLSAgICAvLyBQaGFzZXMgZm9yIG1fY2hpbGRDbGlwcGluZ01hc2tMYXllciBhbmQgbV9tYXNr TGF5ZXIgYXJlIHNldCBlbHNld2hlcmUuCisgICAgLy8gUGhhc2VzIGZvciBtX21hc2tMYXllciBh cmUgc2V0IGVsc2V3aGVyZS4KICAgICBPcHRpb25TZXQ8R3JhcGhpY3NMYXllclBhaW50aW5nUGhh c2U+IHByaW1hcnlMYXllclBoYXNlcyA9IHsgR3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2U6OkJh Y2tncm91bmQsIEdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlOjpGb3JlZ3JvdW5kIH07CiAgICAg CiAgICAgaWYgKG1fZm9yZWdyb3VuZExheWVyKSB7CkBAIC0zMTkxLDkgKzMxNTUsNiBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheShHcmFwaGljc0xheWVy OjpTaG91bGRDbGlwVG9MYXllcgogICAgIGlmIChtX21hc2tMYXllciAmJiBtX21hc2tMYXllci0+ ZHJhd3NDb250ZW50KCkpCiAgICAgICAgIG1fbWFza0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsK IAotICAgIGlmIChtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXIgJiYgbV9jaGlsZENsaXBwaW5nTWFz a0xheWVyLT5kcmF3c0NvbnRlbnQoKSkKLSAgICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xheWVy LT5zZXROZWVkc0Rpc3BsYXkoKTsKLQogICAgIGlmIChtX3Njcm9sbGVkQ29udGVudHNMYXllciAm JiBtX3Njcm9sbGVkQ29udGVudHNMYXllci0+ZHJhd3NDb250ZW50KCkpCiAgICAgICAgIG1fc2Ny b2xsZWRDb250ZW50c0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKIH0KQEAgLTMyMzksMTIgKzMy MDAsNiBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheUlu UmVjdChjb25zdCBMYXlvdXRSZWN0JiByLCBHcmFwaAogICAgICAgICBtX21hc2tMYXllci0+c2V0 TmVlZHNEaXNwbGF5SW5SZWN0KGxheWVyRGlydHlSZWN0LCBzaG91bGRDbGlwKTsKICAgICB9CiAK LSAgICBpZiAobV9jaGlsZENsaXBwaW5nTWFza0xheWVyICYmIG1fY2hpbGRDbGlwcGluZ01hc2tM YXllci0+ZHJhd3NDb250ZW50KCkpIHsKLSAgICAgICAgRmxvYXRSZWN0IGxheWVyRGlydHlSZWN0 ID0gcjsKLSAgICAgICAgbGF5ZXJEaXJ0eVJlY3QubW92ZSgtbV9jaGlsZENsaXBwaW5nTWFza0xh eWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKSk7Ci0gICAgICAgIG1fY2hpbGRDbGlwcGluZ01hc2tM YXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KGxheWVyRGlydHlSZWN0KTsKLSAgICB9Ci0KICAg ICBpZiAobV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIgJiYgbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIt PmRyYXdzQ29udGVudCgpKSB7CiAgICAgICAgIEZsb2F0UmVjdCBsYXllckRpcnR5UmVjdCA9IHBp eGVsU25hcHBlZFJlY3RGb3JQYWludGluZzsKICAgICAgICAgU2Nyb2xsT2Zmc2V0IHNjcm9sbE9m ZnNldDsKQEAgLTM1NzYsNyArMzUzMSw2IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWlu dENvbnRlbnRzKGNvbnN0IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIsIEdyYXBoCiAgICAg ICAgIHx8IGdyYXBoaWNzTGF5ZXIgPT0gbV9mb3JlZ3JvdW5kTGF5ZXIuZ2V0KCkKICAgICAgICAg fHwgZ3JhcGhpY3NMYXllciA9PSBtX2JhY2tncm91bmRMYXllci5nZXQoKQogICAgICAgICB8fCBn cmFwaGljc0xheWVyID09IG1fbWFza0xheWVyLmdldCgpCi0gICAgICAgIHx8IGdyYXBoaWNzTGF5 ZXIgPT0gbV9jaGlsZENsaXBwaW5nTWFza0xheWVyLmdldCgpCiAgICAgICAgIHx8IGdyYXBoaWNz TGF5ZXIgPT0gbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIuZ2V0KCkpIHsKIAogICAgICAgICBpZiAo IWdyYXBoaWNzTGF5ZXItPnBhaW50aW5nUGhhc2UoKS5jb250YWlucyhHcmFwaGljc0xheWVyUGFp bnRpbmdQaGFzZTo6T3ZlcmZsb3dDb250ZW50cykpCkBAIC0zOTk2LDggKzM5NTAsNiBAQCBkb3Vi bGUgUmVuZGVyTGF5ZXJCYWNraW5nOjpiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpIGNvbnN0 CiAgICAgICAgIGJhY2tpbmdNZW1vcnkgKz0gbV9iYWNrZ3JvdW5kTGF5ZXItPmJhY2tpbmdTdG9y ZU1lbW9yeUVzdGltYXRlKCk7CiAgICAgaWYgKG1fbWFza0xheWVyKQogICAgICAgICBiYWNraW5n TWVtb3J5ICs9IG1fbWFza0xheWVyLT5iYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpOwotICAg IGlmIChtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXIpCi0gICAgICAgIGJhY2tpbmdNZW1vcnkgKz0g bV9jaGlsZENsaXBwaW5nTWFza0xheWVyLT5iYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpOwog CiAgICAgaWYgKG1fc2Nyb2xsZWRDb250ZW50c0xheWVyKQogICAgICAgICBiYWNraW5nTWVtb3J5 ICs9IG1fc2Nyb2xsZWRDb250ZW50c0xheWVyLT5iYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4 IGRjNGQzZmMyNzVmMC4uZWE0NDBmOTNkNjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5oCkBAIC0xNTgsNyArMTU4LDYgQEAgcHVibGljOgogICAg IFNjcm9sbGluZ05vZGVJRCBzY3JvbGxpbmdOb2RlSURGb3JDaGlsZHJlbigpIGNvbnN0OwogCiAg ICAgYm9vbCBoYXNNYXNrTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX21hc2tMYXllcjsgfQotICAg IGJvb2wgaGFzQ2hpbGRDbGlwcGluZ01hc2tMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fY2hpbGRD bGlwcGluZ01hc2tMYXllciAhPSBudWxscHRyOyB9CiAKICAgICBHcmFwaGljc0xheWVyKiBwYXJl bnRGb3JTdWJsYXllcnMoKSBjb25zdDsKICAgICBHcmFwaGljc0xheWVyKiBjaGlsZEZvclN1cGVy bGF5ZXJzKCkgY29uc3Q7CkBAIC0zMjMsNyArMzIyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHVw ZGF0ZVNjcm9sbE9mZnNldChTY3JvbGxPZmZzZXQpOwogICAgIHZvaWQgc2V0TG9jYXRpb25PZlNj cm9sbGVkQ29udGVudHMoU2Nyb2xsT2Zmc2V0LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9u KTsKIAotICAgIHZvaWQgdXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0ZWd5KGJvb2wgbmVlZHNEZXNj ZW5kYW50c0NsaXBwaW5nTGF5ZXIpOwogICAgIHZvaWQgdXBkYXRlTWFza2luZ0xheWVyR2VvbWV0 cnkoKTsKICAgICB2b2lkIHVwZGF0ZVJvb3RMYXllckNvbmZpZ3VyYXRpb24oKTsKICAgICB2b2lk IHVwZGF0ZVBhaW50aW5nUGhhc2VzKCk7CkBAIC00MTcsNyArNDE1LDYgQEAgcHJpdmF0ZToKICAg ICBSZWZQdHI8R3JhcGhpY3NMYXllcj4gbV9iYWNrZ3JvdW5kTGF5ZXI7IC8vIE9ubHkgdXNlZCBp biBjYXNlcyB3aGVyZSB3ZSBuZWVkIHRvIGRyYXcgdGhlIGJhY2tncm91bmQgc2VwYXJhdGVseS4K ICAgICBSZWZQdHI8R3JhcGhpY3NMYXllcj4gbV9jaGlsZENvbnRhaW5tZW50TGF5ZXI7IC8vIE9u bHkgdXNlZCBpZiB3ZSBoYXZlIGNsaXBwaW5nIG9uIGEgc3RhY2tpbmcgY29udGV4dCB3aXRoIGNv bXBvc2l0aW5nIGNoaWxkcmVuLCBvciBpZiB0aGUgbGF5ZXIgaGFzIGEgdGlsZSBjYWNoZS4KICAg ICBSZWZQdHI8R3JhcGhpY3NMYXllcj4gbV9tYXNrTGF5ZXI7IC8vIE9ubHkgdXNlZCBpZiB3ZSBo YXZlIGEgbWFzayBhbmQvb3IgY2xpcC1wYXRoLgotICAgIFJlZlB0cjxHcmFwaGljc0xheWVyPiBt X2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXI7IC8vIE9ubHkgdXNlZCBpZiB3ZSBoYXZlIHRvIGNsaXAg Y2hpbGQgbGF5ZXJzIG9yIGFjY2VsZXJhdGVkIGNvbnRlbnRzIHdpdGggYm9yZGVyIHJhZGl1cyBv ciBjbGlwLXBhdGguCiAKICAgICBSZWZQdHI8R3JhcGhpY3NMYXllcj4gbV9sYXllckZvckhvcml6 b250YWxTY3JvbGxiYXI7CiAgICAgUmVmUHRyPEdyYXBoaWNzTGF5ZXI+IG1fbGF5ZXJGb3JWZXJ0 aWNhbFNjcm9sbGJhcjsK