238888 2022-04-06 13:55:01 -0700 [css-cascade] makeprop.pl could sort shorthands properties at the end, and ignore them during the cascade 2022-09-30 15:10:11 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=238345 InRadar P2 Normal --- 239734 245901 1 obrufau obrufau darin esprehn+autocc ews-watchlist glenn gyuyoung.kim koivisto macpherson menard webkit-bug-importer oldest_to_newest 1859001 0 obrufau 2022-04-06 13:55:01 -0700 In bug 238345 I plan to sort deferred properties after normal properties, since they cascade in a special way. Something similar could be done for shorthands. StyleBuilder.cpp does something like applyProperties(firstCSSProperty, lastHighPriorityProperty); applyProperties(firstLowPriorityProperty, lastCSSProperty); inline void Builder::applyPropertiesImpl(int firstProperty, int lastProperty) { for (int id = firstProperty; id <= lastProperty; ++id) { CSSPropertyID propertyID = static_cast<CSSPropertyID>(id); if (!m_cascade.hasProperty(propertyID)) continue; Currently, shorthand properties are mixed among longhands, so they are iterated, but hasProperty() will be false. Then they are wasting some memory in PropertyCascade.h: Property m_properties[numCSSProperties + 2]; std::bitset<numCSSProperties + 2> m_propertyIsPresent; So I think CSSPropertyID could be sorted as such: 1. Special meaning (CSSPropertyInvalid and CSSPropertyCustom) 2. High priority longhands 3. Low priority longhands 4. Deferred longhands 5. Shorthands About a 15-20% of the properties seem to be shorthands, so it may be worth trying. 1861244 1 webkit-bug-importer 2022-04-13 13:55:14 -0700 <rdar://problem/91712874> 1864803 2 458446 obrufau 2022-04-27 08:11:12 -0700 Created attachment 458446 Patch 1865105 3 458509 obrufau 2022-04-28 03:37:24 -0700 Created attachment 458509 Patch 1865482 4 ews-feeder 2022-04-29 11:09:37 -0700 Committed r293622 (250128@main): <https://commits.webkit.org/250128@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458509. 458446 2022-04-27 08:11:12 -0700 2022-04-28 03:37:20 -0700 Patch bug-238888-20220427171110.patch text/plain 6176 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWUxMWMzOWFmN2VhMjY3 N2ZkYWEwYmE3ZGNjN2VjMWIzOTUwZTMwYy4uYWYyMjI3ZWUyZmNhMWRhYzI4NmNmM2FhZWQwM2Vh NzUyNTFhNDgwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTA0LTI3ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jYXNjYWRlXSBT b3J0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGF0IHRoZSBlbmQgb2YgQ1NTUHJvcGVydHlJRCBlbnVt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg4ODgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IGxv bmdoYW5kcyBzaG91bGQgbWF0dGVyIGR1cmluZyB0aGUgQ1NTIENhc2NhZGUsIHNvIGJ5IHNvcnRp bmcKKyAgICAgICAgc2hvcnRoYW5kcyBhdCB0aGUgZW5kLCBhbmQgaWdub3JpbmcgdGhlbSwgd2Ug Y2FuIHNhdmUgc29tZSBtZW1vcnkgYW5kCisgICAgICAgIGF2b2lkIHNvbWUgaXRlcmF0aW9ucy4K KworICAgICAgICBObyB0ZXN0IHNpbmNlIG5vdyB0aGVyZSBzaG91bGQgYmUgbm8gb2JzZXJ2YWJs ZSBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBjc3MvbWFrZXByb3AucGw6CisgICAg ICAgIChhZGRQcm9wZXJ0eSk6CisgICAgICAgIChzb3J0QnlEZXNjZW5kaW5nUHJpb3JpdHlBbmRO YW1lKToKKyAgICAgICAgU29ydCBzaG9ydGhhbmQgcHJvcGVydGllcyBhdCB0aGUgZW5kLgorCisg ICAgICAgICogc3R5bGUvUHJvcGVydHlDYXNjYWRlLmg6CisgICAgICAgIFVwZGF0ZSBjb21tZW50 LgorCiAyMDIyLTA0LTI2ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CiAKICAg ICAgICAgW2Nzcy1sb2dpY2FsXSBTaWRlIGJvcmRlciBzaG9ydGhhbmRzIHNob3VsZCBub3QgYmUg bG9naWNhbC9waHlzaWNhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9w LnBsIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCmluZGV4IDAyNGM3NDYwZDJlYTRh Y2I0OTM4NzhjMTk3OTEzNTIwNjViMjc1OGUuLmIyN2E0ZDVjZGExMDhmZDI3MTc4MGU4YzljZWY2 YWQ3NzVkYjAzZjkgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKQEAgLTI4NCw4ICsyODQsMTAgQEAg c3ViIGFkZFByb3BlcnR5KCQkKQogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRjb2RlZ2VuT3B0 aW9uTmFtZSBlcSAiY29tbWVudCIpIHsKICAgICAgICAgICAgICAgICAgICAgbmV4dDsKICAgICAg ICAgICAgICAgICB9IGVsc2lmICgkY29kZWdlbk9wdGlvbk5hbWUgZXEgImhpZ2gtcHJpb3JpdHki KSB7CisgICAgICAgICAgICAgICAgICAgIGRpZSAiJG5hbWUgaXMgYSBzaG9ydGhhbmQsIGJ1dCBo YXMgaGlnaC1wcmlvcml0eSIgaWYgZXhpc3RzICRjb2RlZ2VuUHJvcGVydGllcy0+eyJsb25naGFu ZHMifTsKICAgICAgICAgICAgICAgICAgICAgJG5hbWVJc0hpZ2hQcmlvcml0eXskbmFtZX0gPSAx OwogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRjb2RlZ2VuT3B0aW9uTmFtZSBlcSAic2luay1w cmlvcml0eSIpIHsKKyAgICAgICAgICAgICAgICAgICAgZGllICIkbmFtZSBpcyBhIHNob3J0aGFu ZCwgYnV0IGhhcyBzaW5rLXByaW9yaXR5IiBpZiBleGlzdHMgJGNvZGVnZW5Qcm9wZXJ0aWVzLT57 ImxvbmdoYW5kcyJ9OwogICAgICAgICAgICAgICAgICAgICAkbmFtZVByaW9yaXR5U2hvdWxkU2lu a3skbmFtZX0gPSAxOwogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRjb2RlZ2VuT3B0aW9uTmFt ZSBlcSAicmVsYXRlZC1wcm9wZXJ0eSIpIHsKICAgICAgICAgICAgICAgICAgICAgJHJlbGF0ZWRQ cm9wZXJ0eXskbmFtZX0gPSAkY29kZWdlblByb3BlcnRpZXMtPnsicmVsYXRlZC1wcm9wZXJ0eSJ9 CkBAIC0zNTMsMTQgKzM1NSwyMSBAQCBzdWIgYWRkUHJvcGVydHkoJCQpCiAKIHN1YiBzb3J0QnlE ZXNjZW5kaW5nUHJpb3JpdHlBbmROYW1lCiB7Ci0gICAgIyBTb3J0IG5hbWVzIHdpdGggaGlnaCBw cmlvcml0eSB0byB0aGUgZnJvbnQKKyAgICAjIFNvcnQgc2hvcnRoYW5kcyB0byB0aGUgYmFjawor ICAgIGlmIChleGlzdHMgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skYX17Imxv bmdoYW5kcyJ9IDwgZXhpc3RzICRwcm9wZXJ0aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JGJ9 eyJsb25naGFuZHMifSkgeworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIGlmIChleGlz dHMgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skYX17ImxvbmdoYW5kcyJ9ID4g ZXhpc3RzICRwcm9wZXJ0aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JGJ9eyJsb25naGFuZHMi fSkgeworICAgICAgICByZXR1cm4gMTsKKyAgICB9CisgICAgIyBTb3J0IGxvbmdoYW5kcyB3aXRo IGhpZ2ggcHJpb3JpdHkgdG8gdGhlIGZyb250CiAgICAgaWYgKCEhJG5hbWVJc0hpZ2hQcmlvcml0 eXskYX0gPCAhISRuYW1lSXNIaWdoUHJpb3JpdHl7JGJ9KSB7CiAgICAgICAgIHJldHVybiAxOwog ICAgIH0KICAgICBpZiAoISEkbmFtZUlzSGlnaFByaW9yaXR5eyRhfSA+ICEhJG5hbWVJc0hpZ2hQ cmlvcml0eXskYn0pIHsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KLSAgICAjIERlZmVyIG5h bWVzIHdpdGggYSByZWxhdGVkIHByb3BlcnR5IHRvIHRoZSBiYWNrCisgICAgIyBEZWZlciBsb25n aGFuZHMgd2l0aCBhIHJlbGF0ZWQgcHJvcGVydHkgdG8gdGhlIGJhY2ssIGJlZm9yZSBzaG9ydGhh bmRzCiAgICAgaWYgKCEhJHJlbGF0ZWRQcm9wZXJ0eXskYX0gPCAhISRyZWxhdGVkUHJvcGVydHl7 JGJ9KSB7CiAgICAgICAgIHJldHVybiAtMTsKICAgICB9CkBAIC04NDksOSArODU4LDE0IEBAIG15 ICRmaXJzdExvd1ByaW9yaXR5UHJvcGVydHlOYW1lOwogbXkgJGxhc3RMb3dQcmlvcml0eVByb3Bl cnR5TmFtZTsKIG15ICRmaXJzdERlZmVycmVkUHJvcGVydHlOYW1lOwogbXkgJGxhc3REZWZlcnJl ZFByb3BlcnR5TmFtZTsKK215ICRmaXJzdFNob3J0aGFuZDsKK215ICRsYXN0U2hvcnRoYW5kOwog Zm9yZWFjaCBteSAkbmFtZSAoQG5hbWVzKSB7CiAgICMgQXNzdW1lcyB0aGF0IEBuYW1lcyBpcyBz b3J0ZWQgYnkgZGVzY2VuZGluZyBwcmlvcml0aWVzLgotICBpZiAoJG5hbWVJc0hpZ2hQcmlvcml0 eXskbmFtZX0pIHsKKyAgaWYgKGV4aXN0cyAkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRp b25zeyRuYW1lfXsibG9uZ2hhbmRzIn0pIHsKKyAgICAkZmlyc3RTaG9ydGhhbmQgPSAkbmFtZSBp ZiAhJGZpcnN0U2hvcnRoYW5kOworICAgICRsYXN0U2hvcnRoYW5kID0gJG5hbWU7CisgIH0gZWxz aWYgKCRuYW1lSXNIaWdoUHJpb3JpdHl7JG5hbWV9KSB7CiAgICAgJGZpcnN0SGlnaFByaW9yaXR5 UHJvcGVydHlOYW1lID0gJG5hbWUgaWYgISRmaXJzdEhpZ2hQcmlvcml0eVByb3BlcnR5TmFtZTsK ICAgICAkbGFzdEhpZ2hQcmlvcml0eVByb3BlcnR5TmFtZSA9ICRuYW1lOwogICB9IGVsc2lmICgh JHJlbGF0ZWRQcm9wZXJ0eXskbmFtZX0pIHsKQEAgLTg4MCw3ICs4OTQsOSBAQCBwcmludCBIRUFE RVIgImNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdEhpZ2hQcmlvcml0eVByb3BlcnR5ID0gQ1NTUHJv cGVydHkiIC4gJG5hbQogcHJpbnQgSEVBREVSICJjb25zdCBDU1NQcm9wZXJ0eUlEIGZpcnN0TG93 UHJpb3JpdHlQcm9wZXJ0eSA9IENTU1Byb3BlcnR5IiAuICRuYW1lVG9JZHskZmlyc3RMb3dQcmlv cml0eVByb3BlcnR5TmFtZX0gLiAiO1xuIjsKIHByaW50IEhFQURFUiAiY29uc3QgQ1NTUHJvcGVy dHlJRCBsYXN0TG93UHJpb3JpdHlQcm9wZXJ0eSA9IENTU1Byb3BlcnR5IiAuICRuYW1lVG9JZHsk bGFzdExvd1ByaW9yaXR5UHJvcGVydHlOYW1lfSAuICI7XG4iOwogcHJpbnQgSEVBREVSICJjb25z dCBDU1NQcm9wZXJ0eUlEIGZpcnN0RGVmZXJyZWRQcm9wZXJ0eSA9IENTU1Byb3BlcnR5IiAuICRu YW1lVG9JZHskZmlyc3REZWZlcnJlZFByb3BlcnR5TmFtZX0gLiAiO1xuIjsKLXByaW50IEhFQURF UiAiY29uc3QgQ1NTUHJvcGVydHlJRCBsYXN0RGVmZXJyZWRQcm9wZXJ0eSA9IENTU1Byb3BlcnR5 IiAuICRuYW1lVG9JZHskbGFzdERlZmVycmVkUHJvcGVydHlOYW1lfSAuICI7XG5cbiI7Citwcmlu dCBIRUFERVIgImNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdERlZmVycmVkUHJvcGVydHkgPSBDU1NQ cm9wZXJ0eSIgLiAkbmFtZVRvSWR7JGxhc3REZWZlcnJlZFByb3BlcnR5TmFtZX0gLiAiO1xuIjsK K3ByaW50IEhFQURFUiAiY29uc3QgQ1NTUHJvcGVydHlJRCBmaXJzdFNob3J0aGFuZCA9IENTU1By b3BlcnR5IiAuICRuYW1lVG9JZHskZmlyc3RTaG9ydGhhbmR9IC4gIjtcbiI7CitwcmludCBIRUFE RVIgImNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdFNob3J0aGFuZCA9IENTU1Byb3BlcnR5IiAuICRu YW1lVG9JZHskbGFzdFNob3J0aGFuZH0gLiAiO1xuXG4iOwogCiBwcmludCBIRUFERVIgInN0YXRp YyBjb25zdCBDU1NQcm9wZXJ0eUlEIGNvbXB1dGVkUHJvcGVydHlJRHNbXSA9IHtcbiI7CiBteSAk bnVtQ29tcHV0ZWRQcm9wZXJ0eUlEcyA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2Fz Y2FkZS5oCmluZGV4IDVhMmRjZmQyNjM4NzlkNzBkNzc3MGFhZDVmOWRiY2E5MWMzMmI0NzIuLjll ZGU1NDIwYTdlYjI0MjBhYTE4ZTM1NjI4MjFiMWQ3MzhhZTkyZWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1Byb3BlcnR5Q2FzY2FkZS5oCkBAIC05OSwxMSArOTksMTIgQEAgcHJpdmF0ZToKIAogICAg IC8vIFRoZSBDU1NQcm9wZXJ0eUlEIGVudW0gaXMgc29ydGVkIGxpa2UgdGhpczoKICAgICAvLyAx LiBDU1NQcm9wZXJ0eUludmFsaWQgYW5kIENTU1Byb3BlcnR5Q3VzdG9tLgotICAgIC8vIDIuIE5v cm1hbCBwcm9wZXJ0aWVzIChoaWdoIHByaW9yaXR5IG9uZXMgZm9sbG93ZWQgYnkgbG93IHByaW9y aXR5IG9uZXMpLgotICAgIC8vIDMuIERlZmVycmVkIHByb3BlcnRpZXMuCisgICAgLy8gMi4gTm9y bWFsIGxvbmdoYW5kcyAoaGlnaCBwcmlvcml0eSBvbmVzIGZvbGxvd2VkIGJ5IGxvdyBwcmlvcml0 eSBvbmVzKS4KKyAgICAvLyAzLiBEZWZlcnJlZCBsb25naGFuZHMuCisgICAgLy8gNC4gU2hvcnRo YW5kcy4KICAgICAvLwotICAgIC8vICdtX3Byb3BlcnRpZXMnIGlzIHVzZWQgZm9yIGJvdGggbm9y bWFsIGFuZCBkZWZlcnJlZCBwcm9wZXJ0aWVzLCBzbyBpdCBoYXMgc2l6ZSAnbGFzdERlZmVycmVk UHJvcGVydHkgKyAxJy4KLSAgICAvLyBJdCBjb3VsZCBhY3R1YWxseSB1c2UgJ251bUNTU1Byb3Bl cnRpZXMnLCBidXQgdGhlbiB3ZSB3b3VsZCBoYXZlIHRvIHN1YnRyYWN0ICdmaXJzdENTU1Byb3Bl cnR5Jywgd2hpY2ggbWF5IG5vdCBiZSB3b3J0aCBpdC4KKyAgICAvLyAnbV9wcm9wZXJ0aWVzJyBp cyB1c2VkIGZvciBib3RoIG5vcm1hbCBhbmQgZGVmZXJyZWQgbG9uZ2hhbmRzLCBzbyBpdCBoYXMg c2l6ZSAnbGFzdERlZmVycmVkUHJvcGVydHkgKyAxJy4KKyAgICAvLyBJdCBjb3VsZCBhY3R1YWxs eSBiZSAyIHVuaXRzIHNtYWxsZXIsIGJ1dCB0aGVuIHdlIHdvdWxkIGhhdmUgdG8gc3VidHJhY3Qg J2ZpcnN0Q1NTUHJvcGVydHknLCB3aGljaCBtYXkgbm90IGJlIHdvcnRoIGl0LgogICAgIC8vICdt X3Byb3BlcnR5SXNQcmVzZW50JyBpcyBub3QgdXNlZCBmb3IgZGVmZXJyZWQgcHJvcGVydGllcywg c28gd2Ugb25seSBuZWVkIHRvIGNvdmVyIHVwIHRvIHRoZSBsYXN0IGxvdyBwcmlvcml0eSBvbmUu CiAgICAgc3RkOjphcnJheTxQcm9wZXJ0eSwgbGFzdERlZmVycmVkUHJvcGVydHkgKyAxPiBtX3By b3BlcnRpZXM7CiAgICAgc3RkOjpiaXRzZXQ8bGFzdExvd1ByaW9yaXR5UHJvcGVydHkgKyAxPiBt X3Byb3BlcnR5SXNQcmVzZW50Owo= 458509 2022-04-28 03:37:24 -0700 2022-04-29 11:09:39 -0700 Patch bug-238888-20220428123723.patch text/plain 7924 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY1N2YwMjZkZWE1ODM5 ZTY0ZjA1MmQxMzZkY2RiMTBkMDA1Y2ZiYi4uYmNlOGI2MjZkZjAzOWVlNDA0MTE4NTdmZGFlMjYw ZDExNjI1OWIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTA0LTI4ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1jYXNjYWRlXSBT b3J0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGF0IHRoZSBlbmQgb2YgQ1NTUHJvcGVydHlJRCBlbnVt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg4ODgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IGxv bmdoYW5kcyBzaG91bGQgbWF0dGVyIGR1cmluZyB0aGUgQ1NTIENhc2NhZGUsIHNvIGJ5IHNvcnRp bmcKKyAgICAgICAgc2hvcnRoYW5kcyBhdCB0aGUgZW5kLCBhbmQgaWdub3JpbmcgdGhlbSwgd2Ug Y2FuIHNhdmUgc29tZSBtZW1vcnkgYW5kCisgICAgICAgIGF2b2lkIHNvbWUgaXRlcmF0aW9ucy4K KworICAgICAgICBObyB0ZXN0IHNpbmNlIG5vdyB0aGVyZSBzaG91bGQgYmUgbm8gb2JzZXJ2YWJs ZSBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0eVNob3J0 aGFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc1Nob3J0aGFuZENTU1Byb3BlcnR5KTogRGVs ZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZC5oOgorICAgICAgICAo V2ViQ29yZTo6aXNTaG9ydGhhbmRDU1NQcm9wZXJ0eSk6CisgICAgICAgIFR1cm4gZnVuY3Rpb24g aW50byBhIHNpbXBsZSBjb25zdGV4cHIgY29tcGFyaXNvbi4KKworICAgICAgICAqIGNzcy9tYWtl cHJvcC5wbDoKKyAgICAgICAgKGFkZFByb3BlcnR5KToKKyAgICAgICAgKHNvcnRCeURlc2NlbmRp bmdQcmlvcml0eUFuZE5hbWUpOgorICAgICAgICBTb3J0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGF0 IHRoZSBlbmQuCisKKyAgICAgICAgKiBzdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaDoKKyAgICAgICAg VXBkYXRlIGNvbW1lbnQuCisKIDIwMjItMDQtMjggIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBh cHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBNYWtlIFdlYkltYWdlIGJlIGJhY2tl ZCBieSBJbWFnZUJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv cGVydHlTaG9ydGhhbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTaG9y dGhhbmQuY3BwCmluZGV4IDY3NTdhYjdlOTNlOTE4OTg5OTc4ZDk0NWZmYzY3N2I3NTVlMDY5NzEu LmQ4YjY3ZjhiYzk4MjVmM2Y1ZDdiZTBjMzMzOTBmNmU1MDNiNmExNDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZC5jcHAKQEAgLTUzLDExICs1Myw2IEBA IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQgdHJhbnNpdGlvblNob3J0aGFuZEZvclBhcnNpbmcoKQog ICAgIHJldHVybiBTdHlsZVByb3BlcnR5U2hvcnRoYW5kKENTU1Byb3BlcnR5VHJhbnNpdGlvbiwg dHJhbnNpdGlvblByb3BlcnRpZXMpOwogfQogCi1ib29sIGlzU2hvcnRoYW5kQ1NTUHJvcGVydHko Q1NTUHJvcGVydHlJRCBpZCkKLXsKLSAgICByZXR1cm4gc2hvcnRoYW5kRm9yUHJvcGVydHkoaWQp Lmxlbmd0aCgpOwotfQotCiB1bnNpZ25lZCBpbmRleE9mU2hvcnRoYW5kRm9yTG9uZ2hhbmQoQ1NT UHJvcGVydHlJRCBzaG9ydGhhbmRJRCwgY29uc3QgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZFZlY3Rv ciYgc2hvcnRoYW5kcykKIHsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwLCBzaXplID0gc2hvcnRo YW5kcy5zaXplKCk7IGkgPCBzaXplOyArK2kpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQ cm9wZXJ0eVNob3J0aGFuZC5oCmluZGV4IDJlNTgyZTIwMTBjOTM3ZThkZDA5MzEyMDI1ZWU1OTY4 NjYwMTczZGQuLjc0MzRmMTY3NWMwYWFjMGExNmNlYjNhYTBhMDBmOGEzODJhYTBiZjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTaG9ydGhhbmQuaApAQCAtNjYsNiArNjYs OSBAQCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kVmVjdG9yIG1hdGNoaW5nU2hvcnRoYW5kc0Zvckxv bmdoYW5kKENTU1Byb3BlcnR5SUQpOwogCiB1bnNpZ25lZCBpbmRleE9mU2hvcnRoYW5kRm9yTG9u Z2hhbmQoQ1NTUHJvcGVydHlJRCwgY29uc3QgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZFZlY3RvciYp OwogCi1ib29sIGlzU2hvcnRoYW5kQ1NTUHJvcGVydHkoQ1NTUHJvcGVydHlJRCk7Citjb25zdGV4 cHIgYm9vbCBpc1Nob3J0aGFuZENTU1Byb3BlcnR5KENTU1Byb3BlcnR5SUQgaWQpCit7CisgICAg cmV0dXJuIGlkID49IGZpcnN0U2hvcnRoYW5kUHJvcGVydHkgJiYgaWQgPD0gbGFzdFNob3J0aGFu ZFByb3BlcnR5OworfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3Au cGwKaW5kZXggNDI0MjZlZWFiZThhMmY3MWM3M2RjMWMyNjc5MTk4NWJlZjU5Y2IyZS4uMTM4MzAw MmY0M2YyOGEyZDEwY2QwOGY0NGE0MzIzNzRmNTNjMmQyYSAxMDA3NTUKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL21ha2Vwcm9wLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5w bApAQCAtMjg1LDggKzI4NSwxMCBAQCBzdWIgYWRkUHJvcGVydHkoJCQpCiAgICAgICAgICAgICAg ICAgfSBlbHNpZiAoJGNvZGVnZW5PcHRpb25OYW1lIGVxICJjb21tZW50IikgewogICAgICAgICAg ICAgICAgICAgICBuZXh0OwogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRjb2RlZ2VuT3B0aW9u TmFtZSBlcSAiaGlnaC1wcmlvcml0eSIpIHsKKyAgICAgICAgICAgICAgICAgICAgZGllICIkbmFt ZSBpcyBhIHNob3J0aGFuZCwgYnV0IGhhcyBoaWdoLXByaW9yaXR5IiBpZiBleGlzdHMgJGNvZGVn ZW5Qcm9wZXJ0aWVzLT57ImxvbmdoYW5kcyJ9OwogICAgICAgICAgICAgICAgICAgICAkbmFtZUlz SGlnaFByaW9yaXR5eyRuYW1lfSA9IDE7CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJGNvZGVn ZW5PcHRpb25OYW1lIGVxICJzaW5rLXByaW9yaXR5IikgeworICAgICAgICAgICAgICAgICAgICBk aWUgIiRuYW1lIGlzIGEgc2hvcnRoYW5kLCBidXQgaGFzIHNpbmstcHJpb3JpdHkiIGlmIGV4aXN0 cyAkY29kZWdlblByb3BlcnRpZXMtPnsibG9uZ2hhbmRzIn07CiAgICAgICAgICAgICAgICAgICAg ICRuYW1lUHJpb3JpdHlTaG91bGRTaW5reyRuYW1lfSA9IDE7CiAgICAgICAgICAgICAgICAgfSBl bHNpZiAoJGNvZGVnZW5PcHRpb25OYW1lIGVxICJyZWxhdGVkLXByb3BlcnR5IikgewogICAgICAg ICAgICAgICAgICAgICAkbmFtZUlzRGVmZXJyZWR7JG5hbWV9ID0gMTsKQEAgLTM1NiwxNCArMzU4 LDIxIEBAIHN1YiBhZGRQcm9wZXJ0eSgkJCkKIAogc3ViIHNvcnRCeURlc2NlbmRpbmdQcmlvcml0 eUFuZE5hbWUKIHsKLSAgICAjIFNvcnQgbmFtZXMgd2l0aCBoaWdoIHByaW9yaXR5IHRvIHRoZSBm cm9udAorICAgICMgU29ydCBzaG9ydGhhbmRzIHRvIHRoZSBiYWNrCisgICAgaWYgKGV4aXN0cyAk cHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRpb25zeyRhfXsibG9uZ2hhbmRzIn0gPCBleGlz dHMgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skYn17ImxvbmdoYW5kcyJ9KSB7 CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisgICAgaWYgKGV4aXN0cyAkcHJvcGVydGllc1dp dGhTdHlsZUJ1aWxkZXJPcHRpb25zeyRhfXsibG9uZ2hhbmRzIn0gPiBleGlzdHMgJHByb3BlcnRp ZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skYn17ImxvbmdoYW5kcyJ9KSB7CisgICAgICAgIHJl dHVybiAxOworICAgIH0KKyAgICAjIFNvcnQgbG9uZ2hhbmRzIHdpdGggaGlnaCBwcmlvcml0eSB0 byB0aGUgZnJvbnQKICAgICBpZiAoISEkbmFtZUlzSGlnaFByaW9yaXR5eyRhfSA8ICEhJG5hbWVJ c0hpZ2hQcmlvcml0eXskYn0pIHsKICAgICAgICAgcmV0dXJuIDE7CiAgICAgfQogICAgIGlmICgh ISRuYW1lSXNIaWdoUHJpb3JpdHl7JGF9ID4gISEkbmFtZUlzSGlnaFByaW9yaXR5eyRifSkgewog ICAgICAgICByZXR1cm4gLTE7CiAgICAgfQotICAgICMgRGVmZXIgbmFtZXMgd2l0aCBhIHJlbGF0 ZWQgcHJvcGVydHkgdG8gdGhlIGJhY2sKKyAgICAjIFNvcnQgZGVmZXJyZWQgbG9uZ2hhbmRzIHRv IHRoZSBiYWNrLCBiZWZvcmUgc2hvcnRoYW5kcwogICAgIGlmICghISRuYW1lSXNEZWZlcnJlZHsk YX0gPCAhISRuYW1lSXNEZWZlcnJlZHskYn0pIHsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0K QEAgLTg1MCw5ICs4NTksMTQgQEAgbXkgJGZpcnN0TG93UHJpb3JpdHlQcm9wZXJ0eU5hbWU7CiBt eSAkbGFzdExvd1ByaW9yaXR5UHJvcGVydHlOYW1lOwogbXkgJGZpcnN0RGVmZXJyZWRQcm9wZXJ0 eU5hbWU7CiBteSAkbGFzdERlZmVycmVkUHJvcGVydHlOYW1lOworbXkgJGZpcnN0U2hvcnRoYW5k UHJvcGVydHlOYW1lOworbXkgJGxhc3RTaG9ydGhhbmRQcm9wZXJ0eU5hbWU7CiBmb3JlYWNoIG15 ICRuYW1lIChAbmFtZXMpIHsKICAgIyBBc3N1bWVzIHRoYXQgQG5hbWVzIGlzIHNvcnRlZCBieSBk ZXNjZW5kaW5nIHByaW9yaXRpZXMuCi0gIGlmICgkbmFtZUlzSGlnaFByaW9yaXR5eyRuYW1lfSkg eworICBpZiAoZXhpc3RzICRwcm9wZXJ0aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JG5hbWV9 eyJsb25naGFuZHMifSkgeworICAgICRmaXJzdFNob3J0aGFuZFByb3BlcnR5TmFtZSA9ICRuYW1l IGlmICEkZmlyc3RTaG9ydGhhbmRQcm9wZXJ0eU5hbWU7CisgICAgJGxhc3RTaG9ydGhhbmRQcm9w ZXJ0eU5hbWUgPSAkbmFtZTsKKyAgfSBlbHNpZiAoJG5hbWVJc0hpZ2hQcmlvcml0eXskbmFtZX0p IHsKICAgICAkZmlyc3RIaWdoUHJpb3JpdHlQcm9wZXJ0eU5hbWUgPSAkbmFtZSBpZiAhJGZpcnN0 SGlnaFByaW9yaXR5UHJvcGVydHlOYW1lOwogICAgICRsYXN0SGlnaFByaW9yaXR5UHJvcGVydHlO YW1lID0gJG5hbWU7CiAgIH0gZWxzaWYgKCEkbmFtZUlzRGVmZXJyZWR7JG5hbWV9KSB7CkBAIC04 ODEsNyArODk1LDkgQEAgcHJpbnQgSEVBREVSICJjb25zdCBDU1NQcm9wZXJ0eUlEIGxhc3RIaWdo UHJpb3JpdHlQcm9wZXJ0eSA9IENTU1Byb3BlcnR5IiAuICRuYW0KIHByaW50IEhFQURFUiAiY29u c3QgQ1NTUHJvcGVydHlJRCBmaXJzdExvd1ByaW9yaXR5UHJvcGVydHkgPSBDU1NQcm9wZXJ0eSIg LiAkbmFtZVRvSWR7JGZpcnN0TG93UHJpb3JpdHlQcm9wZXJ0eU5hbWV9IC4gIjtcbiI7CiBwcmlu dCBIRUFERVIgImNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdExvd1ByaW9yaXR5UHJvcGVydHkgPSBD U1NQcm9wZXJ0eSIgLiAkbmFtZVRvSWR7JGxhc3RMb3dQcmlvcml0eVByb3BlcnR5TmFtZX0gLiAi O1xuIjsKIHByaW50IEhFQURFUiAiY29uc3QgQ1NTUHJvcGVydHlJRCBmaXJzdERlZmVycmVkUHJv cGVydHkgPSBDU1NQcm9wZXJ0eSIgLiAkbmFtZVRvSWR7JGZpcnN0RGVmZXJyZWRQcm9wZXJ0eU5h bWV9IC4gIjtcbiI7Ci1wcmludCBIRUFERVIgImNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdERlZmVy cmVkUHJvcGVydHkgPSBDU1NQcm9wZXJ0eSIgLiAkbmFtZVRvSWR7JGxhc3REZWZlcnJlZFByb3Bl cnR5TmFtZX0gLiAiO1xuXG4iOworcHJpbnQgSEVBREVSICJjb25zdCBDU1NQcm9wZXJ0eUlEIGxh c3REZWZlcnJlZFByb3BlcnR5ID0gQ1NTUHJvcGVydHkiIC4gJG5hbWVUb0lkeyRsYXN0RGVmZXJy ZWRQcm9wZXJ0eU5hbWV9IC4gIjtcbiI7CitwcmludCBIRUFERVIgImNvbnN0IENTU1Byb3BlcnR5 SUQgZmlyc3RTaG9ydGhhbmRQcm9wZXJ0eSA9IENTU1Byb3BlcnR5IiAuICRuYW1lVG9JZHskZmly c3RTaG9ydGhhbmRQcm9wZXJ0eU5hbWV9IC4gIjtcbiI7CitwcmludCBIRUFERVIgImNvbnN0IENT U1Byb3BlcnR5SUQgbGFzdFNob3J0aGFuZFByb3BlcnR5ID0gQ1NTUHJvcGVydHkiIC4gJG5hbWVU b0lkeyRsYXN0U2hvcnRoYW5kUHJvcGVydHlOYW1lfSAuICI7XG5cbiI7CiAKIHByaW50IEhFQURF UiAic3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgY29tcHV0ZWRQcm9wZXJ0eUlEc1tdID0ge1xu IjsKIG15ICRudW1Db21wdXRlZFByb3BlcnR5SURzID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJv cGVydHlDYXNjYWRlLmgKaW5kZXggNGYxOTNiOGUwOTY2MGE5NzJlNmQ1NGYxZjAzMWE3M2I1YmM0 MzkwMS4uNWY4YmI4NjlmODIzYjQyZDkwODIxOTdjYTQ1ODg0NTRlY2JlZTBjYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmgKQEAgLTg5LDExICs4OSwxMiBAQCBwcml2YXRl OgogCiAgICAgLy8gVGhlIENTU1Byb3BlcnR5SUQgZW51bSBpcyBzb3J0ZWQgbGlrZSB0aGlzOgog ICAgIC8vIDEuIENTU1Byb3BlcnR5SW52YWxpZCBhbmQgQ1NTUHJvcGVydHlDdXN0b20uCi0gICAg Ly8gMi4gTm9ybWFsIHByb3BlcnRpZXMgKGhpZ2ggcHJpb3JpdHkgb25lcyBmb2xsb3dlZCBieSBs b3cgcHJpb3JpdHkgb25lcykuCi0gICAgLy8gMy4gRGVmZXJyZWQgcHJvcGVydGllcy4KKyAgICAv LyAyLiBOb3JtYWwgbG9uZ2hhbmQgcHJvcGVydGllcyAoaGlnaCBwcmlvcml0eSBvbmVzIGZvbGxv d2VkIGJ5IGxvdyBwcmlvcml0eSBvbmVzKS4KKyAgICAvLyAzLiBEZWZlcnJlZCBsb25naGFuZCBw cm9wZXJ0aWVzLgorICAgIC8vIDQuIFNob3J0aGFuZCBwcm9wZXJ0aWVzLgogICAgIC8vCi0gICAg Ly8gJ21fcHJvcGVydGllcycgaXMgdXNlZCBmb3IgYm90aCBub3JtYWwgYW5kIGRlZmVycmVkIHBy b3BlcnRpZXMsIHNvIGl0IGhhcyBzaXplICdsYXN0RGVmZXJyZWRQcm9wZXJ0eSArIDEnLgotICAg IC8vIEl0IGNvdWxkIGFjdHVhbGx5IHVzZSAnbnVtQ1NTUHJvcGVydGllcycsIGJ1dCB0aGVuIHdl IHdvdWxkIGhhdmUgdG8gc3VidHJhY3QgJ2ZpcnN0Q1NTUHJvcGVydHknLCB3aGljaCBtYXkgbm90 IGJlIHdvcnRoIGl0LgorICAgIC8vICdtX3Byb3BlcnRpZXMnIGlzIHVzZWQgZm9yIGJvdGggbm9y bWFsIGFuZCBkZWZlcnJlZCBsb25naGFuZHMsIHNvIGl0IGhhcyBzaXplICdsYXN0RGVmZXJyZWRQ cm9wZXJ0eSArIDEnLgorICAgIC8vIEl0IGNvdWxkIGFjdHVhbGx5IGJlIDIgdW5pdHMgc21hbGxl ciwgYnV0IHRoZW4gd2Ugd291bGQgaGF2ZSB0byBzdWJ0cmFjdCAnZmlyc3RDU1NQcm9wZXJ0eScs IHdoaWNoIG1heSBub3QgYmUgd29ydGggaXQuCiAgICAgLy8gJ21fcHJvcGVydHlJc1ByZXNlbnQn IGlzIG5vdCB1c2VkIGZvciBkZWZlcnJlZCBwcm9wZXJ0aWVzLCBzbyB3ZSBvbmx5IG5lZWQgdG8g Y292ZXIgdXAgdG8gdGhlIGxhc3QgbG93IHByaW9yaXR5IG9uZS4KICAgICBzdGQ6OmFycmF5PFBy b3BlcnR5LCBsYXN0RGVmZXJyZWRQcm9wZXJ0eSArIDE+IG1fcHJvcGVydGllczsKICAgICBzdGQ6 OmJpdHNldDxsYXN0TG93UHJpb3JpdHlQcm9wZXJ0eSArIDE+IG1fcHJvcGVydHlJc1ByZXNlbnQ7 Cg==