215685 2020-08-19 20:45:27 -0700 CTFontGetPhysicalSymbolicTraits() is faster than CTFontCopyPhysicalFont()/CTFontGetSymbolicTraits() 2020-09-06 18:33:35 -0700 1 1 1 Unclassified WebKit Text WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215684 1 mmaxfield mmaxfield benjamin cdumez cmarcelo darin ews-watchlist mmaxfield webkit-bug-importer oldest_to_newest 1681604 0 mmaxfield 2020-08-19 20:45:27 -0700 We can take a shortcut. 1681608 1 406910 mmaxfield 2020-08-19 20:55:30 -0700 Created attachment 406910 Patch 1681625 2 mmaxfield 2020-08-19 21:43:18 -0700 This patch needs to modify CoreTextSPI.h. 1681629 3 mmaxfield 2020-08-19 21:52:14 -0700 <rdar://problem/51631817> 1686240 4 408142 mmaxfield 2020-09-06 15:31:26 -0700 Created attachment 408142 Patch 1686262 5 408142 darin 2020-09-06 16:50:02 -0700 Comment on attachment 408142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408142&action=review > Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp:858 > + RetainPtr<CTFontRef> fontForSynthesisComputation = font; auto fontForSynthesisComputation = retainPtr(font); > Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.h:57 > +enum class ShouldComputePhysicalTraits : uint8_t { > + Yes, > + No > +}; I suggest bool instead of uint8_t, No before Yes, and putting this on a single line instead of vertically on 4 lines. 1686269 6 408153 mmaxfield 2020-09-06 17:15:32 -0700 Created attachment 408153 Patch for committing 1686292 7 ews-feeder 2020-09-06 18:33:35 -0700 Committed r266690: <https://trac.webkit.org/changeset/266690> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408153. 406910 2020-08-19 20:55:30 -0700 2020-09-06 15:31:25 -0700 Patch patch.txt text/plain 7853 mmaxfield ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggNjgwOGJkZDUzOGQuLmU4NmI2MTU0MGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIw LTA4LTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAg ICAgQ1RGb250R2V0UGh5c2ljYWxTeW1ib2xpY1RyYWl0cygpIGlzIGZhc3RlciB0aGFuIENURm9u dENvcHlQaHlzaWNhbEZvbnQoKS9DVEZvbnRHZXRTeW1ib2xpY1RyYWl0cygpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU2ODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybVVzZS5o OgorCiAyMDIwLTA4LTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CiAKICAgICAgICAgW0NvY29hXSBVU0UoUExBVEZPUk1fU1lTVEVNX0ZBTExCQUNLX0xJU1QpIGlz IHRydWUgb24gYWxsIENvY29hIHBsYXRmb3Jtcywgc28gdGhlcmUncyBubyBuZWVkIHRvIGNvbnN1 bHQgaXQgaW4gQ29jb2Etc3BlY2lmaWMgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3Rm L1BsYXRmb3JtVXNlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVzZS5oCmluZGV4IDU1NGI3 NTAwMzA4Li4wNTUwZWZlNGFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1V c2UuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVzZS5oCkBAIC0zMDAsMyArMzAwLDcg QEAKICNpZiBQTEFURk9STShDT0NPQSkgJiYgIShQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAwMDApCiAjZGVmaW5lIFVTRV9DVEZPTlRTSEFQRUdM WVBIUyAxCiAjZW5kaWYKKworI2lmIFBMQVRGT1JNKENPQ09BKSAmJiAhKFBMQVRGT1JNKE1BQykg JiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTUwMCkKKyNkZWZpbmUgVVNF X0NURk9OVEdFVFBIWVNJQ0FMU1lNQk9MSUNUUkFJVFMgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGY5MmQ2OTc1ZjkuLjUyMWQyNjNmYzI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIw MjAtMDgtMTkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAg ICAgICBDVEZvbnRHZXRQaHlzaWNhbFN5bWJvbGljVHJhaXRzKCkgaXMgZmFzdGVyIHRoYW4gQ1RG b250Q29weVBoeXNpY2FsRm9udCgpL0NURm9udEdldFN5bWJvbGljVHJhaXRzKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY4NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgbWFraW5n IHRoZSB0d28gY2FsbHMsIHdlIGNhbiBtYWtlIGEgc2luZ2xlIGNhbGwgdGhhdCBoYXMgdGhlIHNh bWUgZWZmZWN0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRD YWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVOZWNlc3NhcnlTeW50 aGVzaXMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNo YXJhY3RlcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv cmVUZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udEZhbWlseVNw ZWNpZmljYXRpb25Db3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250RmFtaWx5U3Bl Y2lmaWNhdGlvbkNvcmVUZXh0Ojpmb250UmFuZ2VzIGNvbnN0KToKKwogMjAyMC0wOC0xOSAgTXls ZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0g VVNFKFBMQVRGT1JNX1NZU1RFTV9GQUxMQkFDS19MSVNUKSBpcyB0cnVlIG9uIGFsbCBDb2NvYSBw bGF0Zm9ybXMsIHNvIHRoZXJlJ3Mgbm8gbmVlZCB0byBjb25zdWx0IGl0IGluIENvY29hLXNwZWNp ZmljIGZpbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKaW5kZXggYzk0OThkZWE5MTMuLjhlNTEw OTljMGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv YS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCkBAIC04MTIsNyArODEyLDcgQEAgc3Rh dGljIENURm9udFN5bWJvbGljVHJhaXRzIGNvbXB1dGVUcmFpdHMoY29uc3QgRm9udERlc2NyaXB0 aW9uJiBmb250RGVzY3JpcHRpb24KICAgICByZXR1cm4gdHJhaXRzOwogfQogCi1TeW50aGVzaXNQ YWlyIGNvbXB1dGVOZWNlc3NhcnlTeW50aGVzaXMoQ1RGb250UmVmIGZvbnQsIGNvbnN0IEZvbnRE ZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBib29sIGlzUGxhdGZvcm1Gb250KQorU3ludGhl c2lzUGFpciBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKENURm9udFJlZiBmb250LCBjb25zdCBG b250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgU2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJh aXRzIHNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0cywgYm9vbCBpc1BsYXRmb3JtRm9udCkKIHsK ICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChDVEZvbnRJc0FwcGxlQ29sb3JFbW9q aShmb250KSkKQEAgLTgyNSw4ICs4MjUsMTkgQEAgU3ludGhlc2lzUGFpciBjb21wdXRlTmVjZXNz YXJ5U3ludGhlc2lzKENURm9udFJlZiBmb250LCBjb25zdCBGb250RGVzY3JpcHRpb24mIGYKICAg ICBDVEZvbnRTeW1ib2xpY1RyYWl0cyBkZXNpcmVkVHJhaXRzID0gY29tcHV0ZVRyYWl0cyhmb250 RGVzY3JpcHRpb24pOwogCiAgICAgQ1RGb250U3ltYm9saWNUcmFpdHMgYWN0dWFsVHJhaXRzID0g MDsKLSAgICBpZiAoaXNGb250V2VpZ2h0Qm9sZChmb250RGVzY3JpcHRpb24ud2VpZ2h0KCkpIHx8 IGlzSXRhbGljKGZvbnREZXNjcmlwdGlvbi5pdGFsaWMoKSkpCi0gICAgICAgIGFjdHVhbFRyYWl0 cyA9IENURm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnQpOworICAgIGlmIChpc0ZvbnRXZWlnaHRC b2xkKGZvbnREZXNjcmlwdGlvbi53ZWlnaHQoKSkgfHwgaXNJdGFsaWMoZm9udERlc2NyaXB0aW9u Lml0YWxpYygpKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzID09 IFNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0czo6WWVzKSB7CisjaWYgVVNFKENURk9OVEdFVFBI WVNJQ0FMU1lNQk9MSUNUUkFJVFMpCisgICAgICAgICAgICBhY3R1YWxUcmFpdHMgPSBDVEZvbnRH ZXRQaHlzaWNhbFN5bWJvbGljVHJhaXRzKGZvbnQpOworI2Vsc2UKKyAgICAgICAgICAgIFJldGFp blB0cjxDVEZvbnRSZWY+IGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbiA9IGZvbnQ7CisgICAg ICAgICAgICBpZiAoYXV0byBwaHlzaWNhbEZvbnQgPSBhZG9wdENGKENURm9udENvcHlQaHlzaWNh bEZvbnQoZm9udCkpKQorICAgICAgICAgICAgICAgIGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlv biA9IFdURk1vdmUocGh5c2ljYWxGb250KTsKKyAgICAgICAgICAgIGFjdHVhbFRyYWl0cyA9IENU Rm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbi5nZXQoKSk7 CisjZW5kaWYKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBhY3R1YWxUcmFpdHMgPSBDVEZv bnRHZXRTeW1ib2xpY1RyYWl0cyhmb250KTsKKyAgICB9CiAKICAgICBib29sIG5lZWRzU3ludGhl dGljQm9sZCA9IChmb250RGVzY3JpcHRpb24uZm9udFN5bnRoZXNpcygpICYgRm9udFN5bnRoZXNp c1dlaWdodCkgJiYgKGRlc2lyZWRUcmFpdHMgJiBrQ1RGb250VHJhaXRCb2xkKSAmJiAhKGFjdHVh bFRyYWl0cyAmIGtDVEZvbnRUcmFpdEJvbGQpOwogICAgIGJvb2wgbmVlZHNTeW50aGV0aWNPYmxp cXVlID0gKGZvbnREZXNjcmlwdGlvbi5mb250U3ludGhlc2lzKCkgJiBGb250U3ludGhlc2lzU3R5 bGUpICYmIChkZXNpcmVkVHJhaXRzICYga0NURm9udFRyYWl0SXRhbGljKSAmJiAhKGFjdHVhbFRy YWl0cyAmIGtDVEZvbnRUcmFpdEl0YWxpYyk7CkBAIC0xNDk0LDcgKzE1MDUsNyBAQCBSZWZQdHI8 Rm9udD4gRm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMoY29uc3QgRm9udERl c2NyaXB0aW9uJiBkZXNjcgogICAgIC8vIGZvbnQgcG9pbnRlci4KICAgICBDVEZvbnRSZWYgc3Vi c3RpdHV0ZUZvbnQgPSBmYWxsYmFja0RlZHVwU2V0KCkuYWRkKHJlc3VsdCkuaXRlcmF0b3ItPmdl dCgpOwogCi0gICAgYXV0byBbc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21w dXRlTmVjZXNzYXJ5U3ludGhlc2lzKHN1YnN0aXR1dGVGb250LCBkZXNjcmlwdGlvbiwgaXNGb3JQ bGF0Zm9ybUZvbnQgPT0gSXNGb3JQbGF0Zm9ybUZvbnQ6OlllcykuYm9sZE9ibGlxdWVQYWlyKCk7 CisgICAgYXV0byBbc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21wdXRlTmVj ZXNzYXJ5U3ludGhlc2lzKHN1YnN0aXR1dGVGb250LCBkZXNjcmlwdGlvbiwgU2hvdWxkQ29tcHV0 ZVBoeXNpY2FsVHJhaXRzOjpObywgaXNGb3JQbGF0Zm9ybUZvbnQgPT0gSXNGb3JQbGF0Zm9ybUZv bnQ6OlllcykuYm9sZE9ibGlxdWVQYWlyKCk7CiAKICAgICBGb250UGxhdGZvcm1EYXRhIGFsdGVy bmF0ZUZvbnQoc3Vic3RpdHV0ZUZvbnQsIHBsYXRmb3JtRGF0YS5zaXplKCksIHN5bnRoZXRpY0Jv bGQsIHN5bnRoZXRpY09ibGlxdWUsIHBsYXRmb3JtRGF0YS5vcmllbnRhdGlvbigpLCBwbGF0Zm9y bURhdGEud2lkdGhWYXJpYW50KCksIHBsYXRmb3JtRGF0YS50ZXh0UmVuZGVyaW5nTW9kZSgpKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u dENhY2hlQ29yZVRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRDYWNoZUNvcmVUZXh0LmgKaW5kZXggOTRjMzI3MzViMDUuLjJhZjQxNTk4Y2E5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVD b3JlVGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0Zv bnRDYWNoZUNvcmVUZXh0LmgKQEAgLTUxLDcgKzUxLDExIEBAIHN0cnVjdCBTeW50aGVzaXNQYWly IHsKIH07CiAKIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250 UmVmLCBjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBm b250RmFjZUZlYXR1cmVzLCBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzIGZvbnRG YWNlQ2FwYWJpbGl0aWVzLCBib29sIGFwcGx5V2VpZ2h0V2lkdGhTbG9wZVZhcmlhdGlvbnMgPSB0 cnVlKTsKLVN5bnRoZXNpc1BhaXIgY29tcHV0ZU5lY2Vzc2FyeVN5bnRoZXNpcyhDVEZvbnRSZWYs IGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgaXNQbGF0Zm9ybUZvbnQgPSBmYWxzZSk7Citl bnVtIGNsYXNzIFNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0cyA6IHVpbnQ4X3QgeworICAgIFll cywKKyAgICBObworfTsKK1N5bnRoZXNpc1BhaXIgY29tcHV0ZU5lY2Vzc2FyeVN5bnRoZXNpcyhD VEZvbnRSZWYsIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIFNob3VsZENvbXB1dGVQaHlzaWNhbFRy YWl0cyA9IFNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0czo6Tm8sIGJvb2wgaXNQbGF0Zm9ybUZv bnQgPSBmYWxzZSk7CiBSZXRhaW5QdHI8Q1RGb250UmVmPiBwbGF0Zm9ybUZvbnRXaXRoRmFtaWx5 U3BlY2lhbENhc2UoY29uc3QgQXRvbVN0cmluZyYgZmFtaWx5LCBjb25zdCBGb250RGVzY3JpcHRp b24mLCBmbG9hdCBzaXplLCBBbGxvd1VzZXJJbnN0YWxsZWRGb250cyk7CiBSZXRhaW5QdHI8Q1RG b250UmVmPiBwbGF0Zm9ybUZvbnRXaXRoRmFtaWx5KGNvbnN0IEF0b21TdHJpbmcmIGZhbWlseSwg Rm9udFNlbGVjdGlvblJlcXVlc3QsIFRleHRSZW5kZXJpbmdNb2RlLCBmbG9hdCBzaXplKTsKIGJv b2wgcmVxdWlyZXNDdXN0b21GYWxsYmFja0ZvbnQoVUNoYXIzMiBjaGFyYWN0ZXIpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udEZhbWlseVNw ZWNpZmljYXRpb25Db3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250RmFtaWx5U3BlY2lmaWNhdGlvbkNvcmVUZXh0LmNwcAppbmRleCBkNGQ1ZTJk MTE4Yi4uZGVkOWJmNjQ1M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRGYW1pbHlTcGVjaWZpY2F0aW9uQ29yZVRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRGYW1pbHlTcGVjaWZpY2F0 aW9uQ29yZVRleHQuY3BwCkBAIC0xMDIsMTMgKzEwMiw5IEBAIEZvbnRSYW5nZXMgRm9udEZhbWls eVNwZWNpZmljYXRpb25Db3JlVGV4dDo6Zm9udFJhbmdlcyhjb25zdCBGb250RGVzY3JpcHRpb24m IGZvCiAKICAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERl c2NyaXB0b3IobV9mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpOwogCi0gICAg ICAgIGF1dG8gZm9udEZvclN5bnRoZXNpc0NvbXB1dGF0aW9uID0gZm9udDsKLSAgICAgICAgaWYg KGF1dG8gcGh5c2ljYWxGb250ID0gYWRvcHRDRihDVEZvbnRDb3B5UGh5c2ljYWxGb250KGZvbnQu Z2V0KCkpKSkKLSAgICAgICAgICAgIGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbiA9IHBoeXNp Y2FsRm9udDsKLQogICAgICAgICBmb250ID0gcHJlcGFyZVBsYXRmb3JtRm9udChmb250LmdldCgp LCBmb250RGVzY3JpcHRpb24sIG51bGxwdHIsIHsgfSk7CiAKLSAgICAgICAgYXV0byBbc3ludGhl dGljQm9sZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKGZv bnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbi5nZXQoKSwgZm9udERlc2NyaXB0aW9uKS5ib2xkT2Js aXF1ZVBhaXIoKTsKKyAgICAgICAgYXV0byBbc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1 ZV0gPSBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKGZvbnQuZ2V0KCksIGZvbnREZXNjcmlwdGlv biwgU2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzOjpZZXMpLmJvbGRPYmxpcXVlUGFpcigpOwog CiAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KGZvbnQuZ2V0KCks IHNpemUsIGZhbHNlLCBzeW50aGV0aWNPYmxpcXVlLCBmb250RGVzY3JpcHRpb24ub3JpZW50YXRp b24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpLCBmb250RGVzY3JpcHRpb24udGV4 dFJlbmRlcmluZ01vZGUoKSk7CiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlOwo= 408142 2020-09-06 15:31:26 -0700 2020-09-06 16:50:02 -0700 Patch bug-215685-20200906153125.patch text/plain 9018 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmNlNTNkYjg4ZTY3ZWZlMGVkZjJkYzg3YzBhOTYzODNmMDRmM2E2 NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBDVEZvbnRHZXRQaHlzaWNhbFN5bWJvbGlj VHJhaXRzKCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250Q29weVBoeXNpY2FsRm9udCgpL0NURm9udEdl dFN5bWJvbGljVHJhaXRzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNTY4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTA5LTA2ICBEYXJpbiBBZGxl ciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXh0Q29kZWMgcmVmaW5lbWVudHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzZjE0ZTRhZjJiMjc5MmQ5NDQzYzc2YzYwYWEzODRlMzUwOTJmODY0Li41OWYx ZTU4YzRjZTIwYTYyZjEzNWFlNTNhZDRhYjlmMjIyOThiYjgxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KKworICAgICAgICBDVEZvbnRHZXRQaHlzaWNhbFN5bWJvbGljVHJhaXRzKCkgaXMgZmFz dGVyIHRoYW4gQ1RGb250Q29weVBoeXNpY2FsRm9udCgpL0NURm9udEdldFN5bWJvbGljVHJhaXRz KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3Rl YWQgb2YgbWFraW5nIHRoZSB0d28gY2FsbHMsIHdlIGNhbiBtYWtlIGEgc2luZ2xlIGNhbGwgdGhh dCBoYXMgdGhlIHNhbWUgZWZmZWN0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRo ZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVO ZWNlc3NhcnlTeW50aGVzaXMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1G YWxsYmFja0ZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRDYWNoZUNvcmVUZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev Rm9udEZhbWlseVNwZWNpZmljYXRpb25Db3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG b250RmFtaWx5U3BlY2lmaWNhdGlvbkNvcmVUZXh0Ojpmb250UmFuZ2VzIGNvbnN0KToKKwogMjAy MC0wOS0wNiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAg ICAgIExldHRlci1zcGFjaW5nIHNob3VsZCBkaXNhYmxlIGxpZ2F0dXJlcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhh dmUuaAppbmRleCAwYmNmODFmMzA1OTMzYjc5ZjUxYjI0YmZmODk5MDVhNTdlMzE1NWJjLi5lYzkw OGRlNTUwNjBlNzA3N2FlYjA0NDc0ZTVlODZmZGYyZDEyNDJhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUu aApAQCAtNzM5LDMgKzczOSw3IEBACiAgICAgfHwgKFBMQVRGT1JNKEFQUExFVFYpICYmIF9fVFZf T1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQwMDAwKQogI2RlZmluZSBIQVZFX0NURk9OVElT U1lTVEVNVUlGT05UIDEKICNlbmRpZgorCisjaWYgUExBVEZPUk0oQ09DT0EpICYmICEoUExBVEZP Uk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxNTAwKQorI2Rl ZmluZSBIQVZFX0NURk9OVEdFVFBIWVNJQ0FMU1lNQk9MSUNUUkFJVFMgMQorI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oIGIv U291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAppbmRleCAwMmI3 NjI1ZjhjMjFmNTVjNzQ0NzgwZTQ4OTc2MjJlZDRmY2JmYjUyLi41MWUwNjBjOWE3Y2JkNTk5ZDE3 YTYzNGE3ZDYxMTY5MjRmOTk0MzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3Bp L2NvY29hL0NvcmVUZXh0U1BJLmgKQEAgLTE0Miw2ICsxNDIsNyBAQCBDVEZvbnRSZWYgQ1RGb250 Q3JlYXRlRm9yQ1NTKENGU3RyaW5nUmVmIG5hbWUsIHVpbnQxNl90IHdlaWdodCwgQ1RGb250U3lt Ym9saWNUcgogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2Uo Q1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5k ZXggbGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ0ZJbmRleCAqY292ZXJlZExlbmd0aCk7 CiBDVEZvbnRSZWYgQ1RGb250Q3JlYXRlRm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZUFuZE9wdGlv bihDVEZvbnRSZWYgY3VycmVudEZvbnQsIGNvbnN0IFVURjE2Q2hhciAqY2hhcmFjdGVycywgQ0ZJ bmRleCBsZW5ndGgsIENGU3RyaW5nUmVmIGxhbmd1YWdlLCBDVEZvbnRGYWxsYmFja09wdGlvbiBv cHRpb24sIENGSW5kZXggKmNvdmVyZWRMZW5ndGgpOwogQ1RGb250UmVmIENURm9udENvcHlQaHlz aWNhbEZvbnQoQ1RGb250UmVmKTsKK0NURm9udFN5bWJvbGljVHJhaXRzIENURm9udEdldFBoeXNp Y2FsU3ltYm9saWNUcmFpdHMoQ1RGb250UmVmKTsKIAogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVm IGtDVFVJRm9udFRleHRTdHlsZVNob3J0SGVhZGxpbmU7CiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdS ZWYga0NUVUlGb250VGV4dFN0eWxlU2hvcnRCb2R5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCmlu ZGV4IDA5Yzg3NWE1YmJhYWUwZGIyMzJlZGIxYjcwYmY0MWY0YjUxNGEzMzQuLjVlYmUzNTY3OGE0 NzZiYjc1ZTYxNDkyNDk5ZjcyNWMwZTQ3MTA0M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAK QEAgLTgzOSw3ICs4MzksNyBAQCBzdGF0aWMgQ1RGb250U3ltYm9saWNUcmFpdHMgY29tcHV0ZVRy YWl0cyhjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbgogICAgIHJldHVybiB0 cmFpdHM7CiB9CiAKLVN5bnRoZXNpc1BhaXIgY29tcHV0ZU5lY2Vzc2FyeVN5bnRoZXNpcyhDVEZv bnRSZWYgZm9udCwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGJvb2wg aXNQbGF0Zm9ybUZvbnQpCitTeW50aGVzaXNQYWlyIGNvbXB1dGVOZWNlc3NhcnlTeW50aGVzaXMo Q1RGb250UmVmIGZvbnQsIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBT aG91bGRDb21wdXRlUGh5c2ljYWxUcmFpdHMgc2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzLCBi b29sIGlzUGxhdGZvcm1Gb250KQogewogICAgIGlmIChDVEZvbnRJc0FwcGxlQ29sb3JFbW9qaShm b250KSkKICAgICAgICAgcmV0dXJuIFN5bnRoZXNpc1BhaXIoZmFsc2UsIGZhbHNlKTsKQEAgLTg1 MCw4ICs4NTAsMTkgQEAgU3ludGhlc2lzUGFpciBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKENU Rm9udFJlZiBmb250LCBjb25zdCBGb250RGVzY3JpcHRpb24mIGYKICAgICBDVEZvbnRTeW1ib2xp Y1RyYWl0cyBkZXNpcmVkVHJhaXRzID0gY29tcHV0ZVRyYWl0cyhmb250RGVzY3JpcHRpb24pOwog CiAgICAgQ1RGb250U3ltYm9saWNUcmFpdHMgYWN0dWFsVHJhaXRzID0gMDsKLSAgICBpZiAoaXNG b250V2VpZ2h0Qm9sZChmb250RGVzY3JpcHRpb24ud2VpZ2h0KCkpIHx8IGlzSXRhbGljKGZvbnRE ZXNjcmlwdGlvbi5pdGFsaWMoKSkpCi0gICAgICAgIGFjdHVhbFRyYWl0cyA9IENURm9udEdldFN5 bWJvbGljVHJhaXRzKGZvbnQpOworICAgIGlmIChpc0ZvbnRXZWlnaHRCb2xkKGZvbnREZXNjcmlw dGlvbi53ZWlnaHQoKSkgfHwgaXNJdGFsaWMoZm9udERlc2NyaXB0aW9uLml0YWxpYygpKSkgewor ICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzID09IFNob3VsZENvbXB1dGVQ aHlzaWNhbFRyYWl0czo6WWVzKSB7CisjaWYgSEFWRShDVEZPTlRHRVRQSFlTSUNBTFNZTUJPTElD VFJBSVRTKQorICAgICAgICAgICAgYWN0dWFsVHJhaXRzID0gQ1RGb250R2V0UGh5c2ljYWxTeW1i b2xpY1RyYWl0cyhmb250KTsKKyNlbHNlCisgICAgICAgICAgICBSZXRhaW5QdHI8Q1RGb250UmVm PiBmb250Rm9yU3ludGhlc2lzQ29tcHV0YXRpb24gPSBmb250OworICAgICAgICAgICAgaWYgKGF1 dG8gcGh5c2ljYWxGb250ID0gYWRvcHRDRihDVEZvbnRDb3B5UGh5c2ljYWxGb250KGZvbnQpKSkK KyAgICAgICAgICAgICAgICBmb250Rm9yU3ludGhlc2lzQ29tcHV0YXRpb24gPSBXVEZNb3ZlKHBo eXNpY2FsRm9udCk7CisgICAgICAgICAgICBhY3R1YWxUcmFpdHMgPSBDVEZvbnRHZXRTeW1ib2xp Y1RyYWl0cyhmb250Rm9yU3ludGhlc2lzQ29tcHV0YXRpb24uZ2V0KCkpOworI2VuZGlmCisgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgYWN0dWFsVHJhaXRzID0gQ1RGb250R2V0U3ltYm9saWNU cmFpdHMoZm9udCk7CisgICAgfQogCiAgICAgYm9vbCBuZWVkc1N5bnRoZXRpY0JvbGQgPSAoZm9u dERlc2NyaXB0aW9uLmZvbnRTeW50aGVzaXMoKSAmIEZvbnRTeW50aGVzaXNXZWlnaHQpICYmIChk ZXNpcmVkVHJhaXRzICYga0NURm9udFRyYWl0Qm9sZCkgJiYgIShhY3R1YWxUcmFpdHMgJiBrQ1RG b250VHJhaXRCb2xkKTsKICAgICBib29sIG5lZWRzU3ludGhldGljT2JsaXF1ZSA9IChmb250RGVz Y3JpcHRpb24uZm9udFN5bnRoZXNpcygpICYgRm9udFN5bnRoZXNpc1N0eWxlKSAmJiAoZGVzaXJl ZFRyYWl0cyAmIGtDVEZvbnRUcmFpdEl0YWxpYykgJiYgIShhY3R1YWxUcmFpdHMgJiBrQ1RGb250 VHJhaXRJdGFsaWMpOwpAQCAtMTUyMyw3ICsxNTM0LDcgQEAgUmVmUHRyPEZvbnQ+IEZvbnRDYWNo ZTo6c3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVz Y3IKICAgICAvLyBmb250IHBvaW50ZXIuCiAgICAgQ1RGb250UmVmIHN1YnN0aXR1dGVGb250ID0g ZmFsbGJhY2tEZWR1cFNldCgpLmFkZChyZXN1bHQpLml0ZXJhdG9yLT5nZXQoKTsKIAotICAgIGF1 dG8gW3N5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWVdID0gY29tcHV0ZU5lY2Vzc2FyeVN5 bnRoZXNpcyhzdWJzdGl0dXRlRm9udCwgZGVzY3JpcHRpb24sIGlzRm9yUGxhdGZvcm1Gb250ID09 IElzRm9yUGxhdGZvcm1Gb250OjpZZXMpLmJvbGRPYmxpcXVlUGFpcigpOworICAgIGF1dG8gW3N5 bnRoZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWVdID0gY29tcHV0ZU5lY2Vzc2FyeVN5bnRoZXNp cyhzdWJzdGl0dXRlRm9udCwgZGVzY3JpcHRpb24sIFNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0 czo6Tm8sIGlzRm9yUGxhdGZvcm1Gb250ID09IElzRm9yUGxhdGZvcm1Gb250OjpZZXMpLmJvbGRP YmxpcXVlUGFpcigpOwogCiAgICAgRm9udFBsYXRmb3JtRGF0YSBhbHRlcm5hdGVGb250KHN1YnN0 aXR1dGVGb250LCBwbGF0Zm9ybURhdGEuc2l6ZSgpLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNP YmxpcXVlLCBwbGF0Zm9ybURhdGEub3JpZW50YXRpb24oKSwgcGxhdGZvcm1EYXRhLndpZHRoVmFy aWFudCgpLCBwbGF0Zm9ybURhdGEudGV4dFJlbmRlcmluZ01vZGUoKSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0 LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl VGV4dC5oCmluZGV4IDliMWUxNDI0NWNiZWYxZGJiY2Y1NWQzZjgwZWVjYjFmMzhjZjg0ZTMuLjIy OWUzOTgyMWQxZTU1YWI5NTY1MWNmNzc3ZGVjODEwZTY4Nzg4MzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRl eHQuaApAQCAtNTEsNyArNTEsMTEgQEAgc3RydWN0IFN5bnRoZXNpc1BhaXIgewogfTsKIAogUmV0 YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZvbnRSZWYsIGNvbnN0IEZv bnREZXNjcmlwdGlvbiYsIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MqIGZvbnRGYWNlRmVhdHVy ZXMsIEZvbnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmlsaXRpZXMgZm9udEZhY2VDYXBhYmlsaXRp ZXMsIGJvb2wgYXBwbHlXZWlnaHRXaWR0aFNsb3BlVmFyaWF0aW9ucyA9IHRydWUpOwotU3ludGhl c2lzUGFpciBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKENURm9udFJlZiwgY29uc3QgRm9udERl c2NyaXB0aW9uJiwgYm9vbCBpc1BsYXRmb3JtRm9udCA9IGZhbHNlKTsKK2VudW0gY2xhc3MgU2hv dWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzIDogdWludDhfdCB7CisgICAgWWVzLAorICAgIE5vCit9 OworU3ludGhlc2lzUGFpciBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKENURm9udFJlZiwgY29u c3QgRm9udERlc2NyaXB0aW9uJiwgU2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzID0gU2hvdWxk Q29tcHV0ZVBoeXNpY2FsVHJhaXRzOjpObywgYm9vbCBpc1BsYXRmb3JtRm9udCA9IGZhbHNlKTsK IFJldGFpblB0cjxDVEZvbnRSZWY+IHBsYXRmb3JtRm9udFdpdGhGYW1pbHkoY29uc3QgQXRvbVN0 cmluZyYgZmFtaWx5LCBGb250U2VsZWN0aW9uUmVxdWVzdCwgVGV4dFJlbmRlcmluZ01vZGUsIGZs b2F0IHNpemUpOwogRm9udFNlbGVjdGlvbkNhcGFiaWxpdGllcyBjYXBhYmlsaXRpZXNGb3JGb250 RGVzY3JpcHRvcihDVEZvbnREZXNjcmlwdG9yUmVmKTsKIHZvaWQgYWRkQXR0cmlidXRlc0Zvcklu c3RhbGxlZEZvbnRzKENGTXV0YWJsZURpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywgQWxsb3dVc2Vy SW5zdGFsbGVkRm9udHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udEZhbWlseVNwZWNpZmljYXRpb25Db3JlVGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250RmFtaWx5U3BlY2lmaWNhdGlvbkNv cmVUZXh0LmNwcAppbmRleCBkNGQ1ZTJkMTE4YjQxODg0MDg2NjI4YjBjMGU0MDRiMTM1YTkzNDY3 Li5kZWQ5YmY2NDUzYmEzZjQwMGM0ZmI2NjNhZWJmMGU4OGJkMmYzZjcxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250RmFtaWx5U3BlY2lmaWNh dGlvbkNvcmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250RmFtaWx5U3BlY2lmaWNhdGlvbkNvcmVUZXh0LmNwcApAQCAtMTAyLDEzICsxMDIs OSBAQCBGb250UmFuZ2VzIEZvbnRGYW1pbHlTcGVjaWZpY2F0aW9uQ29yZVRleHQ6OmZvbnRSYW5n ZXMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmbwogCiAgICAgICAgIGF1dG8gZm9udCA9IGFkb3B0 Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKG1fZm9udERlc2NyaXB0b3IuZ2V0KCks IHNpemUsIG51bGxwdHIpKTsKIAotICAgICAgICBhdXRvIGZvbnRGb3JTeW50aGVzaXNDb21wdXRh dGlvbiA9IGZvbnQ7Ci0gICAgICAgIGlmIChhdXRvIHBoeXNpY2FsRm9udCA9IGFkb3B0Q0YoQ1RG b250Q29weVBoeXNpY2FsRm9udChmb250LmdldCgpKSkpCi0gICAgICAgICAgICBmb250Rm9yU3lu dGhlc2lzQ29tcHV0YXRpb24gPSBwaHlzaWNhbEZvbnQ7Ci0KICAgICAgICAgZm9udCA9IHByZXBh cmVQbGF0Zm9ybUZvbnQoZm9udC5nZXQoKSwgZm9udERlc2NyaXB0aW9uLCBudWxscHRyLCB7IH0p OwogCi0gICAgICAgIGF1dG8gW3N5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWVdID0gY29t cHV0ZU5lY2Vzc2FyeVN5bnRoZXNpcyhmb250Rm9yU3ludGhlc2lzQ29tcHV0YXRpb24uZ2V0KCks IGZvbnREZXNjcmlwdGlvbikuYm9sZE9ibGlxdWVQYWlyKCk7CisgICAgICAgIGF1dG8gW3N5bnRo ZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWVdID0gY29tcHV0ZU5lY2Vzc2FyeVN5bnRoZXNpcyhm b250LmdldCgpLCBmb250RGVzY3JpcHRpb24sIFNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0czo6 WWVzKS5ib2xkT2JsaXF1ZVBhaXIoKTsKIAogICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxGb250 UGxhdGZvcm1EYXRhPihmb250LmdldCgpLCBzaXplLCBmYWxzZSwgc3ludGhldGljT2JsaXF1ZSwg Zm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0aFZhcmlh bnQoKSwgZm9udERlc2NyaXB0aW9uLnRleHRSZW5kZXJpbmdNb2RlKCkpOwogICAgIH0pLml0ZXJh dG9yLT52YWx1ZTsK 408153 2020-09-06 17:15:32 -0700 2020-09-06 18:33:35 -0700 Patch for committing bug-215685-20200906171531.patch text/plain 9011 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmRjZDU0Mjg0ZTJlOTQ2Y2M4ZWEzYjRhYTdkOTNmNWRlYTI0NjU4 NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBDVEZvbnRHZXRQaHlzaWNhbFN5bWJvbGlj VHJhaXRzKCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250Q29weVBoeXNpY2FsRm9udCgpL0NURm9udEdl dFN5bWJvbGljVHJhaXRzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNTY4NQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisg ICAgICAgICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTA5LTA2ICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXh0Q29kZWMgcmVmaW5lbWVudHMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA0ODI0YmMxNjAxMzI5MTFmNjM5Mjg4NDc3NDIxMDQxZDg0ZjMwZGY2Li45NmYwMjc4 NjFmYjc5ZjAxYjhjOGU3ODE5MmY0NWNhZmFiMjcxNTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjEgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNv bT4KKworICAgICAgICBDVEZvbnRHZXRQaHlzaWNhbFN5bWJvbGljVHJhaXRzKCkgaXMgZmFzdGVy IHRoYW4gQ1RGb250Q29weVBoeXNpY2FsRm9udCgpL0NURm9udEdldFN5bWJvbGljVHJhaXRzKCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY4NQor CisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEluc3RlYWQgb2Yg bWFraW5nIHRoZSB0d28gY2FsbHMsIHdlIGNhbiBtYWtlIGEgc2luZ2xlIGNhbGwgdGhhdCBoYXMg dGhlIHNhbWUgZWZmZWN0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlz IG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVOZWNlc3Nh cnlTeW50aGVzaXMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFj a0ZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRD YWNoZUNvcmVUZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udEZh bWlseVNwZWNpZmljYXRpb25Db3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250RmFt aWx5U3BlY2lmaWNhdGlvbkNvcmVUZXh0Ojpmb250UmFuZ2VzIGNvbnN0KToKKwogMjAyMC0wOS0w NiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJl bW92ZSBhbGwgbm9uLXdlYi1leHBvc2VkIHVzZXMgb2YgRU5BQkxFKFZBUklBVElPTl9GT05UUykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oIGIvU291cmNlL1dURi93 dGYvUGxhdGZvcm1IYXZlLmgKaW5kZXggMGJjZjgxZjMwNTkzM2I3OWY1MWIyNGJmZjg5OTA1YTU3 ZTMxNTViYy4uZWM5MDhkZTU1MDYwZTcwNzdhZWIwNDQ3NGU1ZTg2ZmRmMmQxMjQyYSAxMDA2NDQK LS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgKKysrIGIvU291cmNlL1dURi93dGYv UGxhdGZvcm1IYXZlLmgKQEAgLTczOSwzICs3MzksNyBAQAogICAgIHx8IChQTEFURk9STShBUFBM RVRWKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDE0MDAwMCkKICNkZWZpbmUg SEFWRV9DVEZPTlRJU1NZU1RFTVVJRk9OVCAxCiAjZW5kaWYKKworI2lmIFBMQVRGT1JNKENPQ09B KSAmJiAhKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8 IDEwMTUwMCkKKyNkZWZpbmUgSEFWRV9DVEZPTlRHRVRQSFlTSUNBTFNZTUJPTElDVFJBSVRTIDEK KyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29y ZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJ LmgKaW5kZXggMDJiNzYyNWY4YzIxZjU1Yzc0NDc4MGU0ODk3NjIyZWQ0ZmNiZmI1Mi4uNTFlMDYw YzlhN2NiZDU5OWQxN2E2MzRhN2Q2MTE2OTI0Zjk5NDMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC0xNDIsNiArMTQyLDcgQEAgQ1RG b250UmVmIENURm9udENyZWF0ZUZvckNTUyhDRlN0cmluZ1JlZiBuYW1lLCB1aW50MTZfdCB3ZWln aHQsIENURm9udFN5bWJvbGljVHIKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJz V2l0aExhbmd1YWdlKENURm9udFJlZiBjdXJyZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFy YWN0ZXJzLCBDRkluZGV4IGxlbmd0aCwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UsIENGSW5kZXggKmNv dmVyZWRMZW5ndGgpOwogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFu Z3VhZ2VBbmRPcHRpb24oQ1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNo YXJhY3RlcnMsIENGSW5kZXggbGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ1RGb250RmFs bGJhY2tPcHRpb24gb3B0aW9uLCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKIENURm9udFJlZiBD VEZvbnRDb3B5UGh5c2ljYWxGb250KENURm9udFJlZik7CitDVEZvbnRTeW1ib2xpY1RyYWl0cyBD VEZvbnRHZXRQaHlzaWNhbFN5bWJvbGljVHJhaXRzKENURm9udFJlZik7CiAKIGV4dGVybiBjb25z dCBDRlN0cmluZ1JlZiBrQ1RVSUZvbnRUZXh0U3R5bGVTaG9ydEhlYWRsaW5lOwogZXh0ZXJuIGNv bnN0IENGU3RyaW5nUmVmIGtDVFVJRm9udFRleHRTdHlsZVNob3J0Qm9keTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv cmVUZXh0LmNwcAppbmRleCAxMDA2ZjRiYTVlMjg1OGZhOWE4NTJmMWVlZmI1MGMzZjZkNzM2ODNi Li5kM2FjYWMzYWJjYjI2NmQzYjAwNDg0ZTI5MGI3Njk1MGU3YmJlZTc5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hl Q29yZVRleHQuY3BwCkBAIC04MTYsNyArODE2LDcgQEAgc3RhdGljIENURm9udFN5bWJvbGljVHJh aXRzIGNvbXB1dGVUcmFpdHMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24K ICAgICByZXR1cm4gdHJhaXRzOwogfQogCi1TeW50aGVzaXNQYWlyIGNvbXB1dGVOZWNlc3NhcnlT eW50aGVzaXMoQ1RGb250UmVmIGZvbnQsIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2Ny aXB0aW9uLCBib29sIGlzUGxhdGZvcm1Gb250KQorU3ludGhlc2lzUGFpciBjb21wdXRlTmVjZXNz YXJ5U3ludGhlc2lzKENURm9udFJlZiBmb250LCBjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnRE ZXNjcmlwdGlvbiwgU2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzIHNob3VsZENvbXB1dGVQaHlz aWNhbFRyYWl0cywgYm9vbCBpc1BsYXRmb3JtRm9udCkKIHsKICAgICBpZiAoQ1RGb250SXNBcHBs ZUNvbG9yRW1vamkoZm9udCkpCiAgICAgICAgIHJldHVybiBTeW50aGVzaXNQYWlyKGZhbHNlLCBm YWxzZSk7CkBAIC04MjcsOCArODI3LDE5IEBAIFN5bnRoZXNpc1BhaXIgY29tcHV0ZU5lY2Vzc2Fy eVN5bnRoZXNpcyhDVEZvbnRSZWYgZm9udCwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmCiAgICAg Q1RGb250U3ltYm9saWNUcmFpdHMgZGVzaXJlZFRyYWl0cyA9IGNvbXB1dGVUcmFpdHMoZm9udERl c2NyaXB0aW9uKTsKIAogICAgIENURm9udFN5bWJvbGljVHJhaXRzIGFjdHVhbFRyYWl0cyA9IDA7 Ci0gICAgaWYgKGlzRm9udFdlaWdodEJvbGQoZm9udERlc2NyaXB0aW9uLndlaWdodCgpKSB8fCBp c0l0YWxpYyhmb250RGVzY3JpcHRpb24uaXRhbGljKCkpKQotICAgICAgICBhY3R1YWxUcmFpdHMg PSBDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhmb250KTsKKyAgICBpZiAoaXNGb250V2VpZ2h0Qm9s ZChmb250RGVzY3JpcHRpb24ud2VpZ2h0KCkpIHx8IGlzSXRhbGljKGZvbnREZXNjcmlwdGlvbi5p dGFsaWMoKSkpIHsKKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0cyA9PSBT aG91bGRDb21wdXRlUGh5c2ljYWxUcmFpdHM6OlllcykgeworI2lmIEhBVkUoQ1RGT05UR0VUUEhZ U0lDQUxTWU1CT0xJQ1RSQUlUUykKKyAgICAgICAgICAgIGFjdHVhbFRyYWl0cyA9IENURm9udEdl dFBoeXNpY2FsU3ltYm9saWNUcmFpdHMoZm9udCk7CisjZWxzZQorICAgICAgICAgICAgYXV0byBm b250Rm9yU3ludGhlc2lzQ29tcHV0YXRpb24gPSByZXRhaW5QdHIoZm9udCk7CisgICAgICAgICAg ICBpZiAoYXV0byBwaHlzaWNhbEZvbnQgPSBhZG9wdENGKENURm9udENvcHlQaHlzaWNhbEZvbnQo Zm9udCkpKQorICAgICAgICAgICAgICAgIGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbiA9IFdU Rk1vdmUocGh5c2ljYWxGb250KTsKKyAgICAgICAgICAgIGFjdHVhbFRyYWl0cyA9IENURm9udEdl dFN5bWJvbGljVHJhaXRzKGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbi5nZXQoKSk7CisjZW5k aWYKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBhY3R1YWxUcmFpdHMgPSBDVEZvbnRHZXRT eW1ib2xpY1RyYWl0cyhmb250KTsKKyAgICB9CiAKICAgICBib29sIG5lZWRzU3ludGhldGljQm9s ZCA9IChmb250RGVzY3JpcHRpb24uZm9udFN5bnRoZXNpcygpICYgRm9udFN5bnRoZXNpc1dlaWdo dCkgJiYgKGRlc2lyZWRUcmFpdHMgJiBrQ1RGb250VHJhaXRCb2xkKSAmJiAhKGFjdHVhbFRyYWl0 cyAmIGtDVEZvbnRUcmFpdEJvbGQpOwogICAgIGJvb2wgbmVlZHNTeW50aGV0aWNPYmxpcXVlID0g KGZvbnREZXNjcmlwdGlvbi5mb250U3ludGhlc2lzKCkgJiBGb250U3ludGhlc2lzU3R5bGUpICYm IChkZXNpcmVkVHJhaXRzICYga0NURm9udFRyYWl0SXRhbGljKSAmJiAhKGFjdHVhbFRyYWl0cyAm IGtDVEZvbnRUcmFpdEl0YWxpYyk7CkBAIC0xNDk0LDcgKzE1MDUsNyBAQCBSZWZQdHI8Rm9udD4g Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMoY29uc3QgRm9udERlc2NyaXB0 aW9uJiBkZXNjcgogICAgIC8vIGZvbnQgcG9pbnRlci4KICAgICBDVEZvbnRSZWYgc3Vic3RpdHV0 ZUZvbnQgPSBmYWxsYmFja0RlZHVwU2V0KCkuYWRkKHJlc3VsdCkuaXRlcmF0b3ItPmdldCgpOwog Ci0gICAgYXV0byBbc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21wdXRlTmVj ZXNzYXJ5U3ludGhlc2lzKHN1YnN0aXR1dGVGb250LCBkZXNjcmlwdGlvbiwgaXNGb3JQbGF0Zm9y bUZvbnQgPT0gSXNGb3JQbGF0Zm9ybUZvbnQ6OlllcykuYm9sZE9ibGlxdWVQYWlyKCk7CisgICAg YXV0byBbc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21wdXRlTmVjZXNzYXJ5 U3ludGhlc2lzKHN1YnN0aXR1dGVGb250LCBkZXNjcmlwdGlvbiwgU2hvdWxkQ29tcHV0ZVBoeXNp Y2FsVHJhaXRzOjpObywgaXNGb3JQbGF0Zm9ybUZvbnQgPT0gSXNGb3JQbGF0Zm9ybUZvbnQ6Olll cykuYm9sZE9ibGlxdWVQYWlyKCk7CiAKICAgICBGb250UGxhdGZvcm1EYXRhIGFsdGVybmF0ZUZv bnQoc3Vic3RpdHV0ZUZvbnQsIHBsYXRmb3JtRGF0YS5zaXplKCksIHN5bnRoZXRpY0JvbGQsIHN5 bnRoZXRpY09ibGlxdWUsIHBsYXRmb3JtRGF0YS5vcmllbnRhdGlvbigpLCBwbGF0Zm9ybURhdGEu d2lkdGhWYXJpYW50KCksIHBsYXRmb3JtRGF0YS50ZXh0UmVuZGVyaW5nTW9kZSgpKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hl Q29yZVRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRD YWNoZUNvcmVUZXh0LmgKaW5kZXggOWIxZTE0MjQ1Y2JlZjFkYmJjZjU1ZDNmODBlZWNiMWYzOGNm ODRlMy4uMGQwODZmNDJkZjgzYjY0ZmViMGQxNTE3Y2M1MDk0ZmFiNWYwNzFkNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2Fj aGVDb3JlVGV4dC5oCkBAIC01MSw3ICs1MSw4IEBAIHN0cnVjdCBTeW50aGVzaXNQYWlyIHsKIH07 CiAKIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmLCBj b25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBmb250RmFj ZUZlYXR1cmVzLCBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzIGZvbnRGYWNlQ2Fw YWJpbGl0aWVzLCBib29sIGFwcGx5V2VpZ2h0V2lkdGhTbG9wZVZhcmlhdGlvbnMgPSB0cnVlKTsK LVN5bnRoZXNpc1BhaXIgY29tcHV0ZU5lY2Vzc2FyeVN5bnRoZXNpcyhDVEZvbnRSZWYsIGNvbnN0 IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgaXNQbGF0Zm9ybUZvbnQgPSBmYWxzZSk7CitlbnVtIGNs YXNzIFNob3VsZENvbXB1dGVQaHlzaWNhbFRyYWl0cyA6IGJvb2wgeyBObywgWWVzIH07CitTeW50 aGVzaXNQYWlyIGNvbXB1dGVOZWNlc3NhcnlTeW50aGVzaXMoQ1RGb250UmVmLCBjb25zdCBGb250 RGVzY3JpcHRpb24mLCBTaG91bGRDb21wdXRlUGh5c2ljYWxUcmFpdHMgPSBTaG91bGRDb21wdXRl UGh5c2ljYWxUcmFpdHM6Ok5vLCBib29sIGlzUGxhdGZvcm1Gb250ID0gZmFsc2UpOwogUmV0YWlu UHRyPENURm9udFJlZj4gcGxhdGZvcm1Gb250V2l0aEZhbWlseShjb25zdCBBdG9tU3RyaW5nJiBm YW1pbHksIEZvbnRTZWxlY3Rpb25SZXF1ZXN0LCBUZXh0UmVuZGVyaW5nTW9kZSwgZmxvYXQgc2l6 ZSk7CiBGb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzIGNhcGFiaWxpdGllc0ZvckZvbnREZXNjcmlw dG9yKENURm9udERlc2NyaXB0b3JSZWYpOwogdm9pZCBhZGRBdHRyaWJ1dGVzRm9ySW5zdGFsbGVk Rm9udHMoQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBBbGxvd1VzZXJJbnN0YWxs ZWRGb250cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250RmFtaWx5U3BlY2lmaWNhdGlvbkNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRGYW1pbHlTcGVjaWZpY2F0aW9uQ29yZVRleHQu Y3BwCmluZGV4IGQ0ZDVlMmQxMThiNDE4ODQwODY2MjhiMGMwZTQwNGIxMzVhOTM0NjcuLmRlZDli ZjY0NTNiYTNmNDAwYzRmYjY2M2FlYmYwZTg4YmQyZjNmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRGYW1pbHlTcGVjaWZpY2F0aW9uQ29y ZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0Zv bnRGYW1pbHlTcGVjaWZpY2F0aW9uQ29yZVRleHQuY3BwCkBAIC0xMDIsMTMgKzEwMiw5IEBAIEZv bnRSYW5nZXMgRm9udEZhbWlseVNwZWNpZmljYXRpb25Db3JlVGV4dDo6Zm9udFJhbmdlcyhjb25z dCBGb250RGVzY3JpcHRpb24mIGZvCiAKICAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZv bnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3IobV9mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwg bnVsbHB0cikpOwogCi0gICAgICAgIGF1dG8gZm9udEZvclN5bnRoZXNpc0NvbXB1dGF0aW9uID0g Zm9udDsKLSAgICAgICAgaWYgKGF1dG8gcGh5c2ljYWxGb250ID0gYWRvcHRDRihDVEZvbnRDb3B5 UGh5c2ljYWxGb250KGZvbnQuZ2V0KCkpKSkKLSAgICAgICAgICAgIGZvbnRGb3JTeW50aGVzaXND b21wdXRhdGlvbiA9IHBoeXNpY2FsRm9udDsKLQogICAgICAgICBmb250ID0gcHJlcGFyZVBsYXRm b3JtRm9udChmb250LmdldCgpLCBmb250RGVzY3JpcHRpb24sIG51bGxwdHIsIHsgfSk7CiAKLSAg ICAgICAgYXV0byBbc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21wdXRlTmVj ZXNzYXJ5U3ludGhlc2lzKGZvbnRGb3JTeW50aGVzaXNDb21wdXRhdGlvbi5nZXQoKSwgZm9udERl c2NyaXB0aW9uKS5ib2xkT2JsaXF1ZVBhaXIoKTsKKyAgICAgICAgYXV0byBbc3ludGhldGljQm9s ZCwgc3ludGhldGljT2JsaXF1ZV0gPSBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKGZvbnQuZ2V0 KCksIGZvbnREZXNjcmlwdGlvbiwgU2hvdWxkQ29tcHV0ZVBoeXNpY2FsVHJhaXRzOjpZZXMpLmJv bGRPYmxpcXVlUGFpcigpOwogCiAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPEZvbnRQbGF0Zm9y bURhdGE+KGZvbnQuZ2V0KCksIHNpemUsIGZhbHNlLCBzeW50aGV0aWNPYmxpcXVlLCBmb250RGVz Y3JpcHRpb24ub3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpLCBm b250RGVzY3JpcHRpb24udGV4dFJlbmRlcmluZ01vZGUoKSk7CiAgICAgfSkuaXRlcmF0b3ItPnZh bHVlOwo=