233108 2021-11-14 13:39:08 -0800 Add helper to add CSS property with implicit default 2021-11-15 14:42:04 -0800 1 1 1 Unclassified WebKit CSS Safari Technology Preview Unspecified Unspecified RESOLVED FIXED P2 Normal --- 233109 1 kiet.ho kiet.ho esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard mmaxfield webkit-bug-importer oldest_to_newest 1814909 0 kiet.ho 2021-11-14 13:39:08 -0800 Add helper to add CSS property with implicit default. This is useful for parsing shorthands. 1814919 1 444196 kiet.ho 2021-11-14 15:48:53 -0800 Created attachment 444196 Patch 1815224 2 ews-feeder 2021-11-15 14:41:21 -0800 Committed r285837 (244269@main): <https://commits.webkit.org/244269@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444196. 444196 2021-11-14 15:48:53 -0800 2021-11-15 14:41:23 -0800 Patch bug-233108-20211114154852.patch text/plain 15634 kiet.ho U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzkwM2U0ZmVhYjQzYjAx OTY2ZmQyOWJhN2E4NGQ3MzBjNmU3OGY0Zi4uYmY2NWZmYTIzYTA2YWZhZGZjZGI0NDIwOGY5NDM5 NTVhZTJjM2JlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTExLTE0ICBLaWV0 IEhvICA8dGhvMjJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBoZWxwZXIgdG8gYWRkIENTUyBw cm9wZXJ0eSB3aXRoIGltcGxpY2l0IGRlZmF1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzEwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGhlbHBlciBpbiBDU1NQcm9wZXJ0eVBhcnNlciB0 byBhZGQgYSBwcm9wZXJ0eSB3aXRoIGltcGxpY2l0IGRlZmF1bHQuIFRoaXMgaGVscGVyCisgICAg ICAgIGFjY2VwdHMgYSBSZWZQdHI8PiB2YWx1ZSBhbmQgYSBSZWY8PiBkZWZhdWx0LiBJZiB0aGUg dmFsdWUgaXMgYSBudWxsIHBvaW50ZXIsIHRoZQorICAgICAgICBkZWZhdWx0IGlzIGFkZGVkLCBh bmQgdGhlIGltcGxpY2l0IGZsYWcgaXMgc2V0LiBPdGhlcndpc2UsIHRoZSB2YWx1ZSBpcyBhZGRl ZC4gVGhpcyBpcworICAgICAgICB1c2VmdWwgZm9yIHBhcnNpbmcgc2hvcnRoYW5kcywgYmVjYXVz ZSB0aGUgQ1NTIHNwZWMgcmVxdWlyZXMgdGhhdCBtaXNzaW5nIHZhbHVlIGJlCisgICAgICAgIHNl dCB0byBpdHMgZGVmYXVsdCB2YWx1ZSwgYW5kIFdlYkNvcmUgYWRkaXRpb25hbGx5IHJlcXVpcmVz IHRoZSBpbXBsaWNpdCBmbGFnIHRvIGJlIHNldC4KKyAgICAgICAgVGhpcyBoZWxwZXIgaGFuZGxl cyBib3RoIG9mIHRoZW0uCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzOyBubyB0ZXN0 cyBuZWVkZWQuCisKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjphZGRQcm9wZXJ0eVdpdGhJbXBs aWNpdERlZmF1bHQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1 bWVUcmFuc2Zvcm1PcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXI6 OmNvbnN1bWVGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpjb25z dW1lRm9udFZhcmlhbnRTaG9ydGhhbmQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQ YXJzZXI6OmNvbnN1bWVDb2x1bW5zKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFy c2VyOjpjb25zdW1lU2hvcnRoYW5kR3JlZWRpbHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJv cGVydHlQYXJzZXI6OmNvbnN1bWVCb3JkZXJJbWFnZSk6CisgICAgICAgICogY3NzL3BhcnNlci9D U1NQcm9wZXJ0eVBhcnNlci5oOgorCiAyMDIxLTExLTE0ICBUaW0gTmd1eWVuICA8bnRpbUBhcHBs ZS5jb20+CiAKICAgICAgICAgTW9kYWwgZGlhbG9ncyBzaG91bGQgbWFrZSB0aGUgcm9vdCBlbGVt ZW50IHVuZm9jdXNhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1Byb3BlcnR5UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVy dHlQYXJzZXIuY3BwCmluZGV4IDE0MGFhMzNkYTk0MjgzMTk2YzI2OWMzOGYxOTA0NTNlMmIyMDhk ZDYuLjYyNzYxMDQ4YmYwZjJiM2FiOGMzYzFjNWYxMTQwMDMzYTBiODUwZGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCkBAIC0yMjMsNiAr MjIzLDE0IEBAIHZvaWQgQ1NTUHJvcGVydHlQYXJzZXI6OmFkZFByb3BlcnR5KENTU1Byb3BlcnR5 SUQgcHJvcGVydHksIENTU1Byb3BlcnR5SUQgY3VycmVuCiAgICAgbV9wYXJzZWRQcm9wZXJ0aWVz LT5hcHBlbmQoQ1NTUHJvcGVydHkocHJvcGVydHksIFdURk1vdmUodmFsdWUpLCBpbXBvcnRhbnQs IHNldEZyb21TaG9ydGhhbmQsIHNob3J0aGFuZEluZGV4LCBpbXBsaWNpdCkpOwogfQogCit2b2lk IENTU1Byb3BlcnR5UGFyc2VyOjphZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJv cGVydHlJRCBwcm9wZXJ0eSwgQ1NTUHJvcGVydHlJRCBjdXJyZW50U2hvcnRoYW5kLCBSZWZQdHI8 Q1NTVmFsdWU+JiYgdmFsdWUsIFJlZjxDU1NWYWx1ZT4mJiBpbXBsaWNpdERlZmF1bHQsIGJvb2wg aW1wb3J0YW50KQoreworICAgIGlmICh2YWx1ZSkKKyAgICAgICAgYWRkUHJvcGVydHkocHJvcGVy dHksIGN1cnJlbnRTaG9ydGhhbmQsIHZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCwg ZmFsc2UpOworICAgIGVsc2UKKyAgICAgICAgYWRkUHJvcGVydHkocHJvcGVydHksIGN1cnJlbnRT aG9ydGhhbmQsIFdURk1vdmUoaW1wbGljaXREZWZhdWx0KSwgaW1wb3J0YW50LCB0cnVlKTsKK30K Kwogdm9pZCBDU1NQcm9wZXJ0eVBhcnNlcjo6YWRkRXhwYW5kZWRQcm9wZXJ0eUZvclZhbHVlKENT U1Byb3BlcnR5SUQgcHJvcGVydHksIFJlZjxDU1NWYWx1ZT4mJiB2YWx1ZSwgYm9vbCBpbXBvcnRh bnQpCiB7CiAgICAgZm9yIChhdXRvIGxvbmdoYW5kIDogc2hvcnRoYW5kRm9yUHJvcGVydHkocHJv cGVydHkpKQpAQCAtMzU0LDEyICszNjIsMTEgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29u c3VtZVRyYW5zZm9ybU9yaWdpbihib29sIGltcG9ydGFudCkKICAgICAgICAgbV9yYW5nZS5jb25z dW1lV2hpdGVzcGFjZSgpOwogICAgICAgICBib29sIGF0RW5kID0gbV9yYW5nZS5hdEVuZCgpOwog ICAgICAgICBhdXRvIHJlc3VsdFogPSBjb25zdW1lTGVuZ3RoKG1fcmFuZ2UsIG1fY29udGV4dC5t b2RlLCBWYWx1ZVJhbmdlOjpBbGwpOwotICAgICAgICBib29sIGhhc1ogPSByZXN1bHRaOwotICAg ICAgICBpZiAoKCFoYXNaICYmICFhdEVuZCkgfHwgIW1fcmFuZ2UuYXRFbmQoKSkKKyAgICAgICAg aWYgKCghcmVzdWx0WiAmJiAhYXRFbmQpIHx8ICFtX3JhbmdlLmF0RW5kKCkpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5VHJhbnNmb3Jt T3JpZ2luWCwgQ1NTUHJvcGVydHlUcmFuc2Zvcm1PcmlnaW4sIFdURk1vdmUocmVzdWx0WFktPngp LCBpbXBvcnRhbnQpOwogICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eVRyYW5zZm9ybU9y aWdpblksIENTU1Byb3BlcnR5VHJhbnNmb3JtT3JpZ2luLCBXVEZNb3ZlKHJlc3VsdFhZLT55KSwg aW1wb3J0YW50KTsKLSAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlUcmFuc2Zvcm1Pcmln aW5aLCBDU1NQcm9wZXJ0eVRyYW5zZm9ybU9yaWdpbiwgcmVzdWx0WiA/IHJlc3VsdFoucmVsZWFz ZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlVmFsdWUoMCwgQ1NT VW5pdFR5cGU6OkNTU19QWCksIGltcG9ydGFudCwgIWhhc1opOworICAgICAgICBhZGRQcm9wZXJ0 eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlUcmFuc2Zvcm1PcmlnaW5aLCBDU1NQcm9w ZXJ0eVRyYW5zZm9ybU9yaWdpbiwgcmVzdWx0WiwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5j cmVhdGVWYWx1ZSgwLCBDU1NVbml0VHlwZTo6Q1NTX1BYKSwgaW1wb3J0YW50KTsKICAgICAgICAg CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KQEAgLTQ5OTMsNiArNTAwMCw3IEBAIGJvb2wg Q1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVGb250KGJvb2wgaW1wb3J0YW50KQogICAgICAgICBp ZiAoaWQgPT0gQ1NTVmFsdWVJbmhlcml0IHx8IGlkID09IENTU1ZhbHVlSW5pdGlhbCkKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CisKICAgICAvLyBPcHRpb25hbCBmb250LXN0eWxl LCBmb250LXZhcmlhbnQsIGZvbnQtc3RyZXRjaCBhbmQgZm9udC13ZWlnaHQuCiAgICAgUmVmUHRy PENTU0ZvbnRTdHlsZVZhbHVlPiBmb250U3R5bGU7CiAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZh bHVlPiBmb250VmFyaWFudENhcHM7CkBAIC01MDI5LDM5ICs1MDM3LDMzIEBAIGJvb2wgQ1NTUHJv cGVydHlQYXJzZXI6OmNvbnN1bWVGb250KGJvb2wgaW1wb3J0YW50KQogICAgIGlmIChtX3Jhbmdl LmF0RW5kKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGJvb2wgaGFzU3R5bGUgPSBm b250U3R5bGU7Ci0gICAgYm9vbCBoYXNWYXJpYW50ID0gZm9udFZhcmlhbnRDYXBzOwotICAgIGJv b2wgaGFzV2VpZ2h0ID0gZm9udFdlaWdodDsKLSAgICBib29sIGhhc1N0cmV0Y2ggPSBmb250U3Ry ZXRjaDsKKyAgICBhdXRvJiB2YWx1ZVBvb2wgPSBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpOwog Ci0gICAgaWYgKCFmb250U3R5bGUpCi0gICAgICAgIGZvbnRTdHlsZSA9IENTU0ZvbnRTdHlsZVZh bHVlOjpjcmVhdGUoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFs dWUoQ1NTVmFsdWVOb3JtYWwpKTsKLSAgICAKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZv bnRTdHlsZSwgQ1NTUHJvcGVydHlGb250LCBmb250U3R5bGUucmVsZWFzZU5vbk51bGwoKSwgaW1w b3J0YW50LCAhaGFzU3R5bGUpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlh bnRDYXBzLCBDU1NQcm9wZXJ0eUZvbnQsIGZvbnRWYXJpYW50Q2FwcyA/IGZvbnRWYXJpYW50Q2Fw cy5yZWxlYXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVu dGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsICFoYXNWYXJpYW50KTsKKyAg ICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlGb250U3R5bGUsIENT U1Byb3BlcnR5Rm9udCwgZm9udFN0eWxlLCBDU1NGb250U3R5bGVWYWx1ZTo6Y3JlYXRlKHZhbHVl UG9vbC5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpKSwgaW1wb3J0YW50KTsK KyAgICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlGb250VmFyaWFu dENhcHMsIENTU1Byb3BlcnR5Rm9udCwgZm9udFZhcmlhbnRDYXBzLCB2YWx1ZVBvb2wuY3JlYXRl SWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50KTsKIC8qICAKICAgICAv LyBGSVhNRS1ORVdQQVJTRVI6IFdoYXQgZG8gd2UgZG8gd2l0aCB0aGVzZT8gVGhleSBhcmVuJ3Qg cGFydCBvZiBvdXIgZm9udFNob3J0aGFuZCgpLgogICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5 Rm9udFZhcmlhbnRMaWdhdHVyZXMsIENTU1Byb3BlcnR5Rm9udCwgQ1NTVmFsdWVQb29sOjpzaW5n bGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQs IHRydWUpOwogICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnROdW1lcmljLCBD U1NQcm9wZXJ0eUZvbnQsIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmll clZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCB0cnVlKTsKICovCiAKLSAgICBhZGRQ cm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRXZWlnaHQsIENTU1Byb3BlcnR5Rm9udCwgZm9udFdlaWdo dCA/IGZvbnRXZWlnaHQucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9u KCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCAhaGFz V2VpZ2h0KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRTdHJldGNoLCBDU1NQcm9w ZXJ0eUZvbnQsIGZvbnRTdHJldGNoID8gZm9udFN0cmV0Y2gucmVsZWFzZU5vbk51bGwoKSA6IENT U1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9y bWFsKSwgaW1wb3J0YW50LCAhaGFzU3RyZXRjaCk7CisgICAgYWRkUHJvcGVydHlXaXRoSW1wbGlj aXREZWZhdWx0KENTU1Byb3BlcnR5Rm9udFdlaWdodCwgQ1NTUHJvcGVydHlGb250LCBmb250V2Vp Z2h0LCB2YWx1ZVBvb2wuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1w b3J0YW50KTsKKyAgICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlG b250U3RyZXRjaCwgQ1NTUHJvcGVydHlGb250LCBmb250U3RyZXRjaCwgdmFsdWVQb29sLmNyZWF0 ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7CiAKICAgICAvLyBO b3cgYSBmb250IHNpemUgX211c3RfIGNvbWUuCiAgICAgUmVmUHRyPENTU1ZhbHVlPiBmb250U2l6 ZSA9IGNvbnN1bWVGb250U2l6ZShtX3JhbmdlLCBtX2NvbnRleHQubW9kZSk7CiAgICAgaWYgKCFm b250U2l6ZSB8fCBtX3JhbmdlLmF0RW5kKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFNpemUsIENTU1Byb3BlcnR5Rm9udCwgKmZvbnRT aXplLCBpbXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFNpemUsIENT U1Byb3BlcnR5Rm9udCwgZm9udFNpemUucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKIAor ICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gbGluZUhlaWdodDsKICAgICBpZiAoY29uc3Vt ZVNsYXNoSW5jbHVkaW5nV2hpdGVzcGFjZShtX3JhbmdlKSkgewotICAgICAgICBSZWZQdHI8Q1NT UHJpbWl0aXZlVmFsdWU+IGxpbmVIZWlnaHQgPSBjb25zdW1lTGluZUhlaWdodChtX3JhbmdlLCBt X2NvbnRleHQubW9kZSk7CisgICAgICAgIGxpbmVIZWlnaHQgPSBjb25zdW1lTGluZUhlaWdodCht X3JhbmdlLCBtX2NvbnRleHQubW9kZSk7CiAgICAgICAgIGlmICghbGluZUhlaWdodCkKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlMaW5l SGVpZ2h0LCBDU1NQcm9wZXJ0eUZvbnQsIGxpbmVIZWlnaHQucmVsZWFzZU5vbk51bGwoKSwgaW1w b3J0YW50KTsKLSAgICB9IGVsc2UKLSAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlMaW5l SGVpZ2h0LCBDU1NQcm9wZXJ0eUZvbnQsIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRl SWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCB0cnVlKTsKKyAgICB9 CisgICAgYWRkUHJvcGVydHlXaXRoSW1wbGljaXREZWZhdWx0KENTU1Byb3BlcnR5TGluZUhlaWdo dCwgQ1NTUHJvcGVydHlGb250LCBsaW5lSGVpZ2h0LCB2YWx1ZVBvb2wuY3JlYXRlSWRlbnRpZmll clZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50KTsKIAogICAgIC8vIEZvbnQgZmFtaWx5 IG11c3QgY29tZSBub3cuCiAgICAgUmVmUHRyPENTU1ZhbHVlPiBwYXJzZWRGYW1pbHlWYWx1ZSA9 IGNvbnN1bWVGb250RmFtaWx5KG1fcmFuZ2UpOwpAQCAtNTEzOSwxOCArNTE0MSwxMyBAQCBib29s IENTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9ydGhhbmQoYm9vbCBpbXBv cnRhbnQpCiAKICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVz LCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdhdHVyZXNQYXJzZXIuZmluYWxpemVWYWx1ZSgp LnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCwgaW1wbGljaXRMaWdhdHVyZXMpOwogICAgIGFk ZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnROdW1lcmljLCBDU1NQcm9wZXJ0eUZvbnRW YXJpYW50LCBudW1lcmljUGFyc2VyLmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVsbCgpLCBp bXBvcnRhbnQsIGltcGxpY2l0TnVtZXJpYyk7Ci0gICAgYm9vbCBpbXBsaWNpdENhcHMgPSAhY2Fw c1ZhbHVlOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRDYXBzLCBDU1NQ cm9wZXJ0eUZvbnRWYXJpYW50LCBjYXBzVmFsdWUgPyBjYXBzVmFsdWUucmVsZWFzZU5vbk51bGwo KSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1Zh bHVlTm9ybWFsKSwgaW1wb3J0YW50LCBpbXBsaWNpdENhcHMpOwotICAgIGJvb2wgaW1wbGljaXRB bHRlcm5hdGVzID0gIWFsdGVybmF0ZXNWYWx1ZTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0 eUZvbnRWYXJpYW50QWx0ZXJuYXRlcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgYWx0ZXJuYXRl c1ZhbHVlID8gYWx0ZXJuYXRlc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6 OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9y dGFudCwgaW1wbGljaXRBbHRlcm5hdGVzKTsKLSAgICBib29sIGltcGxpY2l0UG9zaXRpb24gPSAh cG9zaXRpb25WYWx1ZTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9z aXRpb24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZh bHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlk ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRQb3NpdGlv bik7Ci0KLSAgICBib29sIGltcGxpY2l0RWFzdEFzaWFuID0gIWVhc3RBc2lhblZhbHVlOwotICAg IGlmICghZWFzdEFzaWFuVmFsdWUpCi0gICAgICAgIGVhc3RBc2lhblZhbHVlID0gQ1NTVmFsdWVQ b29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpOwot ICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3Bl cnR5Rm9udFZhcmlhbnQsIGVhc3RBc2lhblZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFu dCwgaW1wbGljaXRFYXN0QXNpYW4pOwotICAgIAorCisgICAgYXV0byYgdmFsdWVQb29sID0gQ1NT VmFsdWVQb29sOjpzaW5nbGV0b24oKTsKKyAgICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERlZmF1 bHQoQ1NTUHJvcGVydHlGb250VmFyaWFudENhcHMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNh cHNWYWx1ZSwgdmFsdWVQb29sLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCks IGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHlXaXRoSW1wbGljaXREZWZhdWx0KENTU1Byb3Bl cnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBhbHRlcm5h dGVzVmFsdWUsIHZhbHVlUG9vbC5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwp LCBpbXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVmYXVsdChDU1NQcm9w ZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9u VmFsdWUsIHZhbHVlUG9vbC5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBp bXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVmYXVsdChDU1NQcm9wZXJ0 eUZvbnRWYXJpYW50RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBXVEZNb3ZlKGVh c3RBc2lhblZhbHVlKSwgdmFsdWVQb29sLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5v cm1hbCksIGltcG9ydGFudCk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNTE5Nyw3ICs1 MTk0LDcgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUNvbHVtbnMoYm9vbCBpbXBv cnRhbnQpCiAgICAgCiAgICAgaWYgKCFtX3JhbmdlLmF0RW5kKCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAKKwogICAgIC8vIEFueSB1bmFzc2lnbmVkIHByb3BlcnR5IGF0IHRoaXMgcG9p bnQgd2lsbCBiZWNvbWUgaW1wbGljaXQgJ2F1dG8nLgogICAgIGlmIChjb2x1bW5XaWR0aCkKICAg ICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlDb2x1bW5XaWR0aCwgQ1NTUHJvcGVydHlJbnZh bGlkLCBjb2x1bW5XaWR0aC5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOwpAQCAtNTIzMywx MCArNTIzMCw3IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVTaG9ydGhhbmRHcmVl ZGlseShjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJiBzCiAgICAgfSB3aGlsZSAoIW1fcmFu Z2UuYXRFbmQoKSk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNob3J0aGFuZC5sZW5n dGgoKTsgKytpKSB7Ci0gICAgICAgIGlmIChsb25naGFuZHNbaV0pCi0gICAgICAgICAgICBhZGRQ cm9wZXJ0eShzaG9ydGhhbmRQcm9wZXJ0aWVzW2ldLCBzaG9ydGhhbmQuaWQoKSwgbG9uZ2hhbmRz W2ldLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIGFkZFByb3BlcnR5KHNob3J0aGFuZFByb3BlcnRpZXNbaV0sIHNob3J0aGFuZC5pZCgpLCBD U1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGlt cG9ydGFudCk7CisgICAgICAgIGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVmYXVsdChzaG9ydGhh bmRQcm9wZXJ0aWVzW2ldLCBzaG9ydGhhbmQuaWQoKSwgV1RGTW92ZShsb25naGFuZHNbaV0pLCBD U1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGlt cG9ydGFudCk7CiAgICAgfQogICAgIHJldHVybiB0cnVlOwogfQpAQCAtNTM5NiwzMCArNTM5MCwy MSBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lQm9yZGVySW1hZ2UoQ1NTUHJvcGVy dHlJRCBwcm9wZXJ0eSwgYm9vbCBpbXBvcnRhbgogICAgIFJlZlB0cjxDU1NWYWx1ZT4gcmVwZWF0 OwogICAgIAogICAgIGlmIChjb25zdW1lQm9yZGVySW1hZ2VDb21wb25lbnRzKHByb3BlcnR5LCBt X3JhbmdlLCBtX2NvbnRleHQsIHNvdXJjZSwgc2xpY2UsIHdpZHRoLCBvdXRzZXQsIHJlcGVhdCkp IHsKLSAgICAgICAgaWYgKCFzb3VyY2UpCi0gICAgICAgICAgICBzb3VyY2UgPSBDU1NWYWx1ZVBv b2w6OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCk7Ci0gICAgICAgIGlm ICghc2xpY2UpCi0gICAgICAgICAgICBzbGljZSA9IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCku Y3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKTsKLSAgICAgICAgaWYgKCF3aWR0aCkKLSAgICAg ICAgICAgIHdpZHRoID0gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJbXBsaWNpdElu aXRpYWxWYWx1ZSgpOwotICAgICAgICBpZiAoIW91dHNldCkKLSAgICAgICAgICAgIG91dHNldCA9 IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKTsK LSAgICAgICAgaWYgKCFyZXBlYXQpCi0gICAgICAgICAgICByZXBlYXQgPSBDU1NWYWx1ZVBvb2w6 OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCk7CisgICAgICAgIGF1dG8m IHZhbHVlUG9vbCA9IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCk7CiAgICAgICAgIHN3aXRjaCAo cHJvcGVydHkpIHsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZToK LSAgICAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlU291 cmNlLCBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZSwgc291cmNlLnJlbGVhc2VOb25OdWxs KCksIGltcG9ydGFudCk7Ci0gICAgICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtp dE1hc2tCb3hJbWFnZVNsaWNlLCBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZSwgc2xpY2Uu cmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKLSAgICAgICAgICAgIGFkZFByb3BlcnR5KENT U1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlV2lkdGgsIENTU1Byb3BlcnR5V2Via2l0TWFza0Jv eEltYWdlLCB3aWR0aC5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOwotICAgICAgICAgICAg YWRkUHJvcGVydHkoQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VPdXRzZXQsIENTU1Byb3Bl cnR5V2Via2l0TWFza0JveEltYWdlLCBvdXRzZXQucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50 KTsKLSAgICAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdl UmVwZWF0LCBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZSwgcmVwZWF0LnJlbGVhc2VOb25O dWxsKCksIGltcG9ydGFudCk7CisgICAgICAgICAgICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERl ZmF1bHQoQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VTb3VyY2UsIENTU1Byb3BlcnR5V2Vi a2l0TWFza0JveEltYWdlLCBXVEZNb3ZlKHNvdXJjZSksIHZhbHVlUG9vbC5jcmVhdGVJbXBsaWNp dEluaXRpYWxWYWx1ZSgpLCBpbXBvcnRhbnQpOworICAgICAgICAgICAgYWRkUHJvcGVydHlXaXRo SW1wbGljaXREZWZhdWx0KENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlU2xpY2UsIENTU1By b3BlcnR5V2Via2l0TWFza0JveEltYWdlLCBXVEZNb3ZlKHNsaWNlKSwgdmFsdWVQb29sLmNyZWF0 ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGltcG9ydGFudCk7CisgICAgICAgICAgICBhZGRQcm9w ZXJ0eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VXaWR0 aCwgQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2UsIFdURk1vdmUod2lkdGgpLCB2YWx1ZVBv b2wuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKSwgaW1wb3J0YW50KTsKKyAgICAgICAgICAg IGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVmYXVsdChDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJ bWFnZU91dHNldCwgQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2UsIFdURk1vdmUob3V0c2V0 KSwgdmFsdWVQb29sLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGltcG9ydGFudCk7Cisg ICAgICAgICAgICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlXZWJr aXRNYXNrQm94SW1hZ2VSZXBlYXQsIENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlLCBXVEZN b3ZlKHJlcGVhdCksIHZhbHVlUG9vbC5jcmVhdGVJbXBsaWNpdEluaXRpYWxWYWx1ZSgpLCBpbXBv cnRhbnQpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlCb3JkZXJJbWFnZToKLSAgICAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Qm9yZGVy SW1hZ2VTb3VyY2UsIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2UsIHNvdXJjZS5yZWxlYXNlTm9uTnVs bCgpLCBpbXBvcnRhbnQpOwotICAgICAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlCb3Jk ZXJJbWFnZVNsaWNlLCBDU1NQcm9wZXJ0eUJvcmRlckltYWdlLCBzbGljZS5yZWxlYXNlTm9uTnVs bCgpLCBpbXBvcnRhbnQpOwotICAgICAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlCb3Jk ZXJJbWFnZVdpZHRoLCBDU1NQcm9wZXJ0eUJvcmRlckltYWdlLCB3aWR0aC5yZWxlYXNlTm9uTnVs bCgpICwgaW1wb3J0YW50KTsKLSAgICAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Qm9y ZGVySW1hZ2VPdXRzZXQsIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2UsIG91dHNldC5yZWxlYXNlTm9u TnVsbCgpLCBpbXBvcnRhbnQpOwotICAgICAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlC b3JkZXJJbWFnZVJlcGVhdCwgQ1NTUHJvcGVydHlCb3JkZXJJbWFnZSwgcmVwZWF0LnJlbGVhc2VO b25OdWxsKCksIGltcG9ydGFudCk7CisgICAgICAgICAgICBhZGRQcm9wZXJ0eVdpdGhJbXBsaWNp dERlZmF1bHQoQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVNvdXJjZSwgQ1NTUHJvcGVydHlCb3JkZXJJ bWFnZSwgV1RGTW92ZShzb3VyY2UpLCB2YWx1ZVBvb2wuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFs dWUoKSwgaW1wb3J0YW50KTsKKyAgICAgICAgICAgIGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVm YXVsdChDU1NQcm9wZXJ0eUJvcmRlckltYWdlU2xpY2UsIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2Us IFdURk1vdmUoc2xpY2UpLCB2YWx1ZVBvb2wuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKSwg aW1wb3J0YW50KTsKKyAgICAgICAgICAgIGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVmYXVsdChD U1NQcm9wZXJ0eUJvcmRlckltYWdlV2lkdGgsIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2UsIFdURk1v dmUod2lkdGgpLCB2YWx1ZVBvb2wuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKSwgaW1wb3J0 YW50KTsKKyAgICAgICAgICAgIGFkZFByb3BlcnR5V2l0aEltcGxpY2l0RGVmYXVsdChDU1NQcm9w ZXJ0eUJvcmRlckltYWdlT3V0c2V0LCBDU1NQcm9wZXJ0eUJvcmRlckltYWdlLCBXVEZNb3ZlKG91 dHNldCksIHZhbHVlUG9vbC5jcmVhdGVJbXBsaWNpdEluaXRpYWxWYWx1ZSgpLCBpbXBvcnRhbnQp OworICAgICAgICAgICAgYWRkUHJvcGVydHlXaXRoSW1wbGljaXREZWZhdWx0KENTU1Byb3BlcnR5 Qm9yZGVySW1hZ2VSZXBlYXQsIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2UsIFdURk1vdmUocmVwZWF0 KSwgdmFsdWVQb29sLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGltcG9ydGFudCk7CiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNl ci9DU1NQcm9wZXJ0eVBhcnNlci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9w ZXJ0eVBhcnNlci5oCmluZGV4IGQ4NzQwOThmZGM0ODllMmVjNGFjNWUxNjNhZDRlMWUyZDkyM2Nh YjEuLjYwZGRkZmM0MjViNWNlN2NlOGVlYmU3ZjIzMzM4NjVjZTlkYTJiYTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmgKQEAgLTc3LDYgKzc3LDcg QEAgcHJpdmF0ZToKICAgICBib29sIHBhcnNlQ291bnRlclN0eWxlRGVzY3JpcHRvcihDU1NQcm9w ZXJ0eUlELCBjb25zdCBDU1NQYXJzZXJDb250ZXh0Jik7CiAKICAgICB2b2lkIGFkZFByb3BlcnR5 KENTU1Byb3BlcnR5SUQsIENTU1Byb3BlcnR5SUQsIFJlZjxDU1NWYWx1ZT4mJiwgYm9vbCBpbXBv cnRhbnQsIGJvb2wgaW1wbGljaXQgPSBmYWxzZSk7CisgICAgdm9pZCBhZGRQcm9wZXJ0eVdpdGhJ bXBsaWNpdERlZmF1bHQoQ1NTUHJvcGVydHlJRCwgQ1NTUHJvcGVydHlJRCwgUmVmUHRyPENTU1Zh bHVlPiYmLCBSZWY8Q1NTVmFsdWU+JiYgaW1wbGljaXREZWZhdWx0LCBib29sIGltcG9ydGFudCk7 CiAgICAgdm9pZCBhZGRFeHBhbmRlZFByb3BlcnR5Rm9yVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9w SWQsIFJlZjxDU1NWYWx1ZT4mJiwgYm9vbCk7CiAKICAgICBib29sIGNvbnN1bWVCb3JkZXIoUmVm UHRyPENTU1ZhbHVlPiYgd2lkdGgsIFJlZlB0cjxDU1NWYWx1ZT4mIHN0eWxlLCBSZWZQdHI8Q1NT VmFsdWU+JiBjb2xvcik7Cg==