228130 2021-07-20 15:58:44 -0700 [css-logical] Simplify logical property groups 2022-01-18 04:29:56 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 obrufau obrufau esprehn+autocc ews-watchlist glenn gyuyoung.kim koivisto macpherson menard webkit-bug-importer oldest_to_newest 1778298 0 obrufau 2021-07-20 15:58:44 -0700 Currently, makeprop.pl has my %resolverKinds = ( "logical" => { "block" => "axis", "inline" => "axis", "block-start" => "side", "block-end" => "side", "inline-start" => "side", "inline-end" => "side", "start-start" => "corner", "start-end" => "corner", "end-start" => "corner", "end-end" => "corner", }, "physical" => { "horizontal" => "axis", "vertical" => "axis", "top" => "side", "right" => "side", "bottom" => "side", "left" => "side", "top-left" => "corner", "top-right" => "corner", "bottom-right" => "corner", "bottom-left" => "corner", }, ); So many repeated values, it would be better to structure it like: my %logicalPropertyResolvers = ( "logical" => { "axis" => ["inline", "block"], "side" => ["block-start", "inline-end", "block-end", "inline-start"], "corner" => ["start-start", "start-end", "end-start", "end-end"], }, "physical" => { "axis" => ["horizontal", "vertical"], "side" => ["top", "right", "bottom", "left"], "corner" => ["top-left", "top-right", "bottom-right", "bottom-left"], }, ); And this would avoid having to hardcode the lists in this other piece of code: if ($kind eq "side") { @physicals = ("top", "right", "bottom", "left"); } elsif ($kind eq "corner") { @physicals = ("top-left", "top-right", "bottom-right", "bottom-left"); } elsif ($kind eq "axis") { @physicals = ("horizontal", "vertical"); } 1778299 1 433905 obrufau 2021-07-20 16:02:05 -0700 Created attachment 433905 Patch 1779867 2 webkit-bug-importer 2021-07-27 15:59:21 -0700 <rdar://problem/81187057> 1831538 3 449343 obrufau 2022-01-17 11:33:13 -0800 Created attachment 449343 Patch 1831579 4 obrufau 2022-01-17 16:06:33 -0800 Antti, can you take a look? Not urgent. 1831616 5 449343 koivisto 2022-01-17 23:31:02 -0800 Comment on attachment 449343 Patch rs=me 1831656 6 ews-feeder 2022-01-18 04:29:53 -0800 Committed r288114 (246128@main): <https://commits.webkit.org/246128@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449343. 433905 2021-07-20 16:02:05 -0700 2022-01-17 11:33:08 -0800 Patch bug-228130-20210721010203.patch text/plain 6798 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA2MDY2MWJiYjA4ZmI5 ZjdlMTE3MDE2OTM2NTI3ZTYzYTM1YTMzNC4uNDhiMmU5MjY0NjZhOTMzOTk0ODExNDg3MjZlYTBl MzkyMGRkNjYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA3LTIwICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1sb2dpY2FsXSBT aW1wbGlmeSBsb2dpY2FsIHByb3BlcnR5IGdyb3VwcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3JzIGxvZ2ljYWwgcHJvcGVydHkgZ3JvdXAg Y29kZSBpbiBtYWtlcHJvcC5wbCB0byBtYWtlIGl0IGEgYml0CisgICAgICAgIG1vcmUgc2ltcGxl IGFuZCBlYXN5IHRoZSBleHRlbmQgaWYgbmV3IGtpbmRzIG9mIGxvZ2ljYWwgcHJvcGVydGllcyBh cmUKKyAgICAgICAgaW50cm9kdWNlZCBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBzaW5jZSBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBjc3MvbWFrZXBy b3AucGw6CisgICAgICAgIChhZGRQcm9wZXJ0eSk6CisKIDIwMjEtMDctMTYgIEFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gVXBkYXRl IHRoZSBmcmFnbWVudGVkIHN0YXR1cyBvZiB0aGUgcmVuZGVyZXIgd2hlbiBpdCBiZWNvbWVzIGlu LWZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAppbmRleCA1OTk3NjZiOGYxMTljYjAzNzI3Nzg0ZGFk ZDZlZmY0NzZhODQxYzk4Li5kYWQzNGM2YjNhYzQ3ZjQ3YzVmZTA3OTJlMThiOWQyZWViYTk0YTRh IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCkBAIC03MSwzMCArNzEsMjIgQEAgbXkgJW5hbWVJc0hp Z2hQcmlvcml0eTsKIG15ICVuYW1lSXNJbmhlcml0ZWQ7CiBteSAlbmFtZVByaW9yaXR5U2hvdWxk U2luazsKIG15ICVsb2dpY2FsUHJvcGVydHlHcm91cHM7Ci1teSAlcmVzb2x2ZXJLaW5kcyA9ICgK K215ICVsb2dpY2FsUHJvcGVydHlHcm91cFJlc29sdmVycyA9ICgKICAgICAibG9naWNhbCIgPT4g ewotICAgICAgICAiYmxvY2siID0+ICJheGlzIiwKLSAgICAgICAgImlubGluZSIgPT4gImF4aXMi LAotICAgICAgICAiYmxvY2stc3RhcnQiID0+ICJzaWRlIiwKLSAgICAgICAgImJsb2NrLWVuZCIg PT4gInNpZGUiLAotICAgICAgICAiaW5saW5lLXN0YXJ0IiA9PiAic2lkZSIsCi0gICAgICAgICJp bmxpbmUtZW5kIiA9PiAic2lkZSIsCi0gICAgICAgICJzdGFydC1zdGFydCIgPT4gImNvcm5lciIs Ci0gICAgICAgICJzdGFydC1lbmQiID0+ICJjb3JuZXIiLAotICAgICAgICAiZW5kLXN0YXJ0IiA9 PiAiY29ybmVyIiwKLSAgICAgICAgImVuZC1lbmQiID0+ICJjb3JuZXIiLAorICAgICAgICAjIE9y ZGVyIG1hdGNoZXMgTG9naWNhbEJveEF4aXMgZW51bSBpbiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS90ZXh0L1dyaXRpbmdNb2RlLmguCisgICAgICAgICJheGlzIiA9PiBbImlubGluZSIsICJibG9j ayJdLAorICAgICAgICAjIE9yZGVyIG1hdGNoZXMgTG9naWNhbEJveFNpZGUgZW51bSBpbiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1dyaXRpbmdNb2RlLmguCisgICAgICAgICJzaWRlIiA9 PiBbImJsb2NrLXN0YXJ0IiwgImlubGluZS1lbmQiLCAiYmxvY2stZW5kIiwgImlubGluZS1zdGFy dCJdLAorICAgICAgICAjIE9yZGVyIG1hdGNoZXMgTG9naWNhbEJveENvcm5lciBlbnVtIGluIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvV3JpdGluZ01vZGUuaC4KKyAgICAgICAgImNvcm5l ciIgPT4gWyJzdGFydC1zdGFydCIsICJzdGFydC1lbmQiLCAiZW5kLXN0YXJ0IiwgImVuZC1lbmQi XSwKICAgICB9LAogICAgICJwaHlzaWNhbCIgPT4gewotICAgICAgICAiaG9yaXpvbnRhbCIgPT4g ImF4aXMiLAotICAgICAgICAidmVydGljYWwiID0+ICJheGlzIiwKLSAgICAgICAgInRvcCIgPT4g InNpZGUiLAotICAgICAgICAicmlnaHQiID0+ICJzaWRlIiwKLSAgICAgICAgImJvdHRvbSIgPT4g InNpZGUiLAotICAgICAgICAibGVmdCIgPT4gInNpZGUiLAotICAgICAgICAidG9wLWxlZnQiID0+ ICJjb3JuZXIiLAotICAgICAgICAidG9wLXJpZ2h0IiA9PiAiY29ybmVyIiwKLSAgICAgICAgImJv dHRvbS1yaWdodCIgPT4gImNvcm5lciIsCi0gICAgICAgICJib3R0b20tbGVmdCIgPT4gImNvcm5l ciIsCisgICAgICAgICMgT3JkZXIgbWF0Y2hlcyBCb3hBeGlzIGVudW0gaW4gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9Xcml0aW5nTW9kZS5oLgorICAgICAgICAiYXhpcyIgPT4gWyJob3Jp em9udGFsIiwgInZlcnRpY2FsIl0sCisgICAgICAgICMgT3JkZXIgbWF0Y2hlcyBCb3hTaWRlIGVu dW0gaW4gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Xcml0aW5nTW9kZS5oLgorICAgICAg ICAic2lkZSIgPT4gWyJ0b3AiLCAicmlnaHQiLCAiYm90dG9tIiwgImxlZnQiXSwKKyAgICAgICAg IyBPcmRlciBtYXRjaGVzIEJveENvcm5lciBlbnVtIGluIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3RleHQvV3JpdGluZ01vZGUuaC4KKyAgICAgICAgImNvcm5lciIgPT4gWyJ0b3AtbGVmdCIsICJ0 b3AtcmlnaHQiLCAiYm90dG9tLXJpZ2h0IiwgImJvdHRvbS1sZWZ0Il0sCiAgICAgfSwKICk7CiBt eSAlcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRpb25zOwpAQCAtMTM0LDE2ICsxMjYsMTUg QEAgZm9yIG15ICRuYW1lIChAYWxsTmFtZXMpIHsKIH0KIAogd2hpbGUgKG15ICgkZ3JvdXBOYW1l LCAkbG9naWNhbFByb3BlcnR5R3JvdXApID0gZWFjaCAlbG9naWNhbFByb3BlcnR5R3JvdXBzKSB7 Ci0gICAgZm9yIG15ICRsb2dpYyAoa2V5cyAlcmVzb2x2ZXJLaW5kcykgeworICAgIG15ICRraW5k ID0gJGxvZ2ljYWxQcm9wZXJ0eUdyb3VwLT57ImtpbmQifTsKKyAgICB3aGlsZSAobXkgKCRsb2dp YywgJHJlc29sdmVyc0ZvckxvZ2ljKSA9IGVhY2ggJWxvZ2ljYWxQcm9wZXJ0eUdyb3VwUmVzb2x2 ZXJzKSB7CiAgICAgICAgIG15ICRwcm9wZXJ0aWVzID0gJGxvZ2ljYWxQcm9wZXJ0eUdyb3VwLT57 JGxvZ2ljfTsKICAgICAgICAgaWYgKCEkcHJvcGVydGllcykgewogICAgICAgICAgICAgZGllICJM b2dpY2FsIHByb3BlcnR5IGdyb3VwIFwiJGdyb3VwTmFtZVwiIGhhcyBubyBcIiRsb2dpY1wiIHBy b3BlcnR5LiI7CiAgICAgICAgIH0KLSAgICAgICAgd2hpbGUgKG15ICgkcmVzb2x2ZXIsICRraW5k KSA9IGVhY2ggJXsgJHJlc29sdmVyS2luZHN7JGxvZ2ljfSB9KSB7Ci0gICAgICAgICAgICBpZiAo JGtpbmQgZXEgJGxvZ2ljYWxQcm9wZXJ0eUdyb3VwLT57ImtpbmQifSkgewotICAgICAgICAgICAg ICAgIGlmICghJHByb3BlcnRpZXMtPnskcmVzb2x2ZXJ9KSB7Ci0gICAgICAgICAgICAgICAgICAg IGRpZSAiTG9naWNhbCBwcm9wZXJ0eSBncm91cCBcIiRncm91cE5hbWVcIiByZXF1aXJlcyBhIFwi JHJlc29sdmVyXCIgcHJvcGVydHkuIjsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgIGZvciBt eSAkcmVzb2x2ZXIgKEB7ICRyZXNvbHZlcnNGb3JMb2dpYy0+eyRraW5kfSB9KSB7CisgICAgICAg ICAgICBpZiAoISRwcm9wZXJ0aWVzLT57JHJlc29sdmVyfSkgeworICAgICAgICAgICAgICAgIGRp ZSAiTG9naWNhbCBwcm9wZXJ0eSBncm91cCBcIiRncm91cE5hbWVcIiByZXF1aXJlcyBhIFwiJHJl c29sdmVyXCIgcHJvcGVydHkuIjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAg LTMxNCwxMSArMzA1LDE3IEBAIHN1YiBhZGRQcm9wZXJ0eSgkJCkKICAgICAgICAgICAgICAgICAg ICAgbXkgJHJlc29sdmVyID0gJGNvZGVnZW5Qcm9wZXJ0aWVzLT57JGNvZGVnZW5PcHRpb25OYW1l fXsicmVzb2x2ZXIifTsKICAgICAgICAgICAgICAgICAgICAgbXkgJGtpbmQ7CiAgICAgICAgICAg ICAgICAgICAgIG15ICRsb2dpYzsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCRraW5kID0gJHJl c29sdmVyS2luZHN7ImxvZ2ljYWwifXskcmVzb2x2ZXJ9KSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAkbG9naWMgPSAibG9naWNhbCI7Ci0gICAgICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRr aW5kID0gJHJlc29sdmVyS2luZHN7InBoeXNpY2FsIn17JHJlc29sdmVyfSkgewotICAgICAgICAg ICAgICAgICAgICAgICAgJGxvZ2ljID0gInBoeXNpY2FsIjsKLSAgICAgICAgICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgd2hpbGUgKG15ICgkY3VycmVudExvZ2ljLCAk cmVzb2x2ZXJzRm9yTG9naWMpID0gZWFjaCAlbG9naWNhbFByb3BlcnR5R3JvdXBSZXNvbHZlcnMp IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHdoaWxlIChteSAoJGN1cnJlbnRLaW5kLCAkcmVz b2x2ZXJMaXN0KSA9IGVhY2ggJXsgJHJlc29sdmVyc0ZvckxvZ2ljIH0pIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBmb3IgbXkgJGN1cnJlbnRSZXNvbHZlciAoQHsgJHJlc29sdmVyTGlz dCB9KSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkY3VycmVudFJlc29s dmVyIGVxICRyZXNvbHZlcikgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JGtpbmQgPSAkY3VycmVudEtpbmQ7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAkbG9naWMgPSAkY3VycmVudExvZ2ljOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmICghJGtp bmQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGRpZSAiVW5yZWNvZ25pemVkIHJlc29sdmVy IFwiJHJlc29sdmVyXCIgZm9yIGNvZGVnZW4gcHJvcGVydHkgXCIkY29kZWdlbk9wdGlvbk5hbWVc IiBmb3IgJG5hbWUgcHJvcGVydHkuIjsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgICAgICBteSAkb3RoZXJLaW5kID0gJGxvZ2ljYWxQcm9wZXJ0eUdyb3Vwc3skZ3JvdXBO YW1lfXsia2luZCJ9OwpAQCAtNzIxLDE3ICs3MTgsOCBAQCBmb3IgbXkgJGxvZ2ljYWxQcm9wZXJ0 eUdyb3VwICh2YWx1ZXMgJWxvZ2ljYWxQcm9wZXJ0eUdyb3VwcykgewogICAgICAgICBteSAka2lu ZCA9ICRsb2dpY2FsUHJvcGVydHlHcm91cC0+eyJraW5kIn07CiAgICAgICAgIG15ICRraW5kSWQg PSBuYW1lVG9JZCgka2luZCk7CiAgICAgICAgIG15ICRyZXNvbHZlckVudW0gPSAiTG9naWNhbEJv eCIgLiAka2luZElkIC4gIjo6IiAuIG5hbWVUb0lkKCRyZXNvbHZlcik7Ci0gICAgICAgIG15IEBw aHlzaWNhbHM7Ci0gICAgICAgIGlmICgka2luZCBlcSAic2lkZSIpIHsKLSAgICAgICAgICAgIEBw aHlzaWNhbHMgPSAoInRvcCIsICJyaWdodCIsICJib3R0b20iLCAibGVmdCIpOwotICAgICAgICB9 IGVsc2lmICgka2luZCBlcSAiY29ybmVyIikgewotICAgICAgICAgICAgQHBoeXNpY2FscyA9ICgi dG9wLWxlZnQiLCAidG9wLXJpZ2h0IiwgImJvdHRvbS1yaWdodCIsICJib3R0b20tbGVmdCIpOwot ICAgICAgICB9IGVsc2lmICgka2luZCBlcSAiYXhpcyIpIHsKLSAgICAgICAgICAgIEBwaHlzaWNh bHMgPSAoImhvcml6b250YWwiLCAidmVydGljYWwiKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgIGRpZSAiUHJvcGVydHkgXCIkbmFtZVwiIGJlbG9uZ3MgdG8gYSBsb2dpY2FsIHByb3Bl cnR5IGdyb3VwIG9mIHVucmVjb2duaXplZCBraW5kIFwiJGtpbmRcIi4iOwotICAgICAgICB9Ci0g ICAgICAgIG15IEBwcm9wZXJ0aWVzID0gbWFwIHsgIkNTU1Byb3BlcnR5IiAuICRuYW1lVG9JZHsk bG9naWNhbFByb3BlcnR5R3JvdXAtPnsicGh5c2ljYWwifXskX319IH0gQHBoeXNpY2FsczsKKyAg ICAgICAgbXkgJHBoeXNpY2FscyA9ICRsb2dpY2FsUHJvcGVydHlHcm91cFJlc29sdmVyc3sicGh5 c2ljYWwifS0+eyRraW5kfTsKKyAgICAgICAgbXkgQHByb3BlcnRpZXMgPSBtYXAgeyAiQ1NTUHJv cGVydHkiIC4gJG5hbWVUb0lkeyRsb2dpY2FsUHJvcGVydHlHcm91cC0+eyJwaHlzaWNhbCJ9eyRf fX0gfSBAeyAkcGh5c2ljYWxzIH07CiAgICAgICAgIHByaW50IEdQRVJGICIgICAgY2FzZSBDU1NQ cm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eSIgLiAkbmFtZVRvSWR7JG5hbWV9IC4gIjoge1xuIjsKICAg ICAgICAgcHJpbnQgR1BFUkYgIiAgICAgICAgc3RhdGljIGNvbnN0ZXhwciBDU1NQcm9wZXJ0eUlE IHByb3BlcnRpZXNbIiAuIHNjYWxhcihAcHJvcGVydGllcykgLiAiXSA9IHsgIiAuIGpvaW4oIiwg IiwgQHByb3BlcnRpZXMpIC4gIiB9O1xuIjsKICAgICAgICAgcHJpbnQgR1BFUkYgIiAgICAgICAg cmV0dXJuIHByb3BlcnRpZXNbc3RhdGljX2Nhc3Q8c2l6ZV90PihtYXBMb2dpY2FsIiAuICRraW5k SWQgLiAiVG9QaHlzaWNhbCIgLiAka2luZElkIC4gIih0ZXh0ZmxvdywgIiAuICRyZXNvbHZlckVu dW0gLiAiKSldO1xuIjsK 449343 2022-01-17 11:33:13 -0800 2022-01-18 04:29:55 -0800 Patch bug-228130-20220117203311.patch text/plain 6815 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNmOTQ4ZjI3NzBmMTA0 MjQ3OTAyYzdjYWE0NjAwYTczYzk5MDQ4Zi4uMzliYzE1MWIzYTU1YWJiMjA0MDA1MzM5NGY1MzEz OTI1YmNlZTYwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA3LTIwICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1sb2dpY2FsXSBT aW1wbGlmeSBsb2dpY2FsIHByb3BlcnR5IGdyb3VwcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3JzIGxvZ2ljYWwgcHJvcGVydHkgZ3JvdXAg Y29kZSBpbiBtYWtlcHJvcC5wbCB0byBtYWtlIGl0IGEgYml0CisgICAgICAgIG1vcmUgc2ltcGxl IGFuZCBlYXN5IHRoZSBleHRlbmQgaWYgbmV3IGtpbmRzIG9mIGxvZ2ljYWwgcHJvcGVydGllcyBh cmUKKyAgICAgICAgaW50cm9kdWNlZCBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBzaW5jZSBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBjc3MvbWFrZXBy b3AucGw6CisgICAgICAgIChhZGRQcm9wZXJ0eSk6CisKIDIwMjItMDEtMTcgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgU2VydmljZVdvcmtlckNsaWVu dC5pZCBhIFVVSUQgaW5zdGVhZCBvZiBhIHN0cmluZyBkZXJpdmVkIGZyb20gYSBTY3JpcHRFeGVj dXRpb25Db250ZXh0SWRlbnRpZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL21h a2Vwcm9wLnBsIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCmluZGV4IDFhOWY5YzA4 YmUwZmY2MjYxNDRmOTI2OGM2ODJlZDFkZDI3MjNmZWMuLjMxMzVjODY2YTQ5NTRlZWMxMGVmNTI2 NDg1YjdlZGY4ZDQ2ZGNlMGEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJv cC5wbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKQEAgLTcxLDMwICs3MSwy MiBAQCBteSAlbmFtZUlzSGlnaFByaW9yaXR5OwogbXkgJW5hbWVJc0luaGVyaXRlZDsKIG15ICVu YW1lUHJpb3JpdHlTaG91bGRTaW5rOwogbXkgJWxvZ2ljYWxQcm9wZXJ0eUdyb3VwczsKLW15ICVy ZXNvbHZlcktpbmRzID0gKAorbXkgJWxvZ2ljYWxQcm9wZXJ0eUdyb3VwUmVzb2x2ZXJzID0gKAog ICAgICJsb2dpY2FsIiA9PiB7Ci0gICAgICAgICJibG9jayIgPT4gImF4aXMiLAotICAgICAgICAi aW5saW5lIiA9PiAiYXhpcyIsCi0gICAgICAgICJibG9jay1zdGFydCIgPT4gInNpZGUiLAotICAg ICAgICAiYmxvY2stZW5kIiA9PiAic2lkZSIsCi0gICAgICAgICJpbmxpbmUtc3RhcnQiID0+ICJz aWRlIiwKLSAgICAgICAgImlubGluZS1lbmQiID0+ICJzaWRlIiwKLSAgICAgICAgInN0YXJ0LXN0 YXJ0IiA9PiAiY29ybmVyIiwKLSAgICAgICAgInN0YXJ0LWVuZCIgPT4gImNvcm5lciIsCi0gICAg ICAgICJlbmQtc3RhcnQiID0+ICJjb3JuZXIiLAotICAgICAgICAiZW5kLWVuZCIgPT4gImNvcm5l ciIsCisgICAgICAgICMgT3JkZXIgbWF0Y2hlcyBMb2dpY2FsQm94QXhpcyBlbnVtIGluIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvV3JpdGluZ01vZGUuaC4KKyAgICAgICAgImF4aXMiID0+ IFsiaW5saW5lIiwgImJsb2NrIl0sCisgICAgICAgICMgT3JkZXIgbWF0Y2hlcyBMb2dpY2FsQm94 U2lkZSBlbnVtIGluIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvV3JpdGluZ01vZGUuaC4K KyAgICAgICAgInNpZGUiID0+IFsiYmxvY2stc3RhcnQiLCAiaW5saW5lLWVuZCIsICJibG9jay1l bmQiLCAiaW5saW5lLXN0YXJ0Il0sCisgICAgICAgICMgT3JkZXIgbWF0Y2hlcyBMb2dpY2FsQm94 Q29ybmVyIGVudW0gaW4gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Xcml0aW5nTW9kZS5o LgorICAgICAgICAiY29ybmVyIiA9PiBbInN0YXJ0LXN0YXJ0IiwgInN0YXJ0LWVuZCIsICJlbmQt c3RhcnQiLCAiZW5kLWVuZCJdLAogICAgIH0sCiAgICAgInBoeXNpY2FsIiA9PiB7Ci0gICAgICAg ICJob3Jpem9udGFsIiA9PiAiYXhpcyIsCi0gICAgICAgICJ2ZXJ0aWNhbCIgPT4gImF4aXMiLAot ICAgICAgICAidG9wIiA9PiAic2lkZSIsCi0gICAgICAgICJyaWdodCIgPT4gInNpZGUiLAotICAg ICAgICAiYm90dG9tIiA9PiAic2lkZSIsCi0gICAgICAgICJsZWZ0IiA9PiAic2lkZSIsCi0gICAg ICAgICJ0b3AtbGVmdCIgPT4gImNvcm5lciIsCi0gICAgICAgICJ0b3AtcmlnaHQiID0+ICJjb3Ju ZXIiLAotICAgICAgICAiYm90dG9tLXJpZ2h0IiA9PiAiY29ybmVyIiwKLSAgICAgICAgImJvdHRv bS1sZWZ0IiA9PiAiY29ybmVyIiwKKyAgICAgICAgIyBPcmRlciBtYXRjaGVzIEJveEF4aXMgZW51 bSBpbiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1dyaXRpbmdNb2RlLmguCisgICAgICAg ICJheGlzIiA9PiBbImhvcml6b250YWwiLCAidmVydGljYWwiXSwKKyAgICAgICAgIyBPcmRlciBt YXRjaGVzIEJveFNpZGUgZW51bSBpbiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1dyaXRp bmdNb2RlLmguCisgICAgICAgICJzaWRlIiA9PiBbInRvcCIsICJyaWdodCIsICJib3R0b20iLCAi bGVmdCJdLAorICAgICAgICAjIE9yZGVyIG1hdGNoZXMgQm94Q29ybmVyIGVudW0gaW4gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Xcml0aW5nTW9kZS5oLgorICAgICAgICAiY29ybmVyIiA9 PiBbInRvcC1sZWZ0IiwgInRvcC1yaWdodCIsICJib3R0b20tcmlnaHQiLCAiYm90dG9tLWxlZnQi XSwKICAgICB9LAogKTsKIG15ICVwcm9wZXJ0aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnM7CkBA IC0xMzYsMTYgKzEyOCwxNSBAQCBmb3IgbXkgJG5hbWUgKEBhbGxOYW1lcykgewogfQogCiB3aGls ZSAobXkgKCRncm91cE5hbWUsICRsb2dpY2FsUHJvcGVydHlHcm91cCkgPSBlYWNoICVsb2dpY2Fs UHJvcGVydHlHcm91cHMpIHsKLSAgICBmb3IgbXkgJGxvZ2ljIChrZXlzICVyZXNvbHZlcktpbmRz KSB7CisgICAgbXkgJGtpbmQgPSAkbG9naWNhbFByb3BlcnR5R3JvdXAtPnsia2luZCJ9OworICAg IHdoaWxlIChteSAoJGxvZ2ljLCAkcmVzb2x2ZXJzRm9yTG9naWMpID0gZWFjaCAlbG9naWNhbFBy b3BlcnR5R3JvdXBSZXNvbHZlcnMpIHsKICAgICAgICAgbXkgJHByb3BlcnRpZXMgPSAkbG9naWNh bFByb3BlcnR5R3JvdXAtPnskbG9naWN9OwogICAgICAgICBpZiAoISRwcm9wZXJ0aWVzKSB7CiAg ICAgICAgICAgICBkaWUgIkxvZ2ljYWwgcHJvcGVydHkgZ3JvdXAgXCIkZ3JvdXBOYW1lXCIgaGFz IG5vIFwiJGxvZ2ljXCIgcHJvcGVydHkuIjsKICAgICAgICAgfQotICAgICAgICB3aGlsZSAobXkg KCRyZXNvbHZlciwgJGtpbmQpID0gZWFjaCAleyAkcmVzb2x2ZXJLaW5kc3skbG9naWN9IH0pIHsK LSAgICAgICAgICAgIGlmICgka2luZCBlcSAkbG9naWNhbFByb3BlcnR5R3JvdXAtPnsia2luZCJ9 KSB7Ci0gICAgICAgICAgICAgICAgaWYgKCEkcHJvcGVydGllcy0+eyRyZXNvbHZlcn0pIHsKLSAg ICAgICAgICAgICAgICAgICAgZGllICJMb2dpY2FsIHByb3BlcnR5IGdyb3VwIFwiJGdyb3VwTmFt ZVwiIHJlcXVpcmVzIGEgXCIkcmVzb2x2ZXJcIiBwcm9wZXJ0eS4iOwotICAgICAgICAgICAgICAg IH0KKyAgICAgICAgZm9yIG15ICRyZXNvbHZlciAoQHsgJHJlc29sdmVyc0ZvckxvZ2ljLT57JGtp bmR9IH0pIHsKKyAgICAgICAgICAgIGlmICghJHByb3BlcnRpZXMtPnskcmVzb2x2ZXJ9KSB7Cisg ICAgICAgICAgICAgICAgZGllICJMb2dpY2FsIHByb3BlcnR5IGdyb3VwIFwiJGdyb3VwTmFtZVwi IHJlcXVpcmVzIGEgXCIkcmVzb2x2ZXJcIiBwcm9wZXJ0eS4iOwogICAgICAgICAgICAgfQogICAg ICAgICB9CiAgICAgfQpAQCAtMzE5LDExICszMTAsMTcgQEAgc3ViIGFkZFByb3BlcnR5KCQkKQog ICAgICAgICAgICAgICAgICAgICBteSAkcmVzb2x2ZXIgPSAkY29kZWdlblByb3BlcnRpZXMtPnsk Y29kZWdlbk9wdGlvbk5hbWV9eyJyZXNvbHZlciJ9OwogICAgICAgICAgICAgICAgICAgICBteSAk a2luZDsKICAgICAgICAgICAgICAgICAgICAgbXkgJGxvZ2ljOwotICAgICAgICAgICAgICAgICAg ICBpZiAoJGtpbmQgPSAkcmVzb2x2ZXJLaW5kc3sibG9naWNhbCJ9eyRyZXNvbHZlcn0pIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICRsb2dpYyA9ICJsb2dpY2FsIjsKLSAgICAgICAgICAgICAg ICAgICAgfSBlbHNpZiAoJGtpbmQgPSAkcmVzb2x2ZXJLaW5kc3sicGh5c2ljYWwifXskcmVzb2x2 ZXJ9KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAkbG9naWMgPSAicGh5c2ljYWwiOwotICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICB3aGlsZSAobXkg KCRjdXJyZW50TG9naWMsICRyZXNvbHZlcnNGb3JMb2dpYykgPSBlYWNoICVsb2dpY2FsUHJvcGVy dHlHcm91cFJlc29sdmVycykgeworICAgICAgICAgICAgICAgICAgICAgICAgd2hpbGUgKG15ICgk Y3VycmVudEtpbmQsICRyZXNvbHZlckxpc3QpID0gZWFjaCAleyAkcmVzb2x2ZXJzRm9yTG9naWMg fSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvciBteSAkY3VycmVudFJlc29sdmVy IChAeyAkcmVzb2x2ZXJMaXN0IH0pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aWYgKCRjdXJyZW50UmVzb2x2ZXIgZXEgJHJlc29sdmVyKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAka2luZCA9ICRjdXJyZW50S2luZDsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICRsb2dpYyA9ICRjdXJyZW50TG9naWM7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICAgICAgaWYgKCEka2luZCkgewogICAgICAgICAgICAgICAgICAgICAgICAgZGllICJVbnJl Y29nbml6ZWQgcmVzb2x2ZXIgXCIkcmVzb2x2ZXJcIiBmb3IgY29kZWdlbiBwcm9wZXJ0eSBcIiRj b2RlZ2VuT3B0aW9uTmFtZVwiIGZvciAkbmFtZSBwcm9wZXJ0eS4iOwogICAgICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgICAgIG15ICRvdGhlcktpbmQgPSAkbG9naWNhbFByb3Bl cnR5R3JvdXBzeyRncm91cE5hbWV9eyJraW5kIn07CkBAIC03MjYsMTcgKzcyMyw4IEBAIGZvciBt eSAkbG9naWNhbFByb3BlcnR5R3JvdXAgKHZhbHVlcyAlbG9naWNhbFByb3BlcnR5R3JvdXBzKSB7 CiAgICAgICAgIG15ICRraW5kID0gJGxvZ2ljYWxQcm9wZXJ0eUdyb3VwLT57ImtpbmQifTsKICAg ICAgICAgbXkgJGtpbmRJZCA9IG5hbWVUb0lkKCRraW5kKTsKICAgICAgICAgbXkgJHJlc29sdmVy RW51bSA9ICJMb2dpY2FsQm94IiAuICRraW5kSWQgLiAiOjoiIC4gbmFtZVRvSWQoJHJlc29sdmVy KTsKLSAgICAgICAgbXkgQHBoeXNpY2FsczsKLSAgICAgICAgaWYgKCRraW5kIGVxICJzaWRlIikg ewotICAgICAgICAgICAgQHBoeXNpY2FscyA9ICgidG9wIiwgInJpZ2h0IiwgImJvdHRvbSIsICJs ZWZ0Iik7Ci0gICAgICAgIH0gZWxzaWYgKCRraW5kIGVxICJjb3JuZXIiKSB7Ci0gICAgICAgICAg ICBAcGh5c2ljYWxzID0gKCJ0b3AtbGVmdCIsICJ0b3AtcmlnaHQiLCAiYm90dG9tLXJpZ2h0Iiwg ImJvdHRvbS1sZWZ0Iik7Ci0gICAgICAgIH0gZWxzaWYgKCRraW5kIGVxICJheGlzIikgewotICAg ICAgICAgICAgQHBoeXNpY2FscyA9ICgiaG9yaXpvbnRhbCIsICJ2ZXJ0aWNhbCIpOwotICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgZGllICJQcm9wZXJ0eSBcIiRuYW1lXCIgYmVsb25ncyB0 byBhIGxvZ2ljYWwgcHJvcGVydHkgZ3JvdXAgb2YgdW5yZWNvZ25pemVkIGtpbmQgXCIka2luZFwi LiI7Ci0gICAgICAgIH0KLSAgICAgICAgbXkgQHByb3BlcnRpZXMgPSBtYXAgeyAiQ1NTUHJvcGVy dHkiIC4gJG5hbWVUb0lkeyRsb2dpY2FsUHJvcGVydHlHcm91cC0+eyJwaHlzaWNhbCJ9eyRffX0g fSBAcGh5c2ljYWxzOworICAgICAgICBteSAkcGh5c2ljYWxzID0gJGxvZ2ljYWxQcm9wZXJ0eUdy b3VwUmVzb2x2ZXJzeyJwaHlzaWNhbCJ9LT57JGtpbmR9OworICAgICAgICBteSBAcHJvcGVydGll cyA9IG1hcCB7ICJDU1NQcm9wZXJ0eSIgLiAkbmFtZVRvSWR7JGxvZ2ljYWxQcm9wZXJ0eUdyb3Vw LT57InBoeXNpY2FsIn17JF99fSB9IEB7ICRwaHlzaWNhbHMgfTsKICAgICAgICAgcHJpbnQgR1BF UkYgIiAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5IiAuICRuYW1lVG9JZHskbmFt ZX0gLiAiOiB7XG4iOwogICAgICAgICBwcmludCBHUEVSRiAiICAgICAgICBzdGF0aWMgY29uc3Rl eHByIENTU1Byb3BlcnR5SUQgcHJvcGVydGllc1siIC4gc2NhbGFyKEBwcm9wZXJ0aWVzKSAuICJd ID0geyAiIC4gam9pbigiLCAiLCBAcHJvcGVydGllcykgLiAiIH07XG4iOwogICAgICAgICBwcmlu dCBHUEVSRiAiICAgICAgICByZXR1cm4gcHJvcGVydGllc1tzdGF0aWNfY2FzdDxzaXplX3Q+KG1h cExvZ2ljYWwiIC4gJGtpbmRJZCAuICJUb1BoeXNpY2FsIiAuICRraW5kSWQgLiAiKHRleHRmbG93 LCAiIC4gJHJlc29sdmVyRW51bSAuICIpKV07XG4iOwo=