238857 2022-04-06 01:15:37 -0700 Remove some @apply leftover code 2022-04-06 02:18:18 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard ntim webkit-bug-importer oldest_to_newest 1858718 0 koivisto 2022-04-06 01:15:37 -0700 @apply is not a thing. 1858719 1 456789 koivisto 2022-04-06 01:18:21 -0700 Created attachment 456789 Patch 1858724 2 456789 ntim 2022-04-06 01:37:42 -0700 Comment on attachment 456789 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456789&action=review > Source/WebCore/css/parser/CSSVariableParser.cpp:91 > + case AtKeywordToken: > break; Is it possible to delete this? `default:` bellow seems to handle it. 1858732 3 koivisto 2022-04-06 01:56:42 -0700 > Is it possible to delete this? `default:` bellow seems to handle it. A better direction might be to eliminate the default branch. Then everyone who adds a new token type needs to consider this code too. 1858738 4 ews-feeder 2022-04-06 02:17:51 -0700 Committed r292455 (249306@main): <https://commits.webkit.org/249306@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456789. 1858739 5 webkit-bug-importer 2022-04-06 02:18:18 -0700 <rdar://problem/91342745> 456789 2022-04-06 01:18:21 -0700 2022-04-06 02:17:52 -0700 Patch bug-238857-20220406111820.patch text/plain 10291 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE4OGNjM2ZiYTBiODc3 MDk3MmNkNDE0NjA4YzI2ZTI4ZGFjZTc0NS4uNzMzZjc0OTM3NDkxN2M0YWI1ZGYzMGY0MzI0ZTQw YTg3OGFmN2I4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTA0LTA2ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSBAYXBw bHkgbGVmdG92ZXIgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM4ODU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQGFwcGx5IGlzIG5vdCBhIHRoaW5nLgorCisgICAgICAgICogY3NzL0NTU1Zhcmlh YmxlRGF0YS5oOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQYXJzZXJJbXBsOjpjb25zdW1lQXRSdWxlKToKKyAgICAgICAgKFdl YkNvcmU6OkNTU1BhcnNlckltcGw6OmNvbnN1bWVEZWNsYXJhdGlvbkxpc3QpOgorICAgICAgICAq IGNzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5oOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTVmFy aWFibGVQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xhc3NpZnlCbG9jayk6CisgICAg ICAgIChXZWJDb3JlOjppc1ZhbGlkVmFyaWFibGVSZWZlcmVuY2UpOgorICAgICAgICAoV2ViQ29y ZTo6aXNWYWxpZENvbnN0YW50UmVmZXJlbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OmNsYXNzaWZ5 VmFyaWFibGVSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NWYXJpYWJsZVBhcnNlcjo6Y29u dGFpbnNWYWxpZFZhcmlhYmxlUmVmZXJlbmNlcyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NWYXJp YWJsZVBhcnNlcjo6cGFyc2VEZWNsYXJhdGlvblZhbHVlKToKKwogMjAyMi0wNC0wNiAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIE5vdGlmaWNhdGlv bjo6bV9yZWxhdGVkTm90aWZpY2F0aW9uSWRlbnRpZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ZhcmlhYmxlRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Zhcmlh YmxlRGF0YS5oCmluZGV4IGZmZmE1YWNkM2U3MjNmODU2NGQ3ZDNhOWEyZWQxOGRmNjg0MWU4ZDYu LmI3YzRhOTdjM2MyNmVjYjhmNDMyYjI0Yjg2YWY5NmIzNGZiMzVhMTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NWYXJpYWJsZURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTVmFyaWFibGVEYXRhLmgKQEAgLTU5LDggKzU5LDYgQEAgcHJpdmF0ZToKIAogICAgIFN0 cmluZyBtX2JhY2tpbmdTdHJpbmc7CiAgICAgVmVjdG9yPENTU1BhcnNlclRva2VuPiBtX3Rva2Vu czsKLQotICAgIC8vIEZJWE1FLU5FV1BBUlNFUjogV2Ugd2FudCB0byBjYWNoZSBTdHlsZVByb3Bl cnRpZXMgb25jZSB3ZSBzdXBwb3J0IEBhcHBseS4KIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCmluZGV4IGNi OGY0YzhhYmJiMGU2M2YyZDFkMjY0NmMxYWM0NzdhZmE5NTZiNTEuLjgzZmFkMTAyNDU0YzVmMGNj NjY1ZjgwZDg4OTE1NzNjMmFhODA1M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTUGFyc2VySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9D U1NQYXJzZXJJbXBsLmNwcApAQCAtNDMxLDggKzQzMSw4IEBAIFJlZlB0cjxTdHlsZVJ1bGVCYXNl PiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lQXRSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdl LCBBCiAgICAgQ1NTUGFyc2VyVG9rZW5SYW5nZSBibG9jayA9IHJhbmdlLmNvbnN1bWVCbG9jaygp OwogICAgIGlmIChhbGxvd2VkUnVsZXMgPT0gS2V5ZnJhbWVSdWxlcykKICAgICAgICAgcmV0dXJu IG51bGxwdHI7IC8vIFBhcnNlIGVycm9yLCBubyBhdC1ydWxlcyBzdXBwb3J0ZWQgaW5zaWRlIEBr ZXlmcmFtZXMKLSAgICBpZiAoYWxsb3dlZFJ1bGVzID09IE5vUnVsZXMgfHwgYWxsb3dlZFJ1bGVz ID09IEFwcGx5UnVsZXMpCi0gICAgICAgIHJldHVybiBudWxscHRyOyAvLyBQYXJzZSBlcnJvciwg bm8gYXQtcnVsZXMgd2l0aCBibG9ja3Mgc3VwcG9ydGVkIGluc2lkZSBkZWNsYXJhdGlvbiBsaXN0 cworICAgIGlmIChhbGxvd2VkUnVsZXMgPT0gTm9SdWxlcykKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKICAgICBBU1NFUlQoYWxsb3dlZFJ1bGVzIDw9IFJlZ3VsYXJSdWxlcyk7CiAKQEAgLTk3 Nyw5ICs5NzcsNyBAQCB2b2lkIENTU1BhcnNlckltcGw6OmNvbnN1bWVEZWNsYXJhdGlvbkxpc3Qo Q1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgU3R5bGVSdWxlVAogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBBdEtleXdvcmRUb2tlbjogewotICAgICAgICAgICAg Ly8gRklYTUUtTkVXUEFSU0VSOiBTdXBwb3J0IGFwcGx5Ci0gICAgICAgICAgICBBbGxvd2VkUnVs ZXNUeXBlIGFsbG93ZWRSdWxlcyA9IC8qIHJ1bGVUeXBlID09IFN0eWxlUnVsZVR5cGU6OlN0eWxl ICYmIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OmNzc0FwcGx5QXRSdWxlc0VuYWJsZWQoKSA/IEFw cGx5UnVsZXMgOiovIE5vUnVsZXM7Ci0gICAgICAgICAgICBSZWZQdHI8U3R5bGVSdWxlQmFzZT4g cnVsZSA9IGNvbnN1bWVBdFJ1bGUocmFuZ2UsIGFsbG93ZWRSdWxlcyk7CisgICAgICAgICAgICBS ZWZQdHI8U3R5bGVSdWxlQmFzZT4gcnVsZSA9IGNvbnN1bWVBdFJ1bGUocmFuZ2UsIE5vUnVsZXMp OwogICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChydWxlLCAhcnVsZSk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9D U1NQYXJzZXJJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwu aAppbmRleCAwZDI3M2Y1OWQwMjZiZWEwODJjZDg1OTIyZjQ5ZTRmOWIyYzFlODIyLi5jNTZmMmZm YmUxZjQ0ODJiNTU2ZTY3MzM2YWVhMTlmNjQyNjY0N2EzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1BhcnNlckltcGwuaApAQCAtODIsNyArODIsNiBAQCBwdWJsaWM6CiAgICAgICAg IEFsbG93TmFtZXNwYWNlUnVsZXMsCiAgICAgICAgIFJlZ3VsYXJSdWxlcywKICAgICAgICAgS2V5 ZnJhbWVSdWxlcywKLSAgICAgICAgQXBwbHlSdWxlcywgLy8gRm9yIEBhcHBseSBpbnNpZGUgc3R5 bGUgcnVsZXMKICAgICAgICAgQ291bnRlclN0eWxlUnVsZXMsCiAgICAgICAgIE5vUnVsZXMsIC8v IEZvciBwYXJzaW5nIGF0LXJ1bGVzIGluc2lkZSBkZWNsYXJhdGlvbiBsaXN0cwogICAgIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1ZhcmlhYmxlUGFyc2VyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTVmFyaWFibGVQYXJzZXIuY3BwCmluZGV4 IGI1NTE3NjE2OTllZWRlYTQwY2FkNzEwYjFjY2E4ZTkyY2NhZmZiYjIuLmE5ODlkYzg1ZDQzYzI5 OGU5ODFlMDIzMDJmZTJjNDBmYmZjNjNjZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9wYXJzZXIvQ1NTVmFyaWFibGVQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTVmFyaWFibGVQYXJzZXIuY3BwCkBAIC01NywyOCArNTcsMjggQEAgc3RhdGljIGJv b2wgaXNWYWxpZENvbnN0YW50TmFtZShjb25zdCBDU1NQYXJzZXJUb2tlbiYgdG9rZW4pCiAgICAg cmV0dXJuIHRva2VuLnR5cGUoKSA9PSBJZGVudFRva2VuOwogfQogCi1zdGF0aWMgYm9vbCBpc1Zh bGlkVmFyaWFibGVSZWZlcmVuY2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSwgYm9vbCYgaGFzQXRBcHBs eVJ1bGUsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmKTsKLXN0YXRpYyBib29sIGlzVmFsaWRDb25z dGFudFJlZmVyZW5jZShDU1NQYXJzZXJUb2tlblJhbmdlLCBib29sJiBoYXNBdEFwcGx5UnVsZSwg Y29uc3QgQ1NTUGFyc2VyQ29udGV4dCYpOworc3RhdGljIGJvb2wgaXNWYWxpZFZhcmlhYmxlUmVm ZXJlbmNlKENTU1BhcnNlclRva2VuUmFuZ2UsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmKTsKK3N0 YXRpYyBib29sIGlzVmFsaWRDb25zdGFudFJlZmVyZW5jZShDU1NQYXJzZXJUb2tlblJhbmdlLCBj b25zdCBDU1NQYXJzZXJDb250ZXh0Jik7CiAKLXN0YXRpYyBib29sIGNsYXNzaWZ5QmxvY2soQ1NT UGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzUmVmZXJlbmNlcywgYm9vbCYgaGFzQXRB cHBseVJ1bGUsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIHBhcnNlckNvbnRleHQsIGJvb2wgaXNU b3BMZXZlbEJsb2NrID0gdHJ1ZSkKK3N0YXRpYyBib29sIGNsYXNzaWZ5QmxvY2soQ1NTUGFyc2Vy VG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzUmVmZXJlbmNlcywgY29uc3QgQ1NTUGFyc2VyQ29u dGV4dCYgcGFyc2VyQ29udGV4dCwgYm9vbCBpc1RvcExldmVsQmxvY2sgPSB0cnVlKQogewogICAg IHdoaWxlICghcmFuZ2UuYXRFbmQoKSkgewogICAgICAgICBpZiAocmFuZ2UucGVlaygpLmdldEJs b2NrVHlwZSgpID09IENTU1BhcnNlclRva2VuOjpCbG9ja1N0YXJ0KSB7CiAgICAgICAgICAgICBj b25zdCBDU1NQYXJzZXJUb2tlbiYgdG9rZW4gPSByYW5nZS5wZWVrKCk7CiAgICAgICAgICAgICBD U1NQYXJzZXJUb2tlblJhbmdlIGJsb2NrID0gcmFuZ2UuY29uc3VtZUJsb2NrKCk7CiAgICAgICAg ICAgICBpZiAodG9rZW4uZnVuY3Rpb25JZCgpID09IENTU1ZhbHVlVmFyKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKCFpc1ZhbGlkVmFyaWFibGVSZWZlcmVuY2UoYmxvY2ssIGhhc0F0QXBwbHlSdWxl LCBwYXJzZXJDb250ZXh0KSkKKyAgICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRWYXJpYWJsZVJl ZmVyZW5jZShibG9jaywgcGFyc2VyQ29udGV4dCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsgLy8gQmFpbCBpZiBhbnkgcmVmZXJlbmNlcyBhcmUgaW52YWxpZAogICAgICAgICAg ICAgICAgIGhhc1JlZmVyZW5jZXMgPSB0cnVlOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHRva2VuLmZ1bmN0aW9uSWQoKSA9PSBDU1NW YWx1ZUVudiAmJiBwYXJzZXJDb250ZXh0LmNvbnN0YW50UHJvcGVydGllc0VuYWJsZWQpIHsKLSAg ICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRDb25zdGFudFJlZmVyZW5jZShibG9jaywgaGFzQXRB cHBseVJ1bGUsIHBhcnNlckNvbnRleHQpKQorICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZENv bnN0YW50UmVmZXJlbmNlKGJsb2NrLCBwYXJzZXJDb250ZXh0KSkKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOyAvLyBCYWlsIGlmIGFueSByZWZlcmVuY2VzIGFyZSBpbnZhbGlkCiAg ICAgICAgICAgICAgICAgaGFzUmVmZXJlbmNlcyA9IHRydWU7CiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoIWNsYXNzaWZ5QmxvY2soYmxv Y2ssIGhhc1JlZmVyZW5jZXMsIGhhc0F0QXBwbHlSdWxlLCBwYXJzZXJDb250ZXh0LCBmYWxzZSkp CisgICAgICAgICAgICBpZiAoIWNsYXNzaWZ5QmxvY2soYmxvY2ssIGhhc1JlZmVyZW5jZXMsIHBh cnNlckNvbnRleHQsIGZhbHNlKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtODcsMTcgKzg3LDggQEAgc3RhdGljIGJv b2wgY2xhc3NpZnlCbG9jayhDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlLCBib29sJiBoYXNSZWZl cmVuY2VzLCBib29sJgogCiAgICAgICAgIGNvbnN0IENTU1BhcnNlclRva2VuJiB0b2tlbiA9IHJh bmdlLmNvbnN1bWUoKTsKICAgICAgICAgc3dpdGNoICh0b2tlbi50eXBlKCkpIHsKLSAgICAgICAg Y2FzZSBBdEtleXdvcmRUb2tlbjogewotICAgICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdBU0NJ SUNhc2UodG9rZW4udmFsdWUoKSwgImFwcGx5IikpIHsKLSAgICAgICAgICAgICAgICByYW5nZS5j b25zdW1lV2hpdGVzcGFjZSgpOwotICAgICAgICAgICAgICAgIGNvbnN0IENTU1BhcnNlclRva2Vu JiB2YXJpYWJsZU5hbWUgPSByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpOwotICAg ICAgICAgICAgICAgIGlmICghQ1NTVmFyaWFibGVQYXJzZXI6OmlzVmFsaWRWYXJpYWJsZU5hbWUo dmFyaWFibGVOYW1lKQotICAgICAgICAgICAgICAgICAgICB8fCAhKHJhbmdlLmF0RW5kKCkgfHwg cmFuZ2UucGVlaygpLnR5cGUoKSA9PSBTZW1pY29sb25Ub2tlbiB8fCByYW5nZS5wZWVrKCkudHlw ZSgpID09IFJpZ2h0QnJhY2VUb2tlbikpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgICAgICAgICBoYXNBdEFwcGx5UnVsZSA9IHRydWU7Ci0gICAgICAgICAgICB9 CisgICAgICAgIGNhc2UgQXRLZXl3b3JkVG9rZW46CiAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgfQogICAgICAgICBjYXNlIERlbGltaXRlclRva2VuOiB7CiAgICAgICAgICAgICBpZiAodG9r ZW4uZGVsaW1pdGVyKCkgPT0gJyEnICYmIGlzVG9wTGV2ZWxCbG9jaykKICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CkBAIC0xMjAsNyArMTExLDcgQEAgc3RhdGljIGJvb2wgY2xhc3NpZnlC bG9jayhDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlLCBib29sJiBoYXNSZWZlcmVuY2VzLCBib29s JgogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIGlzVmFsaWRWYXJpYWJsZVJlZmVyZW5jZShD U1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlLCBib29sJiBoYXNBdEFwcGx5UnVsZSwgY29uc3QgQ1NT UGFyc2VyQ29udGV4dCYgcGFyc2VyQ29udGV4dCkKK2Jvb2wgaXNWYWxpZFZhcmlhYmxlUmVmZXJl bmNlKENTU1BhcnNlclRva2VuUmFuZ2UgcmFuZ2UsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIHBh cnNlckNvbnRleHQpCiB7CiAgICAgcmFuZ2UuY29uc3VtZVdoaXRlc3BhY2UoKTsKICAgICBpZiAo IUNTU1ZhcmlhYmxlUGFyc2VyOjppc1ZhbGlkVmFyaWFibGVOYW1lKHJhbmdlLmNvbnN1bWVJbmNs dWRpbmdXaGl0ZXNwYWNlKCkpKQpAQCAtMTM0LDEwICsxMjUsMTAgQEAgYm9vbCBpc1ZhbGlkVmFy aWFibGVSZWZlcmVuY2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzQXRBcHBs eVJ1bGUsIGMKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBib29sIGhhc1JlZmVyZW5jZXMg PSBmYWxzZTsKLSAgICByZXR1cm4gY2xhc3NpZnlCbG9jayhyYW5nZSwgaGFzUmVmZXJlbmNlcywg aGFzQXRBcHBseVJ1bGUsIHBhcnNlckNvbnRleHQpOworICAgIHJldHVybiBjbGFzc2lmeUJsb2Nr KHJhbmdlLCBoYXNSZWZlcmVuY2VzLCBwYXJzZXJDb250ZXh0KTsKIH0KIAotYm9vbCBpc1ZhbGlk Q29uc3RhbnRSZWZlcmVuY2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzQXRB cHBseVJ1bGUsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIHBhcnNlckNvbnRleHQpCitib29sIGlz VmFsaWRDb25zdGFudFJlZmVyZW5jZShDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlLCBjb25zdCBD U1NQYXJzZXJDb250ZXh0JiBwYXJzZXJDb250ZXh0KQogewogICAgIHJhbmdlLmNvbnN1bWVXaGl0 ZXNwYWNlKCk7CiAgICAgaWYgKCFpc1ZhbGlkQ29uc3RhbnROYW1lKHJhbmdlLmNvbnN1bWVJbmNs dWRpbmdXaGl0ZXNwYWNlKCkpKQpAQCAtMTUxLDEzICsxNDIsMTIgQEAgYm9vbCBpc1ZhbGlkQ29u c3RhbnRSZWZlcmVuY2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzQXRBcHBs eVJ1bGUsIGMKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBib29sIGhhc1JlZmVyZW5jZXMg PSBmYWxzZTsKLSAgICByZXR1cm4gY2xhc3NpZnlCbG9jayhyYW5nZSwgaGFzUmVmZXJlbmNlcywg aGFzQXRBcHBseVJ1bGUsIHBhcnNlckNvbnRleHQpOworICAgIHJldHVybiBjbGFzc2lmeUJsb2Nr KHJhbmdlLCBoYXNSZWZlcmVuY2VzLCBwYXJzZXJDb250ZXh0KTsKIH0KIAotc3RhdGljIENTU1Zh bHVlSUQgY2xhc3NpZnlWYXJpYWJsZVJhbmdlKENTU1BhcnNlclRva2VuUmFuZ2UgcmFuZ2UsIGJv b2wmIGhhc1JlZmVyZW5jZXMsIGJvb2wmIGhhc0F0QXBwbHlSdWxlLCBjb25zdCBDU1NQYXJzZXJD b250ZXh0JiBwYXJzZXJDb250ZXh0KQorc3RhdGljIENTU1ZhbHVlSUQgY2xhc3NpZnlWYXJpYWJs ZVJhbmdlKENTU1BhcnNlclRva2VuUmFuZ2UgcmFuZ2UsIGJvb2wmIGhhc1JlZmVyZW5jZXMsIGNv bnN0IENTU1BhcnNlckNvbnRleHQmIHBhcnNlckNvbnRleHQpCiB7CiAgICAgaGFzUmVmZXJlbmNl cyA9IGZhbHNlOwotICAgIGhhc0F0QXBwbHlSdWxlID0gZmFsc2U7CiAKICAgICByYW5nZS5jb25z dW1lV2hpdGVzcGFjZSgpOwogICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpID09IElkZW50VG9r ZW4pIHsKQEAgLTE2Niw3ICsxNTYsNyBAQCBzdGF0aWMgQ1NTVmFsdWVJRCBjbGFzc2lmeVZhcmlh YmxlUmFuZ2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzUmVmZQogICAgICAg ICAgICAgcmV0dXJuIGlkOwogICAgIH0KIAotICAgIGlmIChjbGFzc2lmeUJsb2NrKHJhbmdlLCBo YXNSZWZlcmVuY2VzLCBoYXNBdEFwcGx5UnVsZSwgcGFyc2VyQ29udGV4dCkpCisgICAgaWYgKGNs YXNzaWZ5QmxvY2socmFuZ2UsIGhhc1JlZmVyZW5jZXMsIHBhcnNlckNvbnRleHQpKQogICAgICAg ICByZXR1cm4gQ1NTVmFsdWVJbnRlcm5hbFZhcmlhYmxlVmFsdWU7CiAgICAgcmV0dXJuIENTU1Zh bHVlSW52YWxpZDsKIH0KQEAgLTE3NCw5ICsxNjQsOCBAQCBzdGF0aWMgQ1NTVmFsdWVJRCBjbGFz c2lmeVZhcmlhYmxlUmFuZ2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSwgYm9vbCYgaGFzUmVm ZQogYm9vbCBDU1NWYXJpYWJsZVBhcnNlcjo6Y29udGFpbnNWYWxpZFZhcmlhYmxlUmVmZXJlbmNl cyhDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlLCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBwYXJz ZXJDb250ZXh0KQogewogICAgIGJvb2wgaGFzUmVmZXJlbmNlczsKLSAgICBib29sIGhhc0F0QXBw bHlSdWxlOwotICAgIENTU1ZhbHVlSUQgdHlwZSA9IGNsYXNzaWZ5VmFyaWFibGVSYW5nZShyYW5n ZSwgaGFzUmVmZXJlbmNlcywgaGFzQXRBcHBseVJ1bGUsIHBhcnNlckNvbnRleHQpOwotICAgIHJl dHVybiB0eXBlID09IENTU1ZhbHVlSW50ZXJuYWxWYXJpYWJsZVZhbHVlICYmIGhhc1JlZmVyZW5j ZXMgJiYgIWhhc0F0QXBwbHlSdWxlOworICAgIENTU1ZhbHVlSUQgdHlwZSA9IGNsYXNzaWZ5VmFy aWFibGVSYW5nZShyYW5nZSwgaGFzUmVmZXJlbmNlcywgcGFyc2VyQ29udGV4dCk7CisgICAgcmV0 dXJuIHR5cGUgPT0gQ1NTVmFsdWVJbnRlcm5hbFZhcmlhYmxlVmFsdWUgJiYgaGFzUmVmZXJlbmNl czsKIH0KIAogUmVmUHRyPENTU0N1c3RvbVByb3BlcnR5VmFsdWU+IENTU1ZhcmlhYmxlUGFyc2Vy OjpwYXJzZURlY2xhcmF0aW9uVmFsdWUoY29uc3QgQXRvbVN0cmluZyYgdmFyaWFibGVOYW1lLCBD U1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlLCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBwYXJzZXJD b250ZXh0KQpAQCAtMTg1LDggKzE3NCw3IEBAIFJlZlB0cjxDU1NDdXN0b21Qcm9wZXJ0eVZhbHVl PiBDU1NWYXJpYWJsZVBhcnNlcjo6cGFyc2VEZWNsYXJhdGlvblZhbHVlKGNvbnN0IEF0CiAgICAg ICAgIHJldHVybiBudWxscHRyOwogCiAgICAgYm9vbCBoYXNSZWZlcmVuY2VzOwotICAgIGJvb2wg aGFzQXRBcHBseVJ1bGU7Ci0gICAgQ1NTVmFsdWVJRCB0eXBlID0gY2xhc3NpZnlWYXJpYWJsZVJh bmdlKHJhbmdlLCBoYXNSZWZlcmVuY2VzLCBoYXNBdEFwcGx5UnVsZSwgcGFyc2VyQ29udGV4dCk7 CisgICAgQ1NTVmFsdWVJRCB0eXBlID0gY2xhc3NpZnlWYXJpYWJsZVJhbmdlKHJhbmdlLCBoYXNS ZWZlcmVuY2VzLCBwYXJzZXJDb250ZXh0KTsKIAogICAgIGlmICh0eXBlID09IENTU1ZhbHVlSW52 YWxpZCkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Cg==