145400 2015-05-26 19:43:45 -0700 <font face> doesn't support plus character in font family names. 2015-05-26 21:14:15 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kling kling commit-queue darin mmaxfield oldest_to_newest 1097576 0 kling 2015-05-26 19:43:45 -0700 <rdar://problem/21097484> <font face> attributes should support font names such as "Myles + Darin" 1097577 1 253773 kling 2015-05-26 19:46:16 -0700 Created attachment 253773 Proposed patch 1097579 2 253773 darin 2015-05-26 19:52:44 -0700 Comment on attachment 253773 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=253773&action=review > Source/WebCore/css/CSSParser.cpp:1297 > + for (auto propertyID : { CSSValueSerif, CSSValueSansSerif, CSSValueCursive, CSSValueFantasy, CSSValueMonospace, CSSValueWebkitBody }) { Somehow I feel that every single call site that has this list of special family names should have some kind of FIXME in it. This joins a large and seemingly growing family. 1097584 3 253773 commit-queue 2015-05-26 21:14:10 -0700 Comment on attachment 253773 Proposed patch Clearing flags on attachment: 253773 Committed r184894: <http://trac.webkit.org/changeset/184894> 1097585 4 commit-queue 2015-05-26 21:14:15 -0700 All reviewed patches have been landed. Closing bug. 253773 2015-05-26 19:46:16 -0700 2015-05-26 21:14:10 -0700 Proposed patch bug-145400.diff text/plain 8567 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNjdkOGY1Li4zZDQyZjdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDUt MjYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIDxmb250IGZh Y2U+IGRvZXNuJ3Qgc3VwcG9ydCBwbHVzIGNoYXJhY3RlciBpbiBmb250IGZhbWlseSBuYW1lcy4K KyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0NTQwMD4KKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzIxMDk3NDg0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBhIGxpdHRsZSB0ZXN0IGZvciA8Zm9udCBmYWNlPiBhdHRyaWJ1dGVzIHRv IGNvdmVyIHRoaXMgcHJvYmxlbQorICAgICAgICBhbmQgc29tZSBvdGhlciBpbnRlcmVzdGluZyBj YXNlcyB3aXRoIHNwYWNlcyBhbmQgY29tbWFzLgorCisgICAgICAgICogZmFzdC9kb20vSFRNTEZv bnRFbGVtZW50L2ZhY2UtYXR0cmlidXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9kb20vSFRNTEZvbnRFbGVtZW50L2ZhY2UtYXR0cmlidXRlLmh0bWw6IEFkZGVkLgorCiAy MDE1LTA1LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgT3Zl cmhhbmdpbmcgZmxvYXQgc2V0cyBhcmUgbm90IGNsZWFuZWQgdXAgcHJvcGVybHkgd2hlbiBmbG9h dGluZyByZW5kZXJlciBpcyBkZXN0cm95ZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2RvbS9IVE1MRm9udEVsZW1lbnQvZmFjZS1hdHRyaWJ1dGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9kb20vSFRNTEZvbnRFbGVtZW50L2ZhY2UtYXR0cmlidXRlLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40MTYyZjIyCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTEZvbnRFbGVtZW50L2ZhY2UtYXR0cmli dXRlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDM3IEBACitIVE1MRm9udEVsZW1lbnQgZmFjZSBh dHRyaWJ1dGUgdGVzdAorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBB U1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBmb250 RmFjZUF0dHJpYnV0ZUVmZmVjdCgiIikgaXMgbnVsbAorUEFTUyBmb250RmFjZUF0dHJpYnV0ZUVm ZmVjdCgiICIpIGlzIG51bGwKK1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiwiKSBpcyBu dWxsCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIgLCIpIGlzIG51bGwKK1BBU1MgZm9u dEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiAsICIpIGlzIG51bGwKK1BBU1MgZm9udEZhY2VBdHRyaWJ1 dGVFZmZlY3QoIiwsIikgaXMgbnVsbAorUEFTUyBmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgic2Vy aWYiKSBpcyAic2VyaWYiCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJzZXJpZiAiKSBp cyAic2VyaWYiCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIsc2VyaWYsIikgaXMgbnVs bAorUEFTUyBmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiIHNlcmlmICIpIGlzICJzZXJpZiIKK1BB U1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiBzZXJpZiIpIGlzICJzZXJpZiIKK1BBU1MgZm9u dEZhY2VBdHRyaWJ1dGVFZmZlY3QoInNlcmlmICwiKSBpcyBudWxsCitQQVNTIGZvbnRGYWNlQXR0 cmlidXRlRWZmZWN0KCJzZXJpZiAsICIpIGlzIG51bGwKK1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVF ZmZlY3QoInNlcmlmLCwiKSBpcyBudWxsCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJT ZXJpZiIpIGlzICJzZXJpZiIKK1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiBTZXJpZiIp IGlzICJzZXJpZiIKK1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiBTZXJpZiAiKSBpcyAi c2VyaWYiCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIsU2VyaWYgIikgaXMgbnVsbAor UEFTUyBmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiSW5oZXJpdGVkIikgaXMgIkluaGVyaXRlZCIK K1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIkluaXRpYWwiKSBpcyAiSW5pdGlhbCIKK1BB U1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoImZvbyArIGZvbyIpIGlzICInZm9vICsgZm9vJyIK K1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiBmb28gKyBmb28iKSBpcyAiJ2ZvbyArIGZv byciCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIgZm9vICsgZm9vICIpIGlzICInZm9v ICsgZm9vJyIKK1BBU1MgZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoImZvbyArIGZvbyAiKSBpcyAi J2ZvbyArIGZvbyciCitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJmb28gKyBmb28sc2Vy aWYiKSBpcyAiJ2ZvbyArIGZvbycsIHNlcmlmIgorUEFTUyBmb250RmFjZUF0dHJpYnV0ZUVmZmVj dCgic2VyaWYsZm9vICsgZm9vLHNlcmlmIikgaXMgInNlcmlmLCAnZm9vICsgZm9vJywgc2VyaWYi CitQQVNTIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIsZm9vICsgZm9vLHNlcmlmIikgaXMgbnVs bAorUEFTUyBmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgic2VyaWYsZm9vICsgZm9vLCIpIGlzIG51 bGwKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9IVE1MRm9udEVsZW1lbnQvZmFjZS1hdHRy aWJ1dGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxGb250RWxlbWVudC9mYWNlLWF0 dHJpYnV0ZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNhYWE2OWYK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9IVE1MRm9udEVsZW1lbnQv ZmFjZS1hdHRyaWJ1dGUuaHRtbApAQCAtMCwwICsxLDYzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8c2NyaXB0IHNyYz0iLi4vLi4v Li4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5Pgor PHNjcmlwdD4KKworZGVzY3JpcHRpb24oIkhUTUxGb250RWxlbWVudCBmYWNlIGF0dHJpYnV0ZSB0 ZXN0Iik7CisKK2Z1bmN0aW9uIGZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KHZhbHVlKQoreworICAg IHZhciBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZm9udCIpOworICAgIGVsZW1l bnQuc2V0QXR0cmlidXRlKCJmYWNlIiwgdmFsdWUpOworICAgIHZhciBvdXRlckVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJwIik7CisgICAgb3V0ZXJFbGVtZW50LnNldEF0dHJpYnV0 ZSgic3R5bGUiLCAiZm9udC1mYW1pbHk6IHdoYXRldmVyIik7CisgICAgZG9jdW1lbnQuYm9keS5h cHBlbmRDaGlsZChvdXRlckVsZW1lbnQpOworICAgIG91dGVyRWxlbWVudC5hcHBlbmRDaGlsZChl bGVtZW50KTsKKyAgICB2YXIgY29tcHV0ZWRTdHlsZSA9IGdldENvbXB1dGVkU3R5bGUoZWxlbWVu dCwgIiIpOworICAgIHZhciByZXN1bHQgPSBjb21wdXRlZFN0eWxlLmZvbnRGYW1pbHk7CisgICAg ZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZChvdXRlckVsZW1lbnQpOworICAgIHJldHVybiByZXN1 bHQgPT09ICJ3aGF0ZXZlciIgPyBudWxsIDogcmVzdWx0OworfQorCitzaG91bGRCZSgnZm9udEZh Y2VBdHRyaWJ1dGVFZmZlY3QoIiIpJywgJ251bGwnKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJp YnV0ZUVmZmVjdCgiICIpJywgJ251bGwnKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVm ZmVjdCgiLCIpJywgJ251bGwnKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgi ICwiKScsICdudWxsJyk7CitzaG91bGRCZSgnZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoIiAsICIp JywgJ251bGwnKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiLCwiKScsICdu dWxsJyk7CisKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgic2VyaWYiKScsICci c2VyaWYiJyk7CitzaG91bGRCZSgnZm9udEZhY2VBdHRyaWJ1dGVFZmZlY3QoInNlcmlmICIpJywg JyJzZXJpZiInKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiLHNlcmlmLCIp JywgJ251bGwnKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiIHNlcmlmICIp JywgJyJzZXJpZiInKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiIHNlcmlm IiknLCAnInNlcmlmIicpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJzZXJp ZiAsIiknLCAnbnVsbCcpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJzZXJp ZiAsICIpJywgJ251bGwnKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgic2Vy aWYsLCIpJywgJ251bGwnKTsKKworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJT ZXJpZiIpJywgJyJzZXJpZiInKTsKK3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgi IFNlcmlmIiknLCAnInNlcmlmIicpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0 KCIgU2VyaWYgIiknLCAnInNlcmlmIicpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZm ZWN0KCIsU2VyaWYgIiknLCAnbnVsbCcpOworCitzaG91bGRCZSgnZm9udEZhY2VBdHRyaWJ1dGVF ZmZlY3QoIkluaGVyaXRlZCIpJywgJyJJbmhlcml0ZWQiJyk7CitzaG91bGRCZSgnZm9udEZhY2VB dHRyaWJ1dGVFZmZlY3QoIkluaXRpYWwiKScsICciSW5pdGlhbCInKTsKKworc2hvdWxkQmUoJ2Zv bnRGYWNlQXR0cmlidXRlRWZmZWN0KCJmb28gKyBmb28iKScsICciXCdmb28gKyBmb29cJyInKTsK K3Nob3VsZEJlKCdmb250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiIGZvbyArIGZvbyIpJywgJyJcJ2Zv byArIGZvb1wnIicpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIgZm9vICsg Zm9vICIpJywgJyJcJ2ZvbyArIGZvb1wnIicpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRl RWZmZWN0KCJmb28gKyBmb28gIiknLCAnIlwnZm9vICsgZm9vXCciJyk7CisKK3Nob3VsZEJlKCdm b250RmFjZUF0dHJpYnV0ZUVmZmVjdCgiZm9vICsgZm9vLHNlcmlmIiknLCAnIlwnZm9vICsgZm9v XCcsIHNlcmlmIicpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJzZXJpZixm b28gKyBmb28sc2VyaWYiKScsICcic2VyaWYsIFwnZm9vICsgZm9vXCcsIHNlcmlmIicpOworc2hv dWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCIsZm9vICsgZm9vLHNlcmlmIiknLCAnbnVs bCcpOworc2hvdWxkQmUoJ2ZvbnRGYWNlQXR0cmlidXRlRWZmZWN0KCJzZXJpZixmb28gKyBmb28s IiknLCAnbnVsbCcpOworCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBkMWFmNzIyLi44NGVkYjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTUt MDUtMjYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIDxmb250 IGZhY2U+IGRvZXNuJ3Qgc3VwcG9ydCBwbHVzIGNoYXJhY3RlciBpbiBmb250IGZhbWlseSBuYW1l cy4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0NTQwMD4KKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzIxMDk3NDg0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFR1cm4gQ1NTUGFyc2VyOjpwYXJzZUZvbnRGYWNlVmFsdWUoKSBpbnRvIGEg ZmFzdC1wYXRoIHBhcnNlciBmb3IKKyAgICAgICAgPGZvbnQgZmFjZT4gYXR0cmlidXRlcy4KKyAg ICAgICAgR29pbmcgdGhyb3VnaCB0aGUgZnVsbCBDU1MgcGFyc2VyIHdhcyBodXJ0aW5nIHVzIGhl cmUsIGFzIGl0IHdvdWxkCisgICAgICAgIG1pc3VuZGVyc3RhbmQgdW5xdW90ZWQgZmFtaWx5IG5h bWVzIGFuZCBjaG9rZSBvbiBlLmcgJysnLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL0hUTUxG b250RWxlbWVudC9mYWNlLWF0dHJpYnV0ZS5odG1sCisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VGb250RmFjZVZhbHVlKToK KwogMjAxNS0wNS0yNiAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAg ICAgIEVuYWJsZSBlbGVtZW50IHVuc2lnbmVkIGluZGV4IGluIFdlYkdMMiBhZ2Fpbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1BhcnNlci5jcHAKaW5kZXggOWFhNDE4Zi4uNThlNmFmMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1BhcnNlci5jcHAKQEAgLTEyODIsMTUgKzEyODIsMzAgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZUxp c3Q+IENTU1BhcnNlcjo6cGFyc2VGb250RmFjZVZhbHVlKGNvbnN0IEF0b21pY1N0cmluZyYgc3Ry aW4KIHsKICAgICBpZiAoc3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 Ci0gICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnRpZXM+IGR1bW15U3R5bGUgPSBNdXRhYmxl U3R5bGVQcm9wZXJ0aWVzOjpjcmVhdGUoKTsKIAotICAgIGlmIChwYXJzZVZhbHVlKGR1bW15U3R5 bGUuZ2V0KCksIENTU1Byb3BlcnR5Rm9udEZhbWlseSwgc3RyaW5nLCBmYWxzZSwgQ1NTUXVpcmtz TW9kZSwgbnVsbHB0cikgPT0gUGFyc2VSZXN1bHQ6OkVycm9yKQotICAgICAgICByZXR1cm4gbnVs bHB0cjsKKyAgICBSZWY8Q1NTVmFsdWVMaXN0PiB2YWx1ZUxpc3QgPSBDU1NWYWx1ZUxpc3Q6OmNy ZWF0ZUNvbW1hU2VwYXJhdGVkKCk7CisKKyAgICBWZWN0b3I8U3RyaW5nPiBmYW1pbHlOYW1lczsK KyAgICBzdHJpbmcuc3RyaW5nKCkuc3BsaXQoJywnLCB0cnVlLCBmYW1pbHlOYW1lcyk7CisKKyAg ICBmb3IgKGF1dG8mIGZhbWlseU5hbWUgOiBmYW1pbHlOYW1lcykgeworICAgICAgICBTdHJpbmcg c3RyaXBwZWQgPSBzdHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMoZmFtaWx5TmFtZSk7 CisgICAgICAgIGlmIChzdHJpcHBlZC5pc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm4gbnVs bHB0cjsKKworICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlOworICAgICAgICBmb3IgKGF1 dG8gcHJvcGVydHlJRCA6IHsgQ1NTVmFsdWVTZXJpZiwgQ1NTVmFsdWVTYW5zU2VyaWYsIENTU1Zh bHVlQ3Vyc2l2ZSwgQ1NTVmFsdWVGYW50YXN5LCBDU1NWYWx1ZU1vbm9zcGFjZSwgQ1NTVmFsdWVX ZWJraXRCb2R5IH0pIHsKKyAgICAgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShzdHJpcHBl ZCwgZ2V0VmFsdWVOYW1lKHByb3BlcnR5SUQpKSkgeworICAgICAgICAgICAgICAgIHZhbHVlID0g Y3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKHByb3BlcnR5SUQpOworICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGlmICgh dmFsdWUpCisgICAgICAgICAgICB2YWx1ZSA9IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUZvbnRGYW1p bHlWYWx1ZShzdHJpcHBlZCk7CisgICAgICAgIHZhbHVlTGlzdC0+YXBwZW5kKHZhbHVlLnJlbGVh c2VOb25OdWxsKCkpOworICAgIH0KIAotICAgIFJlZlB0cjxDU1NWYWx1ZT4gZm9udEZhbWlseSA9 IGR1bW15U3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250RmFtaWx5KTsK LSAgICBpZiAoIWZvbnRGYW1pbHktPmlzVmFsdWVMaXN0KCkpCi0gICAgICAgIHJldHVybiBudWxs cHRyOyAvLyBGSVhNRTogImluaXRpYWwiIGFuZCAiaW5oZXJpdCIgc2hvdWxkIGJlIHBhcnNlZCBh cyBmb250IG5hbWVzIGluIHRoZSBmYWNlIGF0dHJpYnV0ZS4KLSAgICByZXR1cm4gc3RhdGljX3Bv aW50ZXJfY2FzdDxDU1NWYWx1ZUxpc3Q+KGZvbnRGYW1pbHkucmVsZWFzZSgpKTsKKyAgICByZXR1 cm4gV1RGOjptb3ZlKHZhbHVlTGlzdCk7CiB9CiAKIENTU1BhcnNlcjo6UGFyc2VSZXN1bHQgQ1NT UGFyc2VyOjpwYXJzZVZhbHVlKE11dGFibGVTdHlsZVByb3BlcnRpZXMqIGRlY2xhcmF0aW9uLCBD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9y dGFudCwgQ1NTUGFyc2VyTW9kZSBjc3NQYXJzZXJNb2RlLCBTdHlsZVNoZWV0Q29udGVudHMqIGNv bnRleHRTdHlsZVNoZWV0KQo=