139172 2014-12-01 21:21:29 -0800 Move 'font-family' CSS property to the new StyleBuilder 2014-12-02 08:42:02 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue kling koivisto sam oldest_to_newest 1051729 0 cdumez 2014-12-01 21:21:29 -0800 Move 'font-family' CSS property to the new StyleBuilder 1051741 1 242385 cdumez 2014-12-01 21:59:28 -0800 Created attachment 242385 Patch 1051835 2 242385 commit-queue 2014-12-02 08:41:58 -0800 Comment on attachment 242385 Patch Clearing flags on attachment: 242385 Committed r176657: <http://trac.webkit.org/changeset/176657> 1051836 3 commit-queue 2014-12-02 08:42:02 -0800 All reviewed patches have been landed. Closing bug. 242385 2014-12-01 21:59:28 -0800 2014-12-02 08:41:58 -0800 Patch bug-139172-20141201215958.patch text/plain 14073 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWZjZmUzMDgyMjAzNWZi NDQyN2M5MzQwYWJkZTlkMjZhMjdmN2JmOS4uNGY3ZjE0YTZmZTE3Zjc4YWE5ZmY4NDE0ZjI4N2U1 YWZhYWViMmE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnZm9udC1mYW1pbHkn IENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5MTcyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSAnZm9udC1mYW1pbHknIENTUyBwcm9w ZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlciBieSB1c2luZworICAgICAgICBjdXN0b20gY29k ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAg ICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5 bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6 OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0 eUZvbnRGYW1pbHk6OmFwcGx5SW5oZXJpdFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkFwcGx5UHJvcGVydHlGb250RmFtaWx5OjphcHBseUluaXRpYWxWYWx1ZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Rm9udEZhbWlseTo6YXBwbHlWYWx1ZSk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Rm9udEZhbWlseTo6Y3Jl YXRlSGFuZGxlcik6IERlbGV0ZWQuCisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5o OgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxGb250 RmFtaWx5KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhl cml0Rm9udEZhbWlseSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFw cGx5VmFsdWVGb250RmFtaWx5KToKKwogMjAxNC0xMS0yMCAgSmVmZnJleSBQZmF1ICA8anBmYXVA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBjYW5jZWxhYmxlIHZlcnNpb24gb2Ygd2lsbFNlbmRS ZXF1ZXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5p biBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCmluZGV4IGI1NzBkNDcx OTVjY2Y3ZmUxZWVkZTUzYmM2NGI3ZjFlMTE2NWM4NzcuLmI1ODM1MjkyNWJlMjk5Y2MxMjQ1ODg2 OGUyNzA3YTVkNzcwMjYzOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmlu CkBAIC01OSw3ICs1OSw3IEBAIGNvbG9yIFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0K IGRpcmVjdGlvbiBbSW5oZXJpdGVkLCBDdXN0b209VmFsdWVdCiBkaXNwbGF5IFtMZWdhY3lTdHls ZUJ1aWxkZXJdCiBmb250IFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KLWZvbnQtZmFt aWx5IFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KK2ZvbnQtZmFtaWx5IFtJbmhlcml0 ZWQsIEN1c3RvbT1BbGxdCiBmb250LXNpemUgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVy XQogZm9udC1zdHlsZSBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCiBmb250LXZhcmlh bnQgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDI2MjM1NmU2ZmU4MTc5NDg5MDk1NmZj ZTIwZDM4MzFmZmE0MjE2MjIuLjk4YmRhNzQ1NzRlMTNjYzZkY2UyM2ZmYTMwNzg3NTdiNzRhZDQz YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAK QEAgLTM3MiwxMTMgKzM3Miw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVy IGNyZWF0ZUhhbmRsZXIoKSB7IHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZh bHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsgfQogfTsKIAotY2xhc3MgQXBw bHlQcm9wZXJ0eUZvbnRGYW1pbHkgewotcHVibGljOgotICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5o ZXJpdFZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi0g ICAgewotICAgICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNv bHZlci0+c3R5bGUoKS0+Zm9udERlc2NyaXB0aW9uKCk7Ci0gICAgICAgIEZvbnREZXNjcmlwdGlv biBwYXJlbnRGb250RGVzY3JpcHRpb24gPSBzdHlsZVJlc29sdmVyLT5wYXJlbnRTdHlsZSgpLT5m b250RGVzY3JpcHRpb24oKTsKLSAgICAgICAgCi0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRH ZW5lcmljRmFtaWx5KHBhcmVudEZvbnREZXNjcmlwdGlvbi5nZW5lcmljRmFtaWx5KCkpOwotICAg ICAgICBmb250RGVzY3JpcHRpb24uc2V0RmFtaWxpZXMocGFyZW50Rm9udERlc2NyaXB0aW9uLmZh bWlsaWVzKCkpOwotICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0SXNTcGVjaWZpZWRGb250KHBh cmVudEZvbnREZXNjcmlwdGlvbi5pc1NwZWNpZmllZEZvbnQoKSk7Ci0gICAgICAgIHN0eWxlUmVz b2x2ZXItPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotCi0gICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFsdWUoQ1NTUHJvcGVy dHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKLSAgICB7Ci0gICAgICAgIEZvbnRE ZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5mb250 RGVzY3JpcHRpb24oKTsKLSAgICAgICAgRm9udERlc2NyaXB0aW9uIGluaXRpYWxEZXNjID0gRm9u dERlc2NyaXB0aW9uKCk7Ci0gICAgICAgIAotICAgICAgICAvLyBXZSBuZWVkIHRvIGFkanVzdCB0 aGUgc2l6ZSB0byBhY2NvdW50IGZvciB0aGUgZ2VuZXJpYyBmYW1pbHkgY2hhbmdlIGZyb20gbW9u b3NwYWNlIHRvIG5vbi1tb25vc3BhY2UuCi0gICAgICAgIGlmIChmb250RGVzY3JpcHRpb24ua2V5 d29yZFNpemUoKSAmJiBmb250RGVzY3JpcHRpb24udXNlRml4ZWREZWZhdWx0U2l6ZSgpKQotICAg ICAgICAgICAgc3R5bGVSZXNvbHZlci0+c2V0Rm9udFNpemUoZm9udERlc2NyaXB0aW9uLCBTdHls ZTo6Zm9udFNpemVGb3JLZXl3b3JkKENTU1ZhbHVlWHhTbWFsbCArIGZvbnREZXNjcmlwdGlvbi5r ZXl3b3JkU2l6ZSgpIC0gMSwgZmFsc2UsIHN0eWxlUmVzb2x2ZXItPmRvY3VtZW50KCkpKTsKLSAg ICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHkoaW5pdGlhbERlc2MuZ2VuZXJp Y0ZhbWlseSgpKTsKLSAgICAgICAgaWYgKCFpbml0aWFsRGVzYy5maXJzdEZhbWlseSgpLmlzRW1w dHkoKSkKLSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRGYW1pbGllcyhpbml0aWFsRGVz Yy5mYW1pbGllcygpKTsKLQotICAgICAgICBzdHlsZVJlc29sdmVyLT5zZXRGb250RGVzY3JpcHRp b24oZm9udERlc2NyaXB0aW9uKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIHN0YXRp YyB2b2lkIGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNv bHZlciwgQ1NTVmFsdWUqIHZhbHVlKQotICAgIHsKLSAgICAgICAgaWYgKCFpczxDU1NWYWx1ZUxp c3Q+KCp2YWx1ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgYXV0byYgdmFsdWVM aXN0ID0gZG93bmNhc3Q8Q1NTVmFsdWVMaXN0PigqdmFsdWUpOwotCi0gICAgICAgIEZvbnREZXNj cmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5mb250RGVz Y3JpcHRpb24oKTsKLSAgICAgICAgLy8gQmVmb3JlIG1hcHBpbmcgaW4gYSBuZXcgZm9udC1mYW1p bHkgcHJvcGVydHksIHdlIHNob3VsZCByZXNldCB0aGUgZ2VuZXJpYyBmYW1pbHkuCi0gICAgICAg IGJvb2wgb2xkRmFtaWx5VXNlZEZpeGVkRGVmYXVsdFNpemUgPSBmb250RGVzY3JpcHRpb24udXNl Rml4ZWREZWZhdWx0U2l6ZSgpOwotICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0R2VuZXJpY0Zh bWlseShGb250RGVzY3JpcHRpb246Ok5vRmFtaWx5KTsKLQotICAgICAgICBWZWN0b3I8QXRvbWlj U3RyaW5nPiBmYW1pbGllczsKLSAgICAgICAgZmFtaWxpZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0 eSh2YWx1ZUxpc3QubGVuZ3RoKCkpOwotCi0gICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCB2YWx1ZUxpc3QubGVuZ3RoKCk7ICsraSkgewotICAgICAgICAgICAgQ1NTVmFsdWUqIGl0ZW0g PSB2YWx1ZUxpc3QuaXRlbShpKTsKLSAgICAgICAgICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFs dWU+KCppdGVtKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIENTU1By aW1pdGl2ZVZhbHVlJiBjb250ZW50VmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4o Kml0ZW0pOwotICAgICAgICAgICAgQXRvbWljU3RyaW5nIGZhY2U7Ci0gICAgICAgICAgICBpZiAo Y29udGVudFZhbHVlLmlzU3RyaW5nKCkpCi0gICAgICAgICAgICAgICAgZmFjZSA9IGNvbnRlbnRW YWx1ZS5nZXRTdHJpbmdWYWx1ZSgpOwotICAgICAgICAgICAgZWxzZSBpZiAoU2V0dGluZ3MqIHNl dHRpbmdzID0gc3R5bGVSZXNvbHZlci0+ZG9jdW1lbnQoKS5zZXR0aW5ncygpKSB7Ci0gICAgICAg ICAgICAgICAgc3dpdGNoIChjb250ZW50VmFsdWUuZ2V0VmFsdWVJRCgpKSB7Ci0gICAgICAgICAg ICAgICAgY2FzZSBDU1NWYWx1ZVdlYmtpdEJvZHk6Ci0gICAgICAgICAgICAgICAgICAgIGZhY2Ug PSBzZXR0aW5ncy0+c3RhbmRhcmRGb250RmFtaWx5KCk7Ci0gICAgICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVTZXJpZjoKLSAgICAgICAgICAgICAg ICAgICAgZmFjZSA9IHNlcmlmRmFtaWx5OwotICAgICAgICAgICAgICAgICAgICBmb250RGVzY3Jp cHRpb24uc2V0R2VuZXJpY0ZhbWlseShGb250RGVzY3JpcHRpb246OlNlcmlmRmFtaWx5KTsKLSAg ICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZVNh bnNTZXJpZjoKLSAgICAgICAgICAgICAgICAgICAgZmFjZSA9IHNhbnNTZXJpZkZhbWlseTsKLSAg ICAgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHkoRm9udERl c2NyaXB0aW9uOjpTYW5zU2VyaWZGYW1pbHkpOwotICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgICAgICBjYXNlIENTU1ZhbHVlQ3Vyc2l2ZToKLSAgICAgICAgICAgICAgICAg ICAgZmFjZSA9IGN1cnNpdmVGYW1pbHk7Ci0gICAgICAgICAgICAgICAgICAgIGZvbnREZXNjcmlw dGlvbi5zZXRHZW5lcmljRmFtaWx5KEZvbnREZXNjcmlwdGlvbjo6Q3Vyc2l2ZUZhbWlseSk7Ci0g ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVG YW50YXN5OgotICAgICAgICAgICAgICAgICAgICBmYWNlID0gZmFudGFzeUZhbWlseTsKLSAgICAg ICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHkoRm9udERlc2Ny aXB0aW9uOjpGYW50YXN5RmFtaWx5KTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZU1vbm9zcGFjZToKLSAgICAgICAgICAgICAgICAgICAg ZmFjZSA9IG1vbm9zcGFjZUZhbWlseTsKLSAgICAgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0 aW9uLnNldEdlbmVyaWNGYW1pbHkoRm9udERlc2NyaXB0aW9uOjpNb25vc3BhY2VGYW1pbHkpOwot ICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICBjYXNlIENTU1ZhbHVl V2Via2l0UGljdG9ncmFwaDoKLSAgICAgICAgICAgICAgICAgICAgZmFjZSA9IHBpY3RvZ3JhcGhG YW1pbHk7Ci0gICAgICAgICAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRHZW5lcmljRmFt aWx5KEZvbnREZXNjcmlwdGlvbjo6UGljdG9ncmFwaEZhbWlseSk7Ci0gICAgICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAg aWYgKGZhY2UuaXNFbXB0eSgpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAg ICAgaWYgKGZhbWlsaWVzLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRp b24uc2V0SXNTcGVjaWZpZWRGb250KGZvbnREZXNjcmlwdGlvbi5nZW5lcmljRmFtaWx5KCkgPT0g Rm9udERlc2NyaXB0aW9uOjpOb0ZhbWlseSk7Ci0gICAgICAgICAgICBmYW1pbGllcy51bmNoZWNr ZWRBcHBlbmQoZmFjZSk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoZmFtaWxpZXMuaXNFbXB0 eSgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0RmFt aWxpZXMoZmFtaWxpZXMpOwotCi0gICAgICAgIGlmIChmb250RGVzY3JpcHRpb24ua2V5d29yZFNp emUoKSAmJiBmb250RGVzY3JpcHRpb24udXNlRml4ZWREZWZhdWx0U2l6ZSgpICE9IG9sZEZhbWls eVVzZWRGaXhlZERlZmF1bHRTaXplKQotICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+c2V0Rm9u dFNpemUoZm9udERlc2NyaXB0aW9uLCBTdHlsZTo6Zm9udFNpemVGb3JLZXl3b3JkKENTU1ZhbHVl WHhTbWFsbCArIGZvbnREZXNjcmlwdGlvbi5rZXl3b3JkU2l6ZSgpIC0gMSwgIW9sZEZhbWlseVVz ZWRGaXhlZERlZmF1bHRTaXplLCBzdHlsZVJlc29sdmVyLT5kb2N1bWVudCgpKSk7Ci0KLSAgICAg ICAgc3R5bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Ci0g ICAgfQotCi0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1 cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVl LCAmYXBwbHlWYWx1ZSk7IH0KLX07Ci0KIGNsYXNzIEFwcGx5UHJvcGVydHlGb250U2l6ZSB7CiBw cml2YXRlOgogICAgIC8vIFdoZW4gdGhlIENTUyBrZXl3b3JkICJsYXJnZXIiIGlzIHVzZWQsIHRo aXMgZnVuY3Rpb24gd2lsbCBhdHRlbXB0IHRvIG1hdGNoIHdpdGhpbiB0aGUga2V5d29yZApAQCAt MTE0Nyw3ICsxMDQwLDYgQEAgRGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0eWxl QnVpbGRlcigpCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q291bnRlclJlc2V0 LCBBcHBseVByb3BlcnR5Q291bnRlcjxSZXNldD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q3Vyc29yLCBBcHBseVByb3BlcnR5Q3Vyc29yOjpj cmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eURpc3Bs YXksIEFwcGx5UHJvcGVydHlEaXNwbGF5OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRGYW1pbHksIEFwcGx5UHJvcGVydHlGb250RmFtaWx5 OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZv bnRTaXplLCBBcHBseVByb3BlcnR5Rm9udFNpemU6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFN0eWxlLCBBcHBseVByb3BlcnR5Rm9udDxG b250SXRhbGljLCAmRm9udERlc2NyaXB0aW9uOjppdGFsaWMsICZGb250RGVzY3JpcHRpb246OnNl dEl0YWxpYywgRm9udEl0YWxpY09mZj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVy dHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIEFwcGx5UHJvcGVydHlGb250PEZvbnRT bWFsbENhcHMsICZGb250RGVzY3JpcHRpb246OnNtYWxsQ2FwcywgJkZvbnREZXNjcmlwdGlvbjo6 c2V0U21hbGxDYXBzLCBGb250U21hbGxDYXBzT2ZmPjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCAzZmI4YWM5NzI5ZDQ4NmY4ZjUx ZmVjOTEwMTI1YzRiN2YwMWQ3NDRmLi4xYmYxNzJlNzJlYzNlMTk0YzE5YjZkM2MzZGFlMWVmYTZj MThmNDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9t LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0zNSw2 ICszNSw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJMb2NhbGVUb1NjcmlwdE1h cHBpbmcuaCIKICNpbmNsdWRlICJSZWN0LmgiCisjaW5jbHVkZSAiU3R5bGVGb250U2l6ZUZ1bmN0 aW9ucy5oIgogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewpAQCAtMTE2LDYgKzExNywxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhl cml0V2Via2l0Qm94U2hhZG93KFN0eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgdm9pZCBhcHBs eVZhbHVlV2Via2l0Qm94U2hhZG93KFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogCisgICAg c3RhdGljIHZvaWQgYXBwbHlJbml0aWFsRm9udEZhbWlseShTdHlsZVJlc29sdmVyJik7CisgICAg c3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Rm9udEZhbWlseShTdHlsZVJlc29sdmVyJik7CisgICAg c3RhdGljIHZvaWQgYXBwbHlWYWx1ZUZvbnRGYW1pbHkoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVl Jik7CisKIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3RpdmVab29tKFN0eWxl UmVzb2x2ZXImKTsKICAgICBzdGF0aWMgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSBjc3N0b0xl bmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKFN0eWxlUmVzb2x2ZXImKTsKQEAg LTg4MSw2ICs4ODYsMTAwIEBAIGlubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlW YWx1ZVdlYmtpdEJveFNoYWRvdyhTdHlsZVJlc29sdmVyJiBzdHlsZVJlCiAgICAgYXBwbHlUZXh0 T3JCb3hTaGFkb3dWYWx1ZTxDU1NQcm9wZXJ0eVdlYmtpdEJveFNoYWRvdz4oc3R5bGVSZXNvbHZl ciwgdmFsdWUpOwogfQogCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5p dGlhbEZvbnRGYW1pbHkoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKK3sKKyAgICBGb250 RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5mb250 RGVzY3JpcHRpb24oKTsKKyAgICBGb250RGVzY3JpcHRpb24gaW5pdGlhbERlc2MgPSBGb250RGVz Y3JpcHRpb24oKTsKKworICAgIC8vIFdlIG5lZWQgdG8gYWRqdXN0IHRoZSBzaXplIHRvIGFjY291 bnQgZm9yIHRoZSBnZW5lcmljIGZhbWlseSBjaGFuZ2UgZnJvbSBtb25vc3BhY2UgdG8gbm9uLW1v bm9zcGFjZS4KKyAgICBpZiAoZm9udERlc2NyaXB0aW9uLmtleXdvcmRTaXplKCkgJiYgZm9udERl c2NyaXB0aW9uLnVzZUZpeGVkRGVmYXVsdFNpemUoKSkKKyAgICAgICAgc3R5bGVSZXNvbHZlci5z ZXRGb250U2l6ZShmb250RGVzY3JpcHRpb24sIFN0eWxlOjpmb250U2l6ZUZvcktleXdvcmQoQ1NT VmFsdWVYeFNtYWxsICsgZm9udERlc2NyaXB0aW9uLmtleXdvcmRTaXplKCkgLSAxLCBmYWxzZSwg c3R5bGVSZXNvbHZlci5kb2N1bWVudCgpKSk7CisgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVy aWNGYW1pbHkoaW5pdGlhbERlc2MuZ2VuZXJpY0ZhbWlseSgpKTsKKyAgICBpZiAoIWluaXRpYWxE ZXNjLmZpcnN0RmFtaWx5KCkuaXNFbXB0eSgpKQorICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0 RmFtaWxpZXMoaW5pdGlhbERlc2MuZmFtaWxpZXMoKSk7CisKKyAgICBzdHlsZVJlc29sdmVyLnNl dEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOworfQorCitpbmxpbmUgdm9pZCBTdHls ZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEZvbnRGYW1pbHkoU3R5bGVSZXNvbHZlciYgc3R5 bGVSZXNvbHZlcikKK3sKKyAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5mb250RGVzY3JpcHRpb24oKTsKKyAgICBGb250RGVzY3JpcHRp b24gcGFyZW50Rm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpLT5m b250RGVzY3JpcHRpb24oKTsKKworICAgIGZvbnREZXNjcmlwdGlvbi5zZXRHZW5lcmljRmFtaWx5 KHBhcmVudEZvbnREZXNjcmlwdGlvbi5nZW5lcmljRmFtaWx5KCkpOworICAgIGZvbnREZXNjcmlw dGlvbi5zZXRGYW1pbGllcyhwYXJlbnRGb250RGVzY3JpcHRpb24uZmFtaWxpZXMoKSk7CisgICAg Zm9udERlc2NyaXB0aW9uLnNldElzU3BlY2lmaWVkRm9udChwYXJlbnRGb250RGVzY3JpcHRpb24u aXNTcGVjaWZpZWRGb250KCkpOworICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2NyaXB0aW9u KGZvbnREZXNjcmlwdGlvbik7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6 YXBwbHlWYWx1ZUZvbnRGYW1pbHkoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFs dWUmIHZhbHVlKQoreworICAgIGF1dG8mIHZhbHVlTGlzdCA9IGRvd25jYXN0PENTU1ZhbHVlTGlz dD4odmFsdWUpOworCisgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHN0eWxl UmVzb2x2ZXIuc3R5bGUoKS0+Zm9udERlc2NyaXB0aW9uKCk7CisgICAgLy8gQmVmb3JlIG1hcHBp bmcgaW4gYSBuZXcgZm9udC1mYW1pbHkgcHJvcGVydHksIHdlIHNob3VsZCByZXNldCB0aGUgZ2Vu ZXJpYyBmYW1pbHkuCisgICAgYm9vbCBvbGRGYW1pbHlVc2VkRml4ZWREZWZhdWx0U2l6ZSA9IGZv bnREZXNjcmlwdGlvbi51c2VGaXhlZERlZmF1bHRTaXplKCk7CisgICAgZm9udERlc2NyaXB0aW9u LnNldEdlbmVyaWNGYW1pbHkoRm9udERlc2NyaXB0aW9uOjpOb0ZhbWlseSk7CisKKyAgICBWZWN0 b3I8QXRvbWljU3RyaW5nPiBmYW1pbGllczsKKyAgICBmYW1pbGllcy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KHZhbHVlTGlzdC5sZW5ndGgoKSk7CisKKyAgICBmb3IgKGF1dG8mIGl0ZW0gOiB2YWx1 ZUxpc3QpIHsKKyAgICAgICAgYXV0byYgY29udGVudFZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0 aXZlVmFsdWU+KGl0ZW0uZ2V0KCkpOworICAgICAgICBBdG9taWNTdHJpbmcgZmFjZTsKKyAgICAg ICAgaWYgKGNvbnRlbnRWYWx1ZS5pc1N0cmluZygpKQorICAgICAgICAgICAgZmFjZSA9IGNvbnRl bnRWYWx1ZS5nZXRTdHJpbmdWYWx1ZSgpOworICAgICAgICBlbHNlIGlmIChTZXR0aW5ncyogc2V0 dGluZ3MgPSBzdHlsZVJlc29sdmVyLmRvY3VtZW50KCkuc2V0dGluZ3MoKSkgeworICAgICAgICAg ICAgc3dpdGNoIChjb250ZW50VmFsdWUuZ2V0VmFsdWVJRCgpKSB7CisgICAgICAgICAgICBjYXNl IENTU1ZhbHVlV2Via2l0Qm9keToKKyAgICAgICAgICAgICAgICBmYWNlID0gc2V0dGluZ3MtPnN0 YW5kYXJkRm9udEZhbWlseSgpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg Y2FzZSBDU1NWYWx1ZVNlcmlmOgorICAgICAgICAgICAgICAgIGZhY2UgPSBzZXJpZkZhbWlseTsK KyAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0R2VuZXJpY0ZhbWlseShGb250RGVz Y3JpcHRpb246OlNlcmlmRmFtaWx5KTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIGNhc2UgQ1NTVmFsdWVTYW5zU2VyaWY6CisgICAgICAgICAgICAgICAgZmFjZSA9IHNhbnNT ZXJpZkZhbWlseTsKKyAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0R2VuZXJpY0Zh bWlseShGb250RGVzY3JpcHRpb246OlNhbnNTZXJpZkZhbWlseSk7CisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlQ3Vyc2l2ZToKKyAgICAgICAgICAgICAg ICBmYWNlID0gY3Vyc2l2ZUZhbWlseTsKKyAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24u c2V0R2VuZXJpY0ZhbWlseShGb250RGVzY3JpcHRpb246OkN1cnNpdmVGYW1pbHkpOworICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUZhbnRhc3k6CisgICAg ICAgICAgICAgICAgZmFjZSA9IGZhbnRhc3lGYW1pbHk7CisgICAgICAgICAgICAgICAgZm9udERl c2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHkoRm9udERlc2NyaXB0aW9uOjpGYW50YXN5RmFtaWx5 KTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVNb25v c3BhY2U6CisgICAgICAgICAgICAgICAgZmFjZSA9IG1vbm9zcGFjZUZhbWlseTsKKyAgICAgICAg ICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0R2VuZXJpY0ZhbWlseShGb250RGVzY3JpcHRpb246 Ok1vbm9zcGFjZUZhbWlseSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBj YXNlIENTU1ZhbHVlV2Via2l0UGljdG9ncmFwaDoKKyAgICAgICAgICAgICAgICBmYWNlID0gcGlj dG9ncmFwaEZhbWlseTsKKyAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0R2VuZXJp Y0ZhbWlseShGb250RGVzY3JpcHRpb246OlBpY3RvZ3JhcGhGYW1pbHkpOworICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChmYWNlLmlzRW1wdHkoKSkK KyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAoZmFtaWxpZXMuaXNFbXB0eSgpKQor ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldElzU3BlY2lmaWVkRm9udChmb250RGVzY3Jp cHRpb24uZ2VuZXJpY0ZhbWlseSgpID09IEZvbnREZXNjcmlwdGlvbjo6Tm9GYW1pbHkpOworICAg ICAgICBmYW1pbGllcy51bmNoZWNrZWRBcHBlbmQoZmFjZSk7CisgICAgfQorCisgICAgaWYgKGZh bWlsaWVzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGZvbnREZXNjcmlwdGlvbi5z ZXRGYW1pbGllcyhmYW1pbGllcyk7CisKKyAgICBpZiAoZm9udERlc2NyaXB0aW9uLmtleXdvcmRT aXplKCkgJiYgZm9udERlc2NyaXB0aW9uLnVzZUZpeGVkRGVmYXVsdFNpemUoKSAhPSBvbGRGYW1p bHlVc2VkRml4ZWREZWZhdWx0U2l6ZSkKKyAgICAgICAgc3R5bGVSZXNvbHZlci5zZXRGb250U2l6 ZShmb250RGVzY3JpcHRpb24sIFN0eWxlOjpmb250U2l6ZUZvcktleXdvcmQoQ1NTVmFsdWVYeFNt YWxsICsgZm9udERlc2NyaXB0aW9uLmtleXdvcmRTaXplKCkgLSAxLCAhb2xkRmFtaWx5VXNlZEZp eGVkRGVmYXVsdFNpemUsIHN0eWxlUmVzb2x2ZXIuZG9jdW1lbnQoKSkpOworCisgICAgc3R5bGVS ZXNvbHZlci5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gU3R5bGVCdWlsZGVyQ3VzdG9tX2gK