219222 2020-11-20 13:40:45 -0800 Fix non-unified build problem in CSSPropertyParserHelpers.cpp along with a little refactoring 2020-11-26 16:00:59 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build All All RESOLVED FIXED InRadar P1 Normal --- 1 darin darin andersca clord don.olmstead esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard sam webkit-bug-importer oldest_to_newest 1709627 0 darin 2020-11-20 13:40:45 -0800 Fix non-unified build problem in CSSPropertyParserHelpers.cpp along with a little refactoring 1709628 1 414713 darin 2020-11-20 13:44:30 -0800 Created attachment 414713 Patch 1709630 2 414713 darin 2020-11-20 13:46:03 -0800 Comment on attachment 414713 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414713&action=review > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:54 > +static inline bool isCSSWideKeyword(const CSSValueID& id) This probably should just take CSSValueID rather than const&. 1709633 3 414716 darin 2020-11-20 13:53:31 -0800 Created attachment 414716 Patch 1710183 4 ews-feeder 2020-11-26 15:59:59 -0800 Committed r270167: <https://trac.webkit.org/changeset/270167> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414716. 1710184 5 webkit-bug-importer 2020-11-26 16:00:59 -0800 <rdar://problem/71754694> 414713 2020-11-20 13:44:30 -0800 2020-11-20 13:53:29 -0800 Patch bug-219222-20201120134429.patch text/plain 9030 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGY3OTg4MDA1OTQ2NWVl M2U4MGIyMWEwNjU3MGZiOTY2MmEyYzQyZi4uZmM1MzNmM2E1YmM5NmUyNGY3Y2Q0MmUyOGI2MWY1 NjVmYTU2ZWI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTExLTIwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggbm9uLXVuaWZpZWQgYnVp bGQgcHJvYmxlbSBpbiBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwIGFsb25nIHdpdGggYSBs aXR0bGUgcmVmYWN0b3JpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxOTIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogY3NzL3BhcnNlci9D U1NQcm9wZXJ0eVBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmb250U3R5bGVJc1dpdGhp blJhbmdlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmNvbnN1bWVGb250U3R5bGVSYW5n ZSk6IFVwZGF0ZWQgZm9yIG5hbWUgY2hhbmdlIHRvIGlzRm9udFN0eWxlQW5nbGVJblJhbmdlLAor ICAgICAgICBkb24ndCBmb3JjZSBhbmdsZXMgdG8gZmxvYXQgc2luY2UgdGhlIHZhbHVlcyBhcmUg c3RvcmVkIGFzIGRvdWJsZS4gVXNlIGxvY2FsIHZhcmlhYmxlcworICAgICAgICB0byBhdm9pZCBt dWx0aXBsZSBjYWxscyB0byBkb3VibGVWYWx1ZS4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NT UHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5 UGFyc2VySGVscGVyczo6aXNDU1NXaWRlS2V5d29yZCk6IE1vdmVkIGlubGluZSBmdW5jdGlvbiBo ZXJlCisgICAgICAgIGZyb20gdGhlIGhlYWRlciBzaW5jZSBpdCdzIG9ubHkgdXNlZCBpbnNpZGUg dGhpcyBmaWxlLgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpj b25zdW1lRm9udFN0eWxlUmF3KTogVXBkYXRlZCBmb3IgdGhlIG5hbWUgY2hhbmdlCisgICAgICAg IG9mIGlzRm9udFN0eWxlQW5nbGVJblJhbmdlLCBhbmQgYWxzbyBlbGltaW5hdGVkIGxvY2FsIHNp bmNlIGl0J3MgY2xlYXIgd2l0aG91dCBpdC4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJv cGVydHlQYXJzZXJIZWxwZXJzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNl ckhlbHBlcnM6OmlzQ1NTV2lkZUtleXdvcmQpOiBEZWxldGVkLiBUaGlzIGhhZCAic3RhdGljIiBv biBpdAorICAgICAgICBpbiBhIGhlYWRlciwgd2hpY2ggaXMgbm90IGdvb2Qgc3R5bGUsIGJ1dCBh bHNvIGRpZG4ndCBuZWVkIHRvIGJlIGluIGEgaGVhZGVyLgorICAgICAgICAoV2ViQ29yZTo6Q1NT UHJvcGVydHlQYXJzZXJIZWxwZXJzOjppc0ZvbnRTdHlsZUFuZ2xlSW5SYW5nZSk6IE1vdmVkIHRo aXMgaGVyZSBzbyB3ZSBjYW4KKyAgICAgICAgdXNlIGl0IGluIHR3byBkaWZmZXJlbnQgLmNwcCBm aWxlcy4gQWxzbyByZW5hbWVkIGl0IGZvciBpbXByb3ZlZCBjbGFyaXR5LCBhbmQgdXNlZCBhbgor ICAgICAgICBpbmxpbmUgZnVuY3Rpb24gYmVjYXVzZSB0aGlzIGlzIHN1cGVyIHNpbXBsZS4KKwog MjAyMC0xMS0yMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBEaXNwYXRjaCBtYWluLXRocmVhZCBvdmVyZmxvdyBzY3JvbGxzIHRvIHRoZSBzY3JvbGxp bmcgdGhyZWFkIGFzIHdlIGRvIGZvciBwYWdlIHNjcm9sbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXggMDE1ZjYwM2I1OTE1N2RmNDc0 NDQ5YzVlMTU3ODdlYTJkYjAzZmQ4Yy4uM2YyNDEyY2Q4ZjY5MjIzYjRiMDZmN2M5ZDI3OGY0NTdh NzI2OGM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0 eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBh cnNlci5jcHAKQEAgLTk1NywxMyArOTU3LDYgQEAgc3RhdGljIFJlZlB0cjxDU1NQcmltaXRpdmVW YWx1ZT4gY29uc3VtZUZvbnRTdHlsZUtleXdvcmRWYWx1ZShDU1NQYXJzZXJUb2tlblJhbmcKICAg ICByZXR1cm4gY29uc3VtZUlkZW50PENTU1ZhbHVlTm9ybWFsLCBDU1NWYWx1ZUl0YWxpYywgQ1NT VmFsdWVPYmxpcXVlPihyYW5nZSk7CiB9CiAKLSNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQot c3RhdGljIGJvb2wgZm9udFN0eWxlSXNXaXRoaW5SYW5nZShmbG9hdCBvYmxpcXVlKQotewotICAg IHJldHVybiBvYmxpcXVlID4gLTkwICYmIG9ibGlxdWUgPCA5MDsKLX0KLSNlbmRpZgotCiBzdGF0 aWMgUmVmUHRyPENTU0ZvbnRTdHlsZVZhbHVlPiBjb25zdW1lRm9udFN0eWxlKENTU1BhcnNlclRv a2VuUmFuZ2UmIHJhbmdlLCBDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUpCiB7CiAgICAgaWYg KGF1dG8gcmVzdWx0ID0gY29uc3VtZUZvbnRTdHlsZVJhdyhyYW5nZSwgY3NzUGFyc2VyTW9kZSkp IHsKQEAgLTk4OSw3ICs5ODIsOCBAQCBzdGF0aWMgUmVmUHRyPENTU0ZvbnRTdHlsZVJhbmdlVmFs dWU+IGNvbnN1bWVGb250U3R5bGVSYW5nZShDU1NQYXJzZXJUb2tlblJhbmdlJgogICAgICAgICBy ZXR1cm4gQ1NTRm9udFN0eWxlUmFuZ2VWYWx1ZTo6Y3JlYXRlKGtleXdvcmQucmVsZWFzZU5vbk51 bGwoKSk7CiAKICAgICBpZiAoYXV0byBmaXJzdEFuZ2xlID0gY29uc3VtZUFuZ2xlKHJhbmdlLCBj c3NQYXJzZXJNb2RlKSkgewotICAgICAgICBpZiAoIWZvbnRTdHlsZUlzV2l0aGluUmFuZ2UoZmly c3RBbmdsZS0+dmFsdWU8ZmxvYXQ+KENTU1VuaXRUeXBlOjpDU1NfREVHKSkpCisgICAgICAgIGF1 dG8gZmlyc3RBbmdsZUluRGVncmVlcyA9IGZpcnN0QW5nbGUtPmRvdWJsZVZhbHVlKENTU1VuaXRU eXBlOjpDU1NfREVHKTsKKyAgICAgICAgaWYgKCFpc0ZvbnRTdHlsZUFuZ2xlSW5SYW5nZShmaXJz dEFuZ2xlSW5EZWdyZWVzKSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICBp ZiAocmFuZ2UuYXRFbmQoKSkgewogICAgICAgICAgICAgYXV0byByZXN1bHQgPSBDU1NWYWx1ZUxp c3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7CkBAIC05OTcsNyArOTkxLDEwIEBAIHN0YXRpYyBS ZWZQdHI8Q1NTRm9udFN0eWxlUmFuZ2VWYWx1ZT4gY29uc3VtZUZvbnRTdHlsZVJhbmdlKENTU1Bh cnNlclRva2VuUmFuZ2UmCiAgICAgICAgICAgICByZXR1cm4gQ1NTRm9udFN0eWxlUmFuZ2VWYWx1 ZTo6Y3JlYXRlKGtleXdvcmQucmVsZWFzZU5vbk51bGwoKSwgV1RGTW92ZShyZXN1bHQpKTsKICAg ICAgICAgfQogICAgICAgICBhdXRvIHNlY29uZEFuZ2xlID0gY29uc3VtZUFuZ2xlKHJhbmdlLCBj c3NQYXJzZXJNb2RlKTsKLSAgICAgICAgaWYgKCFzZWNvbmRBbmdsZSB8fCAhZm9udFN0eWxlSXNX aXRoaW5SYW5nZShzZWNvbmRBbmdsZS0+dmFsdWU8ZmxvYXQ+KENTU1VuaXRUeXBlOjpDU1NfREVH KSkgfHwgZmlyc3RBbmdsZS0+ZmxvYXRWYWx1ZShDU1NVbml0VHlwZTo6Q1NTX0RFRykgPiBzZWNv bmRBbmdsZS0+ZmxvYXRWYWx1ZShDU1NVbml0VHlwZTo6Q1NTX0RFRykpCisgICAgICAgIGlmICgh c2Vjb25kQW5nbGUpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgYXV0byBz ZWNvbmRBbmdsZUluRGVncmVlcyA9IHNlY29uZEFuZ2xlLT5kb3VibGVWYWx1ZShDU1NVbml0VHlw ZTo6Q1NTX0RFRyk7CisgICAgICAgIGlmICghaXNGb250U3R5bGVBbmdsZUluUmFuZ2Uoc2Vjb25k QW5nbGVJbkRlZ3JlZXMpIHx8IGZpcnN0QW5nbGVJbkRlZ3JlZXMgPiBzZWNvbmRBbmdsZUluRGVn cmVlcykKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICBhdXRvIHJlc3VsdCA9 IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKICAgICAgICAgcmVzdWx0LT5h cHBlbmQoZmlyc3RBbmdsZS5yZWxlYXNlTm9uTnVsbCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAppbmRleCBjZjM0 NWMyMGRmMjNlMjNlZThmNDNjYTNhNTJlMGQ0MDJmYzg0MWM2Li5hYWU4M2JlYjFlOGYyNjE2NWIy NDgxNWU0YzZkNjVkMTI1ZWIwN2UwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwCkBAIC01MSw2ICs1MSwxMSBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMg ewogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNDU1NXaWRlS2V5d29yZChjb25zdCBDU1NWYWx1ZUlE JiBpZCkKK3sKKyAgICByZXR1cm4gaWQgPT0gQ1NTVmFsdWVJbml0aWFsIHx8IGlkID09IENTU1Zh bHVlSW5oZXJpdCB8fCBpZCA9PSBDU1NWYWx1ZVVuc2V0IHx8IGlkID09IENTU1ZhbHVlUmV2ZXJ0 IHx8IGlkID09IENTU1ZhbHVlRGVmYXVsdDsKK30KKwogYm9vbCBjb25zdW1lQ29tbWFJbmNsdWRp bmdXaGl0ZXNwYWNlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogewogICAgIENTU1BhcnNl clRva2VuIHZhbHVlID0gcmFuZ2UucGVlaygpOwpAQCAtMTk1Myw4ICsxOTU4LDcgQEAgT3B0aW9u YWw8Rm9udFN0eWxlUmF3PiBjb25zdW1lRm9udFN0eWxlUmF3KENTU1BhcnNlclRva2VuUmFuZ2Um IHJhbmdlLCBDU1NQYXJzZXIKICNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQogICAgIGlmICgh cmFuZ2UuYXRFbmQoKSkgewogICAgICAgICBpZiAoYXV0byBhbmdsZSA9IGNvbnN1bWVBbmdsZVJh dyhyYW5nZSwgY3NzUGFyc2VyTW9kZSkpIHsKLSAgICAgICAgICAgIGF1dG8gYW5nbGVJbkRlZ3Jl ZXMgPSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZURlZ3JlZXMoYW5nbGUtPnR5cGUsIGFuZ2xl LT52YWx1ZSk7Ci0gICAgICAgICAgICBpZiAoZm9udFN0eWxlSXNXaXRoaW5SYW5nZShhbmdsZUlu RGVncmVlcykpCisgICAgICAgICAgICBpZiAoaXNGb250U3R5bGVBbmdsZUluUmFuZ2UoQ1NTUHJp bWl0aXZlVmFsdWU6OmNvbXB1dGVEZWdyZWVzKGFuZ2xlLT50eXBlLCBhbmdsZS0+dmFsdWUpKSkK ICAgICAgICAgICAgICAgICByZXR1cm4geyB7IENTU1ZhbHVlT2JsaXF1ZSwgV1RGTW92ZShhbmds ZSkgfSB9OwogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBl cnMuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJz LmgKaW5kZXggYWYwMDgwMTc1MTk5YzAzNjcwN2UzZGE5ZTVhYjE2ZTI4MzI0N2VmZS4uMjViNmRj NTVhYWEyYmU1MmQ0MTk4MTNjYTA1YjNkNmNjNWM4ZTU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5oCkBAIC02Nyw3ICs2 Nyw3IEBAIHN0cnVjdCBMZW5ndGhSYXcgewogICAgIGRvdWJsZSB2YWx1ZTsKIH07CiAKLXVzaW5n IExlbmd0aE9yUGVyY2VudFJhdyA9IFdURjo6VmFyaWFudDxMZW5ndGhSYXcsIGRvdWJsZT47Cit1 c2luZyBMZW5ndGhPclBlcmNlbnRSYXcgPSBWYXJpYW50PExlbmd0aFJhdywgZG91YmxlPjsKIAog UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lSW50ZWdlcihDU1NQYXJzZXJUb2tlblJh bmdlJiwgZG91YmxlIG1pbmltdW1WYWx1ZSA9IC1zdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46 Om1heCgpKTsKIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZVBvc2l0aXZlSW50ZWdl cihDU1NQYXJzZXJUb2tlblJhbmdlJik7CkBAIC0xMzQsMTAgKzEzNCwxMCBAQCBzdHJ1Y3QgRm9u dFN0eWxlUmF3IHsKICAgICBDU1NWYWx1ZUlEIHN0eWxlOwogICAgIE9wdGlvbmFsPEFuZ2xlUmF3 PiBhbmdsZTsKIH07Ci11c2luZyBGb250V2VpZ2h0UmF3ID0gV1RGOjpWYXJpYW50PENTU1ZhbHVl SUQsIGRvdWJsZT47Ci11c2luZyBGb250U2l6ZVJhdyA9IFdURjo6VmFyaWFudDxDU1NWYWx1ZUlE LCBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6Okxlbmd0aE9yUGVyY2VudFJhdz47Ci11c2luZyBM aW5lSGVpZ2h0UmF3ID0gV1RGOjpWYXJpYW50PENTU1ZhbHVlSUQsIGRvdWJsZSwgQ1NTUHJvcGVy dHlQYXJzZXJIZWxwZXJzOjpMZW5ndGhPclBlcmNlbnRSYXc+OwotdXNpbmcgRm9udEZhbWlseVJh dyA9IFdURjo6VmFyaWFudDxDU1NWYWx1ZUlELCBTdHJpbmc+OwordXNpbmcgRm9udFdlaWdodFJh dyA9IFZhcmlhbnQ8Q1NTVmFsdWVJRCwgZG91YmxlPjsKK3VzaW5nIEZvbnRTaXplUmF3ID0gVmFy aWFudDxDU1NWYWx1ZUlELCBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6Okxlbmd0aE9yUGVyY2Vu dFJhdz47Cit1c2luZyBMaW5lSGVpZ2h0UmF3ID0gVmFyaWFudDxDU1NWYWx1ZUlELCBkb3VibGUs IENTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6TGVuZ3RoT3JQZXJjZW50UmF3PjsKK3VzaW5nIEZv bnRGYW1pbHlSYXcgPSBWYXJpYW50PENTU1ZhbHVlSUQsIFN0cmluZz47CiAKIHN0cnVjdCBGb250 UmF3IHsKICAgICBPcHRpb25hbDxGb250U3R5bGVSYXc+IHN0eWxlOwpAQCAtMTQ2LDcgKzE0Niw3 IEBAIHN0cnVjdCBGb250UmF3IHsKICAgICBPcHRpb25hbDxDU1NWYWx1ZUlEPiBzdHJldGNoOwog ICAgIEZvbnRTaXplUmF3IHNpemU7CiAgICAgT3B0aW9uYWw8TGluZUhlaWdodFJhdz4gbGluZUhl aWdodDsKLSAgICBXVEY6OlZlY3RvcjxGb250RmFtaWx5UmF3PiBmYW1pbHk7CisgICAgVmVjdG9y PEZvbnRGYW1pbHlSYXc+IGZhbWlseTsKIH07CiAKIE9wdGlvbmFsPENTU1ZhbHVlSUQ+IGNvbnN1 bWVGb250VmFyaWFudENTUzIxUmF3KENTU1BhcnNlclRva2VuUmFuZ2UmKTsKQEAgLTE1OCwxMyAr MTU4LDE1IEBAIE9wdGlvbmFsPEZvbnRTdHlsZVJhdz4gY29uc3VtZUZvbnRTdHlsZVJhdyhDU1NQ YXJzZXJUb2tlblJhbmdlJiwgQ1NTUGFyc2VyTW9kZSk7CiBTdHJpbmcgY29uY2F0ZW5hdGVGYW1p bHlOYW1lKENTU1BhcnNlclRva2VuUmFuZ2UmKTsKIFN0cmluZyBjb25zdW1lRmFtaWx5TmFtZVJh dyhDU1NQYXJzZXJUb2tlblJhbmdlJik7CiBPcHRpb25hbDxDU1NWYWx1ZUlEPiBjb25zdW1lR2Vu ZXJpY0ZhbWlseVJhdyhDU1NQYXJzZXJUb2tlblJhbmdlJik7Ci1PcHRpb25hbDxXVEY6OlZlY3Rv cjxGb250RmFtaWx5UmF3Pj4gY29uc3VtZUZvbnRGYW1pbHlSYXcoQ1NTUGFyc2VyVG9rZW5SYW5n ZSYpOworT3B0aW9uYWw8VmVjdG9yPEZvbnRGYW1pbHlSYXc+PiBjb25zdW1lRm9udEZhbWlseVJh dyhDU1NQYXJzZXJUb2tlblJhbmdlJik7CiBPcHRpb25hbDxGb250U2l6ZVJhdz4gY29uc3VtZUZv bnRTaXplUmF3KENTU1BhcnNlclRva2VuUmFuZ2UmLCBDU1NQYXJzZXJNb2RlLCBVbml0bGVzc1F1 aXJrID0gVW5pdGxlc3NRdWlyazo6Rm9yYmlkKTsKIE9wdGlvbmFsPExpbmVIZWlnaHRSYXc+IGNv bnN1bWVMaW5lSGVpZ2h0UmF3KENTU1BhcnNlclRva2VuUmFuZ2UmLCBDU1NQYXJzZXJNb2RlKTsK IE9wdGlvbmFsPEZvbnRSYXc+IGNvbnN1bWVGb250V29ya2VyU2FmZShDU1NQYXJzZXJUb2tlblJh bmdlJiwgQ1NTUGFyc2VyTW9kZSk7CiBjb25zdCBBdG9tU3RyaW5nJiBnZW5lcmljRm9udEZhbWls eUZyb21WYWx1ZUlEKENTU1ZhbHVlSUQpOwogCi0vLyBUZW1wbGF0ZSBpbXBsZW1lbnRhdGlvbnMg YXJlIGF0IHRoZSBib3R0b20gb2YgdGhlIGZpbGUgZm9yIHJlYWRhYmlsaXR5LgorYm9vbCBpc0Zv bnRTdHlsZUFuZ2xlSW5SYW5nZShkb3VibGUgYW5nbGVJbkRlZ3JlZXMpOworCisvLyBUZW1wbGF0 ZSBhbmQgaW5saW5lIGltcGxlbWVudGF0aW9ucyBhcmUgYXQgdGhlIGJvdHRvbSBvZiB0aGUgZmls ZSBmb3IgcmVhZGFiaWxpdHkuCiAKIHRlbXBsYXRlPHR5cGVuYW1lLi4uIGVtcHR5QmFzZUNhc2U+ IGlubGluZSBib29sIGlkZW50TWF0Y2hlcyhDU1NWYWx1ZUlEKSB7IHJldHVybiBmYWxzZTsgfQog dGVtcGxhdGU8Q1NTVmFsdWVJRCBoZWFkLCBDU1NWYWx1ZUlELi4uIHRhaWw+IGlubGluZSBib29s IGlkZW50TWF0Y2hlcyhDU1NWYWx1ZUlEIGlkKQpAQCAtMTg2LDkgKzE4OCw5IEBAIHRlbXBsYXRl PENTU1ZhbHVlSUQuLi4gbmFtZXM+IFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUlk ZW50KENTU1BhcnNlclRvCiAgICAgcmV0dXJuIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3Jl YXRlSWRlbnRpZmllclZhbHVlKHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCkuaWQo KSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBpc0NTU1dpZGVLZXl3b3JkKGNvbnN0IENTU1Zh bHVlSUQmIGlkKQoraW5saW5lIGJvb2wgaXNGb250U3R5bGVBbmdsZUluUmFuZ2UoZG91YmxlIGFu Z2xlSW5EZWdyZWVzKQogewotICAgIHJldHVybiBpZCA9PSBDU1NWYWx1ZUluaXRpYWwgfHwgaWQg PT0gQ1NTVmFsdWVJbmhlcml0IHx8IGlkID09IENTU1ZhbHVlVW5zZXQgfHwgaWQgPT0gQ1NTVmFs dWVSZXZlcnQgfHwgaWQgPT0gQ1NTVmFsdWVEZWZhdWx0OworICAgIHJldHVybiBhbmdsZUluRGVn cmVlcyA+IC05MCAmJiBhbmdsZUluRGVncmVlcyA8IDkwOwogfQogCiB9IC8vIG5hbWVzcGFjZSBD U1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMK 414716 2020-11-20 13:53:31 -0800 2020-11-26 16:00:00 -0800 Patch bug-219222-20201120135330.patch text/plain 8980 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTZlYzRjZWJkZjRiODQ4 YWI3NDg4NmQzNGY0NjExZmEwYWUxODhmNS4uMTc1MDkwNjZiNWZmMmVkZGVhM2JhMTBkYjVmNzQ3 N2FiNzEyZThiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTExLTIwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggbm9uLXVuaWZpZWQgYnVp bGQgcHJvYmxlbSBpbiBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwIGFsb25nIHdpdGggYSBs aXR0bGUgcmVmYWN0b3JpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxOTIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpmb250U3R5bGVJc1dpdGhpblJhbmdlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OmNvbnN1bWVGb250U3R5bGVSYW5nZSk6IFVwZGF0ZWQgZm9yIG5hbWUgY2hhbmdlIHRvIGlz Rm9udFN0eWxlQW5nbGVJblJhbmdlLAorICAgICAgICBkb24ndCBmb3JjZSBhbmdsZXMgdG8gZmxv YXQgc2luY2UgdGhlIHZhbHVlcyBhcmUgc3RvcmVkIGFzIGRvdWJsZS4gVXNlIGxvY2FsIHZhcmlh YmxlcworICAgICAgICB0byBhdm9pZCBtdWx0aXBsZSBjYWxscyB0byBkb3VibGVWYWx1ZS4KKwor ICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6aXNDU1NXaWRlS2V5d29yZCk6 IE1vdmVkIGlubGluZSBmdW5jdGlvbiBoZXJlCisgICAgICAgIGZyb20gdGhlIGhlYWRlciBzaW5j ZSBpdCdzIG9ubHkgdXNlZCBpbnNpZGUgdGhpcyBmaWxlLgorICAgICAgICAoV2ViQ29yZTo6Q1NT UHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lRm9udFN0eWxlUmF3KTogVXBkYXRlZCBmb3Ig dGhlIG5hbWUgY2hhbmdlCisgICAgICAgIG9mIGlzRm9udFN0eWxlQW5nbGVJblJhbmdlLCBhbmQg YWxzbyBlbGltaW5hdGVkIGxvY2FsIHNpbmNlIGl0J3MgY2xlYXIgd2l0aG91dCBpdC4KKworICAg ICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmg6CisgICAgICAgIChX ZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OmlzQ1NTV2lkZUtleXdvcmQpOiBEZWxl dGVkLiBUaGlzIGhhZCAic3RhdGljIiBvbiBpdAorICAgICAgICBpbiBhIGhlYWRlciwgd2hpY2gg aXMgbm90IGdvb2Qgc3R5bGUsIGJ1dCBhbHNvIGRpZG4ndCBuZWVkIHRvIGJlIGluIGEgaGVhZGVy LgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjppc0ZvbnRTdHls ZUFuZ2xlSW5SYW5nZSk6IE1vdmVkIHRoaXMgaGVyZSBzbyB3ZSBjYW4KKyAgICAgICAgdXNlIGl0 IGluIHR3byBkaWZmZXJlbnQgLmNwcCBmaWxlcy4gQWxzbyByZW5hbWVkIGl0IGZvciBpbXByb3Zl ZCBjbGFyaXR5LCBhbmQgdXNlZCBhbgorICAgICAgICBpbmxpbmUgZnVuY3Rpb24gYmVjYXVzZSB0 aGlzIGlzIHN1cGVyIHNpbXBsZS4KKwogMjAyMC0xMS0yMCAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBSZW5hbWUgTGluZUl0ZXJh dG9yTGVnYWN5Ojpsb2dpY2FsTGVmdC9yaWdodCB0byBjb250ZW50TGVmdC9yaWdodApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAppbmRleCAwMTVm NjAzYjU5MTU3ZGY0NzQ0NDljNWUxNTc4N2VhMmRiMDNmZDhjLi4zZjI0MTJjZDhmNjkyMjNiNGIw NmY3YzlkMjc4ZjQ1N2E3MjY4YzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2Vy L0NTU1Byb3BlcnR5UGFyc2VyLmNwcApAQCAtOTU3LDEzICs5NTcsNiBAQCBzdGF0aWMgUmVmUHRy PENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lRm9udFN0eWxlS2V5d29yZFZhbHVlKENTU1BhcnNl clRva2VuUmFuZwogICAgIHJldHVybiBjb25zdW1lSWRlbnQ8Q1NTVmFsdWVOb3JtYWwsIENTU1Zh bHVlSXRhbGljLCBDU1NWYWx1ZU9ibGlxdWU+KHJhbmdlKTsKIH0KIAotI2lmIEVOQUJMRShWQVJJ QVRJT05fRk9OVFMpCi1zdGF0aWMgYm9vbCBmb250U3R5bGVJc1dpdGhpblJhbmdlKGZsb2F0IG9i bGlxdWUpCi17Ci0gICAgcmV0dXJuIG9ibGlxdWUgPiAtOTAgJiYgb2JsaXF1ZSA8IDkwOwotfQot I2VuZGlmCi0KIHN0YXRpYyBSZWZQdHI8Q1NTRm9udFN0eWxlVmFsdWU+IGNvbnN1bWVGb250U3R5 bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIENTU1BhcnNlck1vZGUgY3NzUGFyc2VyTW9k ZSkKIHsKICAgICBpZiAoYXV0byByZXN1bHQgPSBjb25zdW1lRm9udFN0eWxlUmF3KHJhbmdlLCBj c3NQYXJzZXJNb2RlKSkgewpAQCAtOTg5LDcgKzk4Miw4IEBAIHN0YXRpYyBSZWZQdHI8Q1NTRm9u dFN0eWxlUmFuZ2VWYWx1ZT4gY29uc3VtZUZvbnRTdHlsZVJhbmdlKENTU1BhcnNlclRva2VuUmFu Z2UmCiAgICAgICAgIHJldHVybiBDU1NGb250U3R5bGVSYW5nZVZhbHVlOjpjcmVhdGUoa2V5d29y ZC5yZWxlYXNlTm9uTnVsbCgpKTsKIAogICAgIGlmIChhdXRvIGZpcnN0QW5nbGUgPSBjb25zdW1l QW5nbGUocmFuZ2UsIGNzc1BhcnNlck1vZGUpKSB7Ci0gICAgICAgIGlmICghZm9udFN0eWxlSXNX aXRoaW5SYW5nZShmaXJzdEFuZ2xlLT52YWx1ZTxmbG9hdD4oQ1NTVW5pdFR5cGU6OkNTU19ERUcp KSkKKyAgICAgICAgYXV0byBmaXJzdEFuZ2xlSW5EZWdyZWVzID0gZmlyc3RBbmdsZS0+ZG91Ymxl VmFsdWUoQ1NTVW5pdFR5cGU6OkNTU19ERUcpOworICAgICAgICBpZiAoIWlzRm9udFN0eWxlQW5n bGVJblJhbmdlKGZpcnN0QW5nbGVJbkRlZ3JlZXMpKQogICAgICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAgICAgICAgIGlmIChyYW5nZS5hdEVuZCgpKSB7CiAgICAgICAgICAgICBhdXRvIHJlc3Vs dCA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKQEAgLTk5Nyw3ICs5OTEs MTAgQEAgc3RhdGljIFJlZlB0cjxDU1NGb250U3R5bGVSYW5nZVZhbHVlPiBjb25zdW1lRm9udFN0 eWxlUmFuZ2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSYKICAgICAgICAgICAgIHJldHVybiBDU1NGb250 U3R5bGVSYW5nZVZhbHVlOjpjcmVhdGUoa2V5d29yZC5yZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3Zl KHJlc3VsdCkpOwogICAgICAgICB9CiAgICAgICAgIGF1dG8gc2Vjb25kQW5nbGUgPSBjb25zdW1l QW5nbGUocmFuZ2UsIGNzc1BhcnNlck1vZGUpOwotICAgICAgICBpZiAoIXNlY29uZEFuZ2xlIHx8 ICFmb250U3R5bGVJc1dpdGhpblJhbmdlKHNlY29uZEFuZ2xlLT52YWx1ZTxmbG9hdD4oQ1NTVW5p dFR5cGU6OkNTU19ERUcpKSB8fCBmaXJzdEFuZ2xlLT5mbG9hdFZhbHVlKENTU1VuaXRUeXBlOjpD U1NfREVHKSA+IHNlY29uZEFuZ2xlLT5mbG9hdFZhbHVlKENTU1VuaXRUeXBlOjpDU1NfREVHKSkK KyAgICAgICAgaWYgKCFzZWNvbmRBbmdsZSkKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOwor ICAgICAgICBhdXRvIHNlY29uZEFuZ2xlSW5EZWdyZWVzID0gc2Vjb25kQW5nbGUtPmRvdWJsZVZh bHVlKENTU1VuaXRUeXBlOjpDU1NfREVHKTsKKyAgICAgICAgaWYgKCFpc0ZvbnRTdHlsZUFuZ2xl SW5SYW5nZShzZWNvbmRBbmdsZUluRGVncmVlcykgfHwgZmlyc3RBbmdsZUluRGVncmVlcyA+IHNl Y29uZEFuZ2xlSW5EZWdyZWVzKQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAg IGF1dG8gcmVzdWx0ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNlcGFyYXRlZCgpOwogICAg ICAgICByZXN1bHQtPmFwcGVuZChmaXJzdEFuZ2xlLnJlbGVhc2VOb25OdWxsKCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMu Y3BwCmluZGV4IGNmMzQ1YzIwZGYyM2UyM2VlOGY0M2NhM2E1MmUwZDQwMmZjODQxYzYuLjY4NGE0 NzliMDlkZGNlZTRkMmI0MTljYjBhZTY4ODE0MGU1OWFkYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHAKQEAgLTUx LDYgKzUxLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFtZXNwYWNlIENTU1Byb3BlcnR5 UGFyc2VySGVscGVycyB7CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc0NTU1dpZGVLZXl3b3JkKENT U1ZhbHVlSUQgaWQpCit7CisgICAgcmV0dXJuIGlkID09IENTU1ZhbHVlSW5pdGlhbCB8fCBpZCA9 PSBDU1NWYWx1ZUluaGVyaXQgfHwgaWQgPT0gQ1NTVmFsdWVVbnNldCB8fCBpZCA9PSBDU1NWYWx1 ZVJldmVydCB8fCBpZCA9PSBDU1NWYWx1ZURlZmF1bHQ7Cit9CisKIGJvb2wgY29uc3VtZUNvbW1h SW5jbHVkaW5nV2hpdGVzcGFjZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSkKIHsKICAgICBD U1NQYXJzZXJUb2tlbiB2YWx1ZSA9IHJhbmdlLnBlZWsoKTsKQEAgLTE5NTMsOCArMTk1OCw3IEBA IE9wdGlvbmFsPEZvbnRTdHlsZVJhdz4gY29uc3VtZUZvbnRTdHlsZVJhdyhDU1NQYXJzZXJUb2tl blJhbmdlJiByYW5nZSwgQ1NTUGFyc2VyCiAjaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykKICAg ICBpZiAoIXJhbmdlLmF0RW5kKCkpIHsKICAgICAgICAgaWYgKGF1dG8gYW5nbGUgPSBjb25zdW1l QW5nbGVSYXcocmFuZ2UsIGNzc1BhcnNlck1vZGUpKSB7Ci0gICAgICAgICAgICBhdXRvIGFuZ2xl SW5EZWdyZWVzID0gQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVEZWdyZWVzKGFuZ2xlLT50eXBl LCBhbmdsZS0+dmFsdWUpOwotICAgICAgICAgICAgaWYgKGZvbnRTdHlsZUlzV2l0aGluUmFuZ2Uo YW5nbGVJbkRlZ3JlZXMpKQorICAgICAgICAgICAgaWYgKGlzRm9udFN0eWxlQW5nbGVJblJhbmdl KENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlRGVncmVlcyhhbmdsZS0+dHlwZSwgYW5nbGUtPnZh bHVlKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHsgeyBDU1NWYWx1ZU9ibGlxdWUsIFdURk1v dmUoYW5nbGUpIH0gfTsKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAgICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJz ZXJIZWxwZXJzLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2Vy SGVscGVycy5oCmluZGV4IGFmMDA4MDE3NTE5OWMwMzY3MDdlM2RhOWU1YWIxNmUyODMyNDdlZmUu LjI1YjZkYzU1YWFhMmJlNTJkNDE5ODEzY2EwNWIzZDZjYzVjOGU1NjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuaApAQCAt NjcsNyArNjcsNyBAQCBzdHJ1Y3QgTGVuZ3RoUmF3IHsKICAgICBkb3VibGUgdmFsdWU7CiB9Owog Ci11c2luZyBMZW5ndGhPclBlcmNlbnRSYXcgPSBXVEY6OlZhcmlhbnQ8TGVuZ3RoUmF3LCBkb3Vi bGU+OwordXNpbmcgTGVuZ3RoT3JQZXJjZW50UmF3ID0gVmFyaWFudDxMZW5ndGhSYXcsIGRvdWJs ZT47CiAKIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUludGVnZXIoQ1NTUGFyc2Vy VG9rZW5SYW5nZSYsIGRvdWJsZSBtaW5pbXVtVmFsdWUgPSAtc3RkOjpudW1lcmljX2xpbWl0czxk b3VibGU+OjptYXgoKSk7CiBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVQb3NpdGl2 ZUludGVnZXIoQ1NTUGFyc2VyVG9rZW5SYW5nZSYpOwpAQCAtMTM0LDEwICsxMzQsMTAgQEAgc3Ry dWN0IEZvbnRTdHlsZVJhdyB7CiAgICAgQ1NTVmFsdWVJRCBzdHlsZTsKICAgICBPcHRpb25hbDxB bmdsZVJhdz4gYW5nbGU7CiB9OwotdXNpbmcgRm9udFdlaWdodFJhdyA9IFdURjo6VmFyaWFudDxD U1NWYWx1ZUlELCBkb3VibGU+OwotdXNpbmcgRm9udFNpemVSYXcgPSBXVEY6OlZhcmlhbnQ8Q1NT VmFsdWVJRCwgQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpMZW5ndGhPclBlcmNlbnRSYXc+Owot dXNpbmcgTGluZUhlaWdodFJhdyA9IFdURjo6VmFyaWFudDxDU1NWYWx1ZUlELCBkb3VibGUsIENT U1Byb3BlcnR5UGFyc2VySGVscGVyczo6TGVuZ3RoT3JQZXJjZW50UmF3PjsKLXVzaW5nIEZvbnRG YW1pbHlSYXcgPSBXVEY6OlZhcmlhbnQ8Q1NTVmFsdWVJRCwgU3RyaW5nPjsKK3VzaW5nIEZvbnRX ZWlnaHRSYXcgPSBWYXJpYW50PENTU1ZhbHVlSUQsIGRvdWJsZT47Cit1c2luZyBGb250U2l6ZVJh dyA9IFZhcmlhbnQ8Q1NTVmFsdWVJRCwgQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpMZW5ndGhP clBlcmNlbnRSYXc+OwordXNpbmcgTGluZUhlaWdodFJhdyA9IFZhcmlhbnQ8Q1NTVmFsdWVJRCwg ZG91YmxlLCBDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6Okxlbmd0aE9yUGVyY2VudFJhdz47Cit1 c2luZyBGb250RmFtaWx5UmF3ID0gVmFyaWFudDxDU1NWYWx1ZUlELCBTdHJpbmc+OwogCiBzdHJ1 Y3QgRm9udFJhdyB7CiAgICAgT3B0aW9uYWw8Rm9udFN0eWxlUmF3PiBzdHlsZTsKQEAgLTE0Niw3 ICsxNDYsNyBAQCBzdHJ1Y3QgRm9udFJhdyB7CiAgICAgT3B0aW9uYWw8Q1NTVmFsdWVJRD4gc3Ry ZXRjaDsKICAgICBGb250U2l6ZVJhdyBzaXplOwogICAgIE9wdGlvbmFsPExpbmVIZWlnaHRSYXc+ IGxpbmVIZWlnaHQ7Ci0gICAgV1RGOjpWZWN0b3I8Rm9udEZhbWlseVJhdz4gZmFtaWx5OworICAg IFZlY3RvcjxGb250RmFtaWx5UmF3PiBmYW1pbHk7CiB9OwogCiBPcHRpb25hbDxDU1NWYWx1ZUlE PiBjb25zdW1lRm9udFZhcmlhbnRDU1MyMVJhdyhDU1NQYXJzZXJUb2tlblJhbmdlJik7CkBAIC0x NTgsMTMgKzE1OCwxNSBAQCBPcHRpb25hbDxGb250U3R5bGVSYXc+IGNvbnN1bWVGb250U3R5bGVS YXcoQ1NTUGFyc2VyVG9rZW5SYW5nZSYsIENTU1BhcnNlck1vZGUpOwogU3RyaW5nIGNvbmNhdGVu YXRlRmFtaWx5TmFtZShDU1NQYXJzZXJUb2tlblJhbmdlJik7CiBTdHJpbmcgY29uc3VtZUZhbWls eU5hbWVSYXcoQ1NTUGFyc2VyVG9rZW5SYW5nZSYpOwogT3B0aW9uYWw8Q1NTVmFsdWVJRD4gY29u c3VtZUdlbmVyaWNGYW1pbHlSYXcoQ1NTUGFyc2VyVG9rZW5SYW5nZSYpOwotT3B0aW9uYWw8V1RG OjpWZWN0b3I8Rm9udEZhbWlseVJhdz4+IGNvbnN1bWVGb250RmFtaWx5UmF3KENTU1BhcnNlclRv a2VuUmFuZ2UmKTsKK09wdGlvbmFsPFZlY3RvcjxGb250RmFtaWx5UmF3Pj4gY29uc3VtZUZvbnRG YW1pbHlSYXcoQ1NTUGFyc2VyVG9rZW5SYW5nZSYpOwogT3B0aW9uYWw8Rm9udFNpemVSYXc+IGNv bnN1bWVGb250U2l6ZVJhdyhDU1NQYXJzZXJUb2tlblJhbmdlJiwgQ1NTUGFyc2VyTW9kZSwgVW5p dGxlc3NRdWlyayA9IFVuaXRsZXNzUXVpcms6OkZvcmJpZCk7CiBPcHRpb25hbDxMaW5lSGVpZ2h0 UmF3PiBjb25zdW1lTGluZUhlaWdodFJhdyhDU1NQYXJzZXJUb2tlblJhbmdlJiwgQ1NTUGFyc2Vy TW9kZSk7CiBPcHRpb25hbDxGb250UmF3PiBjb25zdW1lRm9udFdvcmtlclNhZmUoQ1NTUGFyc2Vy VG9rZW5SYW5nZSYsIENTU1BhcnNlck1vZGUpOwogY29uc3QgQXRvbVN0cmluZyYgZ2VuZXJpY0Zv bnRGYW1pbHlGcm9tVmFsdWVJRChDU1NWYWx1ZUlEKTsKIAotLy8gVGVtcGxhdGUgaW1wbGVtZW50 YXRpb25zIGFyZSBhdCB0aGUgYm90dG9tIG9mIHRoZSBmaWxlIGZvciByZWFkYWJpbGl0eS4KK2Jv b2wgaXNGb250U3R5bGVBbmdsZUluUmFuZ2UoZG91YmxlIGFuZ2xlSW5EZWdyZWVzKTsKKworLy8g VGVtcGxhdGUgYW5kIGlubGluZSBpbXBsZW1lbnRhdGlvbnMgYXJlIGF0IHRoZSBib3R0b20gb2Yg dGhlIGZpbGUgZm9yIHJlYWRhYmlsaXR5LgogCiB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBlbXB0eUJh c2VDYXNlPiBpbmxpbmUgYm9vbCBpZGVudE1hdGNoZXMoQ1NTVmFsdWVJRCkgeyByZXR1cm4gZmFs c2U7IH0KIHRlbXBsYXRlPENTU1ZhbHVlSUQgaGVhZCwgQ1NTVmFsdWVJRC4uLiB0YWlsPiBpbmxp bmUgYm9vbCBpZGVudE1hdGNoZXMoQ1NTVmFsdWVJRCBpZCkKQEAgLTE4Niw5ICsxODgsOSBAQCB0 ZW1wbGF0ZTxDU1NWYWx1ZUlELi4uIG5hbWVzPiBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNv bnN1bWVJZGVudChDU1NQYXJzZXJUbwogICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShyYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFj ZSgpLmlkKCkpOwogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgaXNDU1NXaWRlS2V5d29yZChjb25z dCBDU1NWYWx1ZUlEJiBpZCkKK2lubGluZSBib29sIGlzRm9udFN0eWxlQW5nbGVJblJhbmdlKGRv dWJsZSBhbmdsZUluRGVncmVlcykKIHsKLSAgICByZXR1cm4gaWQgPT0gQ1NTVmFsdWVJbml0aWFs IHx8IGlkID09IENTU1ZhbHVlSW5oZXJpdCB8fCBpZCA9PSBDU1NWYWx1ZVVuc2V0IHx8IGlkID09 IENTU1ZhbHVlUmV2ZXJ0IHx8IGlkID09IENTU1ZhbHVlRGVmYXVsdDsKKyAgICByZXR1cm4gYW5n bGVJbkRlZ3JlZXMgPiAtOTAgJiYgYW5nbGVJbkRlZ3JlZXMgPCA5MDsKIH0KIAogfSAvLyBuYW1l c3BhY2UgQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzCg==