232874 2021-11-09 03:05:39 -0800 Refactor consumeWillChange() 2021-11-09 05:09:21 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ntim ntim esprehn+autocc ews-watchlist glenn gyuyoung.kim koivisto macpherson menard webkit-bug-importer oldest_to_newest 1813052 0 ntim 2021-11-09 03:05:39 -0800 See bug 232868 comment 9 1813054 1 443671 ntim 2021-11-09 03:14:53 -0800 Created attachment 443671 Patch 1813057 2 443672 ntim 2021-11-09 03:21:38 -0800 Created attachment 443672 Patch 1813073 3 443672 koivisto 2021-11-09 04:06:09 -0800 Comment on attachment 443672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443672&action=review > Source/WebCore/css/parser/CSSPropertyParser.cpp:-502 > // Every comma-separated list of identifiers is a valid will-change value, > // unless the list includes an explicitly disallowed identifier. > - while (true) { > - if (range.peek().type() != IdentToken) > + while (!range.atEnd()) { > + switch (range.peek().id()) { > + case CSSValueNone: > + case CSSValueAll: > + case CSSValueAuto: > return nullptr; > - CSSPropertyID propertyID = cssPropertyID(range.peek().value()); > - if (propertyID != CSSPropertyInvalid) { > - // Now "all" is used by both CSSValue and CSSPropertyValue. > - // Need to return nullptr when currentValue is CSSPropertyAll. > - if (propertyID == CSSPropertyWillChange || propertyID == CSSPropertyAll) > - return nullptr; > - values->append(CSSValuePool::singleton().createIdentifierValue(propertyID)); > - range.consumeIncludingWhitespace(); > - } else { It is not clear to me how this is better. The primary purpose of this loop is to consume property identifiers which the old code made clear. After your change the loop looks like it is about CSSValues and property IDs are a buried special case. 1813086 4 ntim 2021-11-09 04:51:47 -0800 (In reply to Antti Koivisto from comment #3) > Comment on attachment 443672 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443672&action=review > > > Source/WebCore/css/parser/CSSPropertyParser.cpp:-502 > > // Every comma-separated list of identifiers is a valid will-change value, > > // unless the list includes an explicitly disallowed identifier. > > - while (true) { > > - if (range.peek().type() != IdentToken) > > + while (!range.atEnd()) { > > + switch (range.peek().id()) { > > + case CSSValueNone: > > + case CSSValueAll: > > + case CSSValueAuto: > > return nullptr; > > - CSSPropertyID propertyID = cssPropertyID(range.peek().value()); > > - if (propertyID != CSSPropertyInvalid) { > > - // Now "all" is used by both CSSValue and CSSPropertyValue. > > - // Need to return nullptr when currentValue is CSSPropertyAll. > > - if (propertyID == CSSPropertyWillChange || propertyID == CSSPropertyAll) > > - return nullptr; > > - values->append(CSSValuePool::singleton().createIdentifierValue(propertyID)); > > - range.consumeIncludingWhitespace(); > > - } else { > > It is not clear to me how this is better. The primary purpose of this loop > is to consume property identifiers which the old code made clear. > > After your change the loop looks like it is about CSSValues and property IDs > are a buried special case. This is how the spec defines things, defines values first, and property IDs are just a special cases of <custom-ident>, so to me this is actually easier to read. 1813087 5 443672 koivisto 2021-11-09 04:57:27 -0800 Comment on attachment 443672 Patch Ok then! 1813091 6 ntim 2021-11-09 05:08:29 -0800 Committed r285492 (244016@main): <https://commits.webkit.org/244016@main> 1813092 7 webkit-bug-importer 2021-11-09 05:09:21 -0800 <rdar://problem/85198621> 443671 2021-11-09 03:14:53 -0800 2021-11-09 03:21:34 -0800 Patch bug-232874-20211109111452.patch text/plain 3558 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRjNWY0ZjQ5NTc1ZWIz NzZiYTA2ZTJkNTRhYmFjN2RkZjM1NWM5Mi4uZDdjZWFkYjU1MmIxZWIxYmQ2Mjk4ZDFhMTk1NmU1 N2VmZGNiNzI1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTA5ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgY29uc3VtZVdpbGxD aGFuZ2UoKSB0byBtYWtlIGJldHRlciB1c2Ugb2YgY29uc3VtZUN1c3RvbUlkZW50KCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjg3NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbnN1bWVDdXN0b21J ZGVudCgpIGFscmVhZHkgcmVqZWN0cyBmb3Igbm9uLWlkZW50IHR5cGVzIGFuZCByZXNlcnZlZCBr ZXl3b3Jkcy4KKyAgICAgICAgTWFrZSB1c2Ugb2YgdGhhdCB0byBtYWtlIHRoZSBmdW5jdGlvbiBt b3JlIHJlYWRhYmxlLgorCisgICAgICAgICogY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjb25zdW1lV2lsbENoYW5nZSk6CisKIDIwMjEtMTEtMDkg IFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaXNWYWxpZEN1c3Rv bUlkZW50aWZpZXIgaW4gY29uc3VtZVdpbGxDaGFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXggYjdmMDcwYWY0NTRhNDdkN2NkY2Ux MTA1NjM2ZjVhNTdjNGU3MWNlMi4uZWE5MTU5YTVkMGM3MGMxOGJiMGE2YzI5Yjc5ZGJkYTZjYWNl MWFiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBh cnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNl ci5jcHAKQEAgLTQ4OSwzNCArNDg5LDMwIEBAIHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1 bWVXaWxsQ2hhbmdlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgIC8vIEV2ZXJ5IGNv bW1hLXNlcGFyYXRlZCBsaXN0IG9mIGlkZW50aWZpZXJzIGlzIGEgdmFsaWQgd2lsbC1jaGFuZ2Ug dmFsdWUsCiAgICAgLy8gdW5sZXNzIHRoZSBsaXN0IGluY2x1ZGVzIGFuIGV4cGxpY2l0bHkgZGlz YWxsb3dlZCBpZGVudGlmaWVyLgogICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAgIGlmIChyYW5n ZS5wZWVrKCkudHlwZSgpICE9IElkZW50VG9rZW4pCisgICAgICAgIHN3aXRjaCAocmFuZ2UucGVl aygpLmlkKCkpIHsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZU5vbmU6CisgICAgICAgIGNhc2UgQ1NT VmFsdWVBbGw6CisgICAgICAgIGNhc2UgQ1NTVmFsdWVBdXRvOgogICAgICAgICAgICAgcmV0dXJu IG51bGxwdHI7Ci0gICAgICAgIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCA9IGNzc1Byb3BlcnR5 SUQocmFuZ2UucGVlaygpLnZhbHVlKCkpOwotICAgICAgICBpZiAocHJvcGVydHlJRCAhPSBDU1NQ cm9wZXJ0eUludmFsaWQpIHsKLSAgICAgICAgICAgIC8vIE5vdyAiYWxsIiBpcyB1c2VkIGJ5IGJv dGggQ1NTVmFsdWUgYW5kIENTU1Byb3BlcnR5VmFsdWUuCi0gICAgICAgICAgICAvLyBOZWVkIHRv IHJldHVybiBudWxscHRyIHdoZW4gY3VycmVudFZhbHVlIGlzIENTU1Byb3BlcnR5QWxsLgotICAg ICAgICAgICAgaWYgKHByb3BlcnR5SUQgPT0gQ1NTUHJvcGVydHlXaWxsQ2hhbmdlIHx8IHByb3Bl cnR5SUQgPT0gQ1NTUHJvcGVydHlBbGwpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7 Ci0gICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy ZWF0ZUlkZW50aWZpZXJWYWx1ZShwcm9wZXJ0eUlEKSk7Ci0gICAgICAgICAgICByYW5nZS5jb25z dW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg YXV0byBpZCA9IHJhbmdlLnBlZWsoKS5pZCgpOwotICAgICAgICAgICAgc3dpdGNoIChpZCkgewot ICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZU5vbmU6Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVl QWxsOgotICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUF1dG86CisgICAgICAgIGNhc2UgQ1NTVmFs dWVDb250ZW50czoKKyAgICAgICAgY2FzZSBDU1NWYWx1ZVNjcm9sbFBvc2l0aW9uOgorICAgICAg ICAgICAgdmFsdWVzLT5hcHBlbmQoY29uc3VtZUlkZW50KHJhbmdlKS5yZWxlYXNlTm9uTnVsbCgp KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eUlEID0gY3NzUHJvcGVydHlJRChyYW5nZS5wZWVrKCkudmFsdWUo KSk7CisgICAgICAgICAgICBpZiAocHJvcGVydHlJRCA9PSBDU1NQcm9wZXJ0eVdpbGxDaGFuZ2Up CiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgICAgICBjYXNlIENTU1Zh bHVlQ29udGVudHM6Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVlU2Nyb2xsUG9zaXRpb246Ci0g ICAgICAgICAgICAgICAgdmFsdWVzLT5hcHBlbmQoY29uc3VtZUlkZW50KHJhbmdlKS5yZWxlYXNl Tm9uTnVsbCgpKTsKKyAgICAgICAgICAgIGlmIChwcm9wZXJ0eUlEICE9IENTU1Byb3BlcnR5SW52 YWxpZCkgeworICAgICAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2lu Z2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKHByb3BlcnR5SUQpKTsKKyAgICAgICAgICAg ICAgICByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpOwogICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBpZiAoIWlzVmFs aWRDdXN0b21JZGVudGlmaWVyKGlkKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxw dHI7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoYXV0byBjdXN0b21JZGVudCA9IGNv bnN1bWVDdXN0b21JZGVudChyYW5nZSkpIHsKICAgICAgICAgICAgICAgICAvLyBBcHBlbmQgcHJv cGVydGllcyB3ZSBkb24ndCByZWNvZ25pemUsIGJ1dCB0aGF0IGFyZSBsZWdhbCwgYXMgc3RyaW5n cy4KLSAgICAgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChjb25zdW1lQ3VzdG9tSWRlbnQocmFu Z2UpLnJlbGVhc2VOb25OdWxsKCkpOworICAgICAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKGN1 c3RvbUlkZW50LnJlbGVhc2VOb25OdWxsKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0KIAogICAg ICAgICBpZiAocmFuZ2UuYXRFbmQoKSkK 443672 2021-11-09 03:21:38 -0800 2021-11-09 04:57:27 -0800 Patch bug-232874-20211109112137.patch text/plain 3888 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRjNWY0ZjQ5NTc1ZWIz NzZiYTA2ZTJkNTRhYmFjN2RkZjM1NWM5Mi4uZDdjZWFkYjU1MmIxZWIxYmQ2Mjk4ZDFhMTk1NmU1 N2VmZGNiNzI1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTA5ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgY29uc3VtZVdpbGxD aGFuZ2UoKSB0byBtYWtlIGJldHRlciB1c2Ugb2YgY29uc3VtZUN1c3RvbUlkZW50KCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjg3NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbnN1bWVDdXN0b21J ZGVudCgpIGFscmVhZHkgcmVqZWN0cyBmb3Igbm9uLWlkZW50IHR5cGVzIGFuZCByZXNlcnZlZCBr ZXl3b3Jkcy4KKyAgICAgICAgTWFrZSB1c2Ugb2YgdGhhdCB0byBtYWtlIHRoZSBmdW5jdGlvbiBt b3JlIHJlYWRhYmxlLgorCisgICAgICAgICogY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjb25zdW1lV2lsbENoYW5nZSk6CisKIDIwMjEtMTEtMDkg IFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaXNWYWxpZEN1c3Rv bUlkZW50aWZpZXIgaW4gY29uc3VtZVdpbGxDaGFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXggYjdmMDcwYWY0NTRhNDdkN2NkY2Ux MTA1NjM2ZjVhNTdjNGU3MWNlMi4uZTIzMmM4NDlkMGIyOTMxMTkzNWQxNTQzMWFlZWViYzE3NTc5 NmUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBh cnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNl ci5jcHAKQEAgLTQ4OCw0MCArNDg4LDM1IEBAIHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1 bWVXaWxsQ2hhbmdlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgIFJlZlB0cjxDU1NW YWx1ZUxpc3Q+IHZhbHVlcyA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlQ29tbWFTZXBhcmF0ZWQoKTsK ICAgICAvLyBFdmVyeSBjb21tYS1zZXBhcmF0ZWQgbGlzdCBvZiBpZGVudGlmaWVycyBpcyBhIHZh bGlkIHdpbGwtY2hhbmdlIHZhbHVlLAogICAgIC8vIHVubGVzcyB0aGUgbGlzdCBpbmNsdWRlcyBh biBleHBsaWNpdGx5IGRpc2FsbG93ZWQgaWRlbnRpZmllci4KLSAgICB3aGlsZSAodHJ1ZSkgewot ICAgICAgICBpZiAocmFuZ2UucGVlaygpLnR5cGUoKSAhPSBJZGVudFRva2VuKQorICAgIHdoaWxl ICghcmFuZ2UuYXRFbmQoKSkgeworICAgICAgICBzd2l0Y2ggKHJhbmdlLnBlZWsoKS5pZCgpKSB7 CisgICAgICAgIGNhc2UgQ1NTVmFsdWVOb25lOgorICAgICAgICBjYXNlIENTU1ZhbHVlQWxsOgor ICAgICAgICBjYXNlIENTU1ZhbHVlQXV0bzoKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwot ICAgICAgICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQgPSBjc3NQcm9wZXJ0eUlEKHJhbmdlLnBl ZWsoKS52YWx1ZSgpKTsKLSAgICAgICAgaWYgKHByb3BlcnR5SUQgIT0gQ1NTUHJvcGVydHlJbnZh bGlkKSB7Ci0gICAgICAgICAgICAvLyBOb3cgImFsbCIgaXMgdXNlZCBieSBib3RoIENTU1ZhbHVl IGFuZCBDU1NQcm9wZXJ0eVZhbHVlLgotICAgICAgICAgICAgLy8gTmVlZCB0byByZXR1cm4gbnVs bHB0ciB3aGVuIGN1cnJlbnRWYWx1ZSBpcyBDU1NQcm9wZXJ0eUFsbC4KLSAgICAgICAgICAgIGlm IChwcm9wZXJ0eUlEID09IENTU1Byb3BlcnR5V2lsbENoYW5nZSB8fCBwcm9wZXJ0eUlEID09IENT U1Byb3BlcnR5QWxsKQotICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICAg ICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlm aWVyVmFsdWUocHJvcGVydHlJRCkpOwotICAgICAgICAgICAgcmFuZ2UuY29uc3VtZUluY2x1ZGlu Z1doaXRlc3BhY2UoKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGF1dG8gaWQgPSBy YW5nZS5wZWVrKCkuaWQoKTsKLSAgICAgICAgICAgIHN3aXRjaCAoaWQpIHsKLSAgICAgICAgICAg IGNhc2UgQ1NTVmFsdWVOb25lOgotICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUFsbDoKLSAgICAg ICAgICAgIGNhc2UgQ1NTVmFsdWVBdXRvOgorICAgICAgICBjYXNlIENTU1ZhbHVlQ29udGVudHM6 CisgICAgICAgIGNhc2UgQ1NTVmFsdWVTY3JvbGxQb3NpdGlvbjoKKyAgICAgICAgICAgIHZhbHVl cy0+YXBwZW5kKGNvbnN1bWVJZGVudChyYW5nZSkucmVsZWFzZU5vbk51bGwoKSk7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIENTU1Byb3BlcnR5SUQg cHJvcGVydHlJRCA9IGNzc1Byb3BlcnR5SUQocmFuZ2UucGVlaygpLnZhbHVlKCkpOworICAgICAg ICAgICAgaWYgKHByb3BlcnR5SUQgPT0gQ1NTUHJvcGVydHlXaWxsQ2hhbmdlKQogICAgICAgICAg ICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUNvbnRlbnRz OgotICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZVNjcm9sbFBvc2l0aW9uOgotICAgICAgICAgICAg ICAgIHZhbHVlcy0+YXBwZW5kKGNvbnN1bWVJZGVudChyYW5nZSkucmVsZWFzZU5vbk51bGwoKSk7 CisgICAgICAgICAgICBpZiAocHJvcGVydHlJRCAhPSBDU1NQcm9wZXJ0eUludmFsaWQpIHsKKyAg ICAgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy ZWF0ZUlkZW50aWZpZXJWYWx1ZShwcm9wZXJ0eUlEKSk7CisgICAgICAgICAgICAgICAgcmFuZ2Uu Y29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKTsKICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgaWYgKCFpc1ZhbGlkQ3VzdG9tSWRl bnRpZmllcihpZCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgaWYgKGF1dG8gY3VzdG9tSWRlbnQgPSBjb25zdW1lQ3VzdG9t SWRlbnQocmFuZ2UpKSB7CiAgICAgICAgICAgICAgICAgLy8gQXBwZW5kIHByb3BlcnRpZXMgd2Ug ZG9uJ3QgcmVjb2duaXplLCBidXQgdGhhdCBhcmUgbGVnYWwsIGFzIHN0cmluZ3MuCi0gICAgICAg ICAgICAgICAgdmFsdWVzLT5hcHBlbmQoY29uc3VtZUN1c3RvbUlkZW50KHJhbmdlKS5yZWxlYXNl Tm9uTnVsbCgpKTsKKyAgICAgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChjdXN0b21JZGVudC5y ZWxlYXNlTm9uTnVsbCgpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHJh bmdlLmF0RW5kKCkpCi0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgaWYgKCFjb25zdW1lQ29t bWFJbmNsdWRpbmdXaGl0ZXNwYWNlKHJhbmdlKSkKKyAgICAgICAgLy8gVGhpcyBpcyBhIGNvbW1h IHNlcGFyYXRlZCBsaXN0CisgICAgICAgIGlmICghcmFuZ2UuYXRFbmQoKSAmJiAhY29uc3VtZUNv bW1hSW5jbHVkaW5nV2hpdGVzcGFjZShyYW5nZSkpCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9CiAK