215707 2020-08-20 11:47:40 -0700 [iOS] attachmentActionFont() Needs to use kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized) to get the short emphasized footnote font 2020-09-06 23:19:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=155485 InRadar P2 Normal --- 1 mmaxfield mmaxfield benjamin cdumez changseok cmarcelo darin esprehn+autocc ews-watchlist glenn kondapallykalyan pdr sam thorton webkit-bug-importer oldest_to_newest 1681751 0 mmaxfield 2020-08-20 11:47:40 -0700 [iOS] CTFontDescriptorCreateWithTextStyleAndAttributes() is faster than CTFontDescriptorCreateWithTextStyle()/CTFontDescriptorCreateCopyWithAttributes() 1681752 1 406949 mmaxfield 2020-08-20 11:54:45 -0700 Created attachment 406949 Patch 1683444 2 webkit-bug-importer 2020-08-27 11:48:13 -0700 <rdar://problem/67887880> 1686039 3 408079 mmaxfield 2020-09-05 02:09:34 -0700 Created attachment 408079 Patch 1686076 4 408079 sam 2020-09-05 08:58:58 -0700 Comment on attachment 408079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408079&action=review > Source/WebCore/ChangeLog:4 > + [iOS] CTFontDescriptorCreateWithTextStyleAndAttributes() is faster than CTFontDescriptorCreateWithTextStyle()/CTFontDescriptorCreateCopyWithAttributes() > + https://bugs.webkit.org/show_bug.cgi?id=215707 Do you have any perf measurements for this claim? > Source/WTF/wtf/PlatformHave.h:740 > +#define HAVE_CTFONTDESCRIPTORCREATEWITHTEXTSTYLEANDATTRIBUTES 1 Please throw some underscores in there. This is not really readable as is. 1686079 5 408079 darin 2020-09-05 09:05:34 -0700 Comment on attachment 408079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408079&action=review > Source/WebCore/rendering/RenderThemeIOS.mm:1403 > + RetainPtr<CTFontDescriptorRef> emphasizedFontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyleAndAttributes(kCTUIFontTextStyleFootnote, RenderThemeIOS::contentSizeCategory(), (CFDictionaryRef)@{ (id)kCTFontTraitsAttribute: @{ (id)kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized) } })); auto 1686246 6 mmaxfield 2020-09-06 15:44:37 -0700 <rdar://problem/63930892> 1686248 7 mmaxfield 2020-09-06 15:49:18 -0700 Oh, I see. Even if CTFontDescriptorCreateWithTextStyleAndAttributes() doesn’t exist, we should still modify the existing code to use (id)kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized). This is about correctness, not performance. 1686250 8 408147 mmaxfield 2020-09-06 15:59:14 -0700 Created attachment 408147 Patch 1686261 9 408147 darin 2020-09-06 16:48:37 -0700 Comment on attachment 408147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408147&action=review > Source/WebCore/rendering/RenderThemeIOS.mm:1408 > +#if HAVE(CTFONTDESCRIPTOR_CREATE_WITH_TEXT_STYLE_AND_ATTRIBUTES) > + auto emphasizedFontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyleAndAttributes(kCTUIFontTextStyleFootnote, RenderThemeIOS::contentSizeCategory(), (CFDictionaryRef)@{ (id)kCTFontTraitsAttribute: @{ (id)kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized) } })); > +#else > + auto fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(kCTUIFontTextStyleShortFootnote, RenderThemeIOS::singleton().contentSizeCategory(), 0)); > + auto emphasizedFontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), > + (CFDictionaryRef)@{ (id)kCTFontTraitsAttribute: @{ (id)kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized) } })); > +#endif Maybe we could put the attributes dictionary outside the #if? I wouldn’t mind having one more local variable for it. 1686266 10 408151 mmaxfield 2020-09-06 17:02:22 -0700 Created attachment 408151 Patch 1686267 11 408151 darin 2020-09-06 17:06:30 -0700 Comment on attachment 408151 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408151&action=review > Source/WebCore/rendering/RenderThemeIOS.mm:1403 > + auto emphasizedFontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyleAndAttributes(kCTUIFontTextStyleFootnote, RenderThemeIOS::contentSizeCategory(), (CFDictionaryRef)@{ (id)kCTFontTraitsAttribute: @{ (id)kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized) } })); This calls RenderThemeIOS::contentSizeCategory(). > Source/WebCore/rendering/RenderThemeIOS.mm:1405 > + auto fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(kCTUIFontTextStyleShortFootnote, RenderThemeIOS::singleton().contentSizeCategory(), 0)); This calls RenderThemeIOS::singleton().contentSizeCategory(). Why the difference? I suggest refactoring so only the CTFontDescriptorCreateWithTextStyleAndAttributes call has an #if in it, and all the arguments are shared. 1686268 12 408152 mmaxfield 2020-09-06 17:07:25 -0700 Created attachment 408152 Patch 1686275 13 408155 mmaxfield 2020-09-06 17:37:36 -0700 Created attachment 408155 Patch 1686282 14 408155 darin 2020-09-06 17:59:05 -0700 Comment on attachment 408155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408155&action=review > Source/WebCore/rendering/RenderThemeIOS.mm:1404 > + CFStringRef style = kCTUIFontTextStyleFootnote; > + CFStringRef size = RenderThemeIOS::singleton().contentSizeCategory(); > + CFDictionaryRef attributes = static_cast<CFDictionaryRef>(@{ (id)kCTFontTraitsAttribute: @{ (id)kCTFontSymbolicTrait: @(kCTFontTraitTightLeading | kCTFontTraitEmphasized) } }); I would have used auto for all three of these. 1686287 15 408157 mmaxfield 2020-09-06 18:06:01 -0700 Created attachment 408157 Patch for committing 1686302 16 ews-feeder 2020-09-06 23:19:42 -0700 Committed r266693: <https://trac.webkit.org/changeset/266693> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408157. 406949 2020-08-20 11:54:45 -0700 2020-09-05 02:09:32 -0700 Patch bug-215707-20200820115444.patch text/plain 5465 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1ODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIxOTQ2NjFjNmZkNjQxYmUyZDFhODI5 NGM0ZGUwMDA1YTE5ZjZlNmYuLmQ0OWRhYjVlM2IyZTNjYTRjMDM4OTU3NGRmOTFhNGIyMjJjZTJh MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDgtMjAgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBDVEZvbnREZXNjcmlwdG9yQ3Jl YXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoKSBpcyBmYXN0ZXIgdGhhbiBDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSgpL0NURm9udERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0 aEF0dHJpYnV0ZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE1NzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiB3dGYvUGxhdGZvcm1IYXZlLmg6CisKIDIwMjAtMDgtMTggIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgVHVybiBvZmYgd2hlZWwgZXZlbnQg cmVnaW9ucyB1bnRpbCB3ZSBuZWVkIHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2MzBiZGU3OWZlNTk4OTgz YzcyNzMzZWZiNDQ4ZDJkNzg0YzA2ZTFiLi45MWMyMjIzZmYwYmIzMGNmOTMzMmRlN2FhYTFhMDY5 ZmY3MDdkN2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDgtMjAgIE15bGVz IEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBDVEZv bnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoKSBpcyBmYXN0ZXIg dGhhbiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSgpL0NURm9udERlc2NyaXB0 b3JDcmVhdGVDb3B5V2l0aEF0dHJpYnV0ZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1NzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgdGhlIHR3byBjYWxscywgd2Ug Y2FuIG1ha2UgYSBzaW5nbGUgY2FsbCB0aGF0IGhhcyB0aGUgc2FtZSBlZmZlY3QuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6 YXR0YWNobWVudEFjdGlvbkZvbnQpOgorCiAyMDIwLTA4LTE5ICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFJlc3RvcmUgYSAxMF8xNV8qIHVz ZXItYWdlbnQgc3RyaW5nIHdoZW4gcmVxdWVzdGluZyBkZXNrdG9wIHNpdGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCmluZGV4IDJjMjVmNmRiMTZjODk1NTgyNDQzMWYwM2E5ZTAzOTQyY2JjODE1Y2EuLjEzZDBk MmVjZmEyMDQ0NDMyZWFjYjViMTRiMGMyNmVmMTcyYTgwMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpA QCAtMSwzICsxLDEyIEBACisyMDIwLTA4LTIwICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs ZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhU ZXh0U3R5bGVBbmRBdHRyaWJ1dGVzKCkgaXMgZmFzdGVyIHRoYW4gQ1RGb250RGVzY3JpcHRvckNy ZWF0ZVdpdGhUZXh0U3R5bGUoKS9DVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhBdHRyaWJ1 dGVzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NTcwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog cGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oOgorCiAyMDIwLTA4LTE5ICBBZGl0eWEgS2VlcnRo aSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIE1vdmUgc3RlcHBlciBw YWludGluZyBjb2RlIG9mZiBvZiBDYXJib24gQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0 Zi9QbGF0Zm9ybUhhdmUuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCmluZGV4IGNi OGM2ZDAxODUwZGViNzM4OWRjN2UwOWQ2YWM5YzQwMjQ2YjI3MzYuLjMxODFjZDE3NWM4ZWYwYTQx Y2MzOTQ2MTk1OWQzZjNiYWM0ZDZkYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRm b3JtSGF2ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCkBAIC03MTQsMyAr NzE0LDcgQEAKICAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19UVl9PU19WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxNDAwMDApCiAjZGVmaW5lIEhBVkVfQ0ZORVRXT1JLX0NOQU1FX0FORF9D T09LSUVfVFJBTlNGT1JNX1NQSSAxCiAjZW5kaWYKKworI2lmIFBMQVRGT1JNKENPQ09BKSAmJiAh KFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAw MCkKKyNkZWZpbmUgSEFWRV9DVEZPTlRERVNDUklQVE9SQ1JFQVRFV0lUSFRFWFRTVFlMRUFOREFU VFJJQlVURVMgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw aS9jb2NvYS9Db3JlVGV4dFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2Ev Q29yZVRleHRTUEkuaAppbmRleCBiMjI4ZjliYzgzMjQ4MzM0OTRhMGM3ODE4M2I0ZjJlM2I1NWE5 ZjE2Li5hNjVmZGI4OTRiM2QwMTY4MjM3Mzk2ZmM2Y2VmYWUwMDkxZjU2NzIxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKQEAgLTExNSw2ICsx MTUsNyBAQCBib29sIENURm9udEdldEdseXBoc0ZvckNoYXJhY3RlclJhbmdlKENURm9udFJlZiwg Q0dHbHlwaCBnbHlwaHNbXSwgQ0ZSYW5nZSk7CiBDVEZvbnREZXNjcmlwdG9yUmVmIENURm9udERl c2NyaXB0b3JDcmVhdGVGb3JVSVR5cGUoQ1RGb250VUlGb250VHlwZSwgQ0dGbG9hdCBzaXplLCBD RlN0cmluZ1JlZiBsYW5ndWFnZSk7CiBDVEZvbnREZXNjcmlwdG9yUmVmIENURm9udERlc2NyaXB0 b3JDcmVhdGVXaXRoVGV4dFN0eWxlKENGU3RyaW5nUmVmIHN0eWxlLCBDRlN0cmluZ1JlZiBzaXpl LCBDRlN0cmluZ1JlZiBsYW5ndWFnZSk7CiBDVEZvbnREZXNjcmlwdG9yUmVmIENURm9udERlc2Ny aXB0b3JDcmVhdGVDb3B5V2l0aFN5bWJvbGljVHJhaXRzKENURm9udERlc2NyaXB0b3JSZWYgb3Jp Z2luYWwsIENURm9udFN5bWJvbGljVHJhaXRzIHN5bVRyYWl0VmFsdWUsIENURm9udFN5bWJvbGlj VHJhaXRzIHN5bVRyYWl0TWFzayk7CitDVEZvbnREZXNjcmlwdG9yUmVmIENURm9udERlc2NyaXB0 b3JDcmVhdGVXaXRoVGV4dFN0eWxlQW5kQXR0cmlidXRlcyhDRlN0cmluZ1JlZiBzdHlsZSwgQ0ZT dHJpbmdSZWYgc2l6ZSwgQ0ZEaWN0aW9uYXJ5UmVmIGF0dHJpYnV0ZXMpOwogQ0ZCaXRWZWN0b3JS ZWYgQ1RGb250Q29weUdseXBoQ292ZXJhZ2VGb3JGZWF0dXJlKENURm9udFJlZiwgQ0ZEaWN0aW9u YXJ5UmVmIGZlYXR1cmUpOwogCiBDVEZvbnREZXNjcmlwdG9yUmVmIENURm9udERlc2NyaXB0b3JD cmVhdGVXaXRoQXR0cmlidXRlc0FuZE9wdGlvbnMoQ0ZEaWN0aW9uYXJ5UmVmIGF0dHJpYnV0ZXMs IENURm9udERlc2NyaXB0b3JPcHRpb25zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZUlPUy5tbQppbmRleCA1MmJmNjI1MWQ1NDlmMjNjMzc4NWEzOWQ3NDIyZTJjNDJkNzhl ODg0Li5lMWFiMzEyYTgwZjgwOTY0MDQzYjljMTgwOTg0M2E5YzRlZGQ0NzFjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCkBAIC0xMzk5LDExICsxMzk5LDE2 IEBAIGNvbnN0IENGSW5kZXggYXR0YWNobWVudFdyYXBwaW5nVGV4dE1heGltdW1MaW5lQ291bnQg PSAyOwogCiBzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gYXR0YWNobWVudEFjdGlvbkZvbnQo KQogeworI2lmIEhBVkUoQ1RGT05UREVTQ1JJUFRPUkNSRUFURVdJVEhURVhUU1RZTEVBTkRBVFRS SUJVVEVTKQorICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBlbXBoYXNpemVkRm9u dERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxl QW5kQXR0cmlidXRlcyhrQ1RVSUZvbnRUZXh0U3R5bGVGb290bm90ZSwgUmVuZGVyVGhlbWVJT1M6 OmNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgKENGRGljdGlvbmFyeVJlZilAeyAoaWQpa0NURm9udFRy YWl0c0F0dHJpYnV0ZTogQHsgKGlkKWtDVEZvbnRTeW1ib2xpY1RyYWl0OiBAKGtDVEZvbnRUcmFp dFRpZ2h0TGVhZGluZyB8IGtDVEZvbnRUcmFpdEVtcGhhc2l6ZWQpIH0gfSkpOworI2Vsc2UKICAg ICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZm9udERlc2NyaXB0b3IgPSBhZG9wdENG KENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlKGtDVFVJRm9udFRleHRTdHlsZVNo b3J0Rm9vdG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5nbGV0b24oKS5jb250ZW50U2l6ZUNhdGVn b3J5KCksIDApKTsKICAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZW1waGFzaXpl ZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhB dHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLAogICAgICAgICAoQ0ZEaWN0aW9uYXJ5UmVm KUB7CiAgICAgICAgICAgICAoaWQpa0NURm9udERlc2NyaXB0b3JUZXh0U3R5bGVBdHRyaWJ1dGU6 IChpZClrQ1RGb250RGVzY3JpcHRvclRleHRTdHlsZUVtcGhhc2l6ZWQKICAgICB9KSk7CisjZW5k aWYKKwogICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihl bXBoYXNpemVkRm9udERlc2NyaXB0b3IuZ2V0KCksIDAsIG51bGxwdHIpKTsKIH0KIAo= 408079 2020-09-05 02:09:34 -0700 2020-09-06 15:59:13 -0700 Patch bug-215707-20200905020933.patch text/plain 5646 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZjY2Q1NDFhMDhiZjY0Mzc5Yjg3OTM0 NzZlYTRhN2I5NDJhM2Y5NDIuLjI0NmU1NDcwOTFlMTEwMDJjNzliMmNkOTEwYTBkY2Q4ZGFjZTcz NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBDVEZvbnREZXNjcmlwdG9yQ3Jl YXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoKSBpcyBmYXN0ZXIgdGhhbiBDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSgpL0NURm9udERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0 aEF0dHJpYnV0ZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE1NzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiB3dGYvUGxhdGZvcm1IYXZlLmg6CisKIDIwMjAtMDktMDQgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIFBERiBoZWFkcy11 cCBkaXNwbGF5IHRvIFVJIHByb2Nlc3Mgb24gbWFjT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmOWI2MmU1OGY4 Y2IyZGM3MzYzMTdmYWFlYWU4YjMzMjYzYmI1NGZhLi43MjEzNzAyNTFjZDU3MTZmYjNhMDhmNzIx ZGM4MjcyNTIwMDYxNmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDktMDUg IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9T XSBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoKSBpcyBm YXN0ZXIgdGhhbiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSgpL0NURm9udERl c2NyaXB0b3JDcmVhdGVDb3B5V2l0aEF0dHJpYnV0ZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1NzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgdGhlIHR3byBjYWxs cywgd2UgY2FuIG1ha2UgYSBzaW5nbGUgY2FsbCB0aGF0IGhhcyB0aGUgc2FtZSBlZmZlY3QuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdl LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tOgorICAgICAgICAoV2Vi Q29yZTo6YXR0YWNobWVudEFjdGlvbkZvbnQpOgorCiAyMDIwLTA5LTA1ICBNeWxlcyBDLiBNYXhm aWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBidWlsZCBhZnRl ciByMjY2NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBhZTIyMmIzYzA5NTg3MGM5NDU2M2NiOGNj NzVhNTYwYzYwMDM4NmY1Li5jYjg0ZTQ4N2Y5YmRmNmZlMDI2ZTVlMTBmYmQ5OTJkYzI4MmY5MjEy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMC0wOS0wNSAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIENURm9u dERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlQW5kQXR0cmlidXRlcygpIGlzIGZhc3RlciB0 aGFuIENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlKCkvQ1RGb250RGVzY3JpcHRv ckNyZWF0ZUNvcHlXaXRoQXR0cmlidXRlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHBhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaDoKKwogMjAy MC0wOS0wNCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJw YWdlcyBmbGFzaCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdpbmRvd3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZl LmgKaW5kZXggNTg0M2M3OGRmNzY2YWZkMjc1OTZhZjUyZTEyYTY5ODQ5NTliMTJiMS4uYzdmZmNl OTYxY2FhNzIyODJkOGFmZDkzNmJlOTVhNzViZmYwYzJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvUGxhdGZvcm1IYXZlLmgKKysrIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgK QEAgLTczMiwzICs3MzIsMTAgQEAKICAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19UVl9P U19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCiAjZGVmaW5lIEhBVkVfQ0ZORVRXT1JL X0NOQU1FX0FORF9DT09LSUVfVFJBTlNGT1JNX1NQSSAxCiAjZW5kaWYKKworI2lmIChQTEFURk9S TShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwKSBcCisg ICAgfHwgKChQTEFURk9STShJT1MpIHx8IFBMQVRGT1JNKE1BQ0NBVEFMWVNUKSkgJiYgX19JUEhP TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JN KFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gNzAwMDApIFwK KyAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19UVl9PU19WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVfQ1RGT05UREVTQ1JJUFRPUkNSRUFURVdJVEhURVhU U1RZTEVBTkRBVFRSSUJVVEVTIDEKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwv c3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKaW5kZXggYjIyOGY5YmM4MzI0ODMzNDk0YTBjNzgxODNi NGYyZTNiNTVhOWYxNi4uYTY1ZmRiODk0YjNkMDE2ODIzNzM5NmZjNmNlZmFlMDA5MWY1NjcyMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEku aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBA IC0xMTUsNiArMTE1LDcgQEAgYm9vbCBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJSYW5nZShD VEZvbnRSZWYsIENHR2x5cGggZ2x5cGhzW10sIENGUmFuZ2UpOwogQ1RGb250RGVzY3JpcHRvclJl ZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlRm9yVUlUeXBlKENURm9udFVJRm9udFR5cGUsIENHRmxv YXQgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZv bnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShDRlN0cmluZ1JlZiBzdHlsZSwgQ0ZTdHJp bmdSZWYgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBD VEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhTeW1ib2xpY1RyYWl0cyhDVEZvbnREZXNjcmlw dG9yUmVmIG9yaWdpbmFsLCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdFZhbHVlLCBDVEZv bnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdE1hc2spOworQ1RGb250RGVzY3JpcHRvclJlZiBDVEZv bnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoQ0ZTdHJpbmdSZWYg c3R5bGUsIENGU3RyaW5nUmVmIHNpemUsIENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzKTsKIENG Qml0VmVjdG9yUmVmIENURm9udENvcHlHbHlwaENvdmVyYWdlRm9yRmVhdHVyZShDVEZvbnRSZWYs IENGRGljdGlvbmFyeVJlZiBmZWF0dXJlKTsKIAogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnRE ZXNjcmlwdG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXNBbmRPcHRpb25zKENGRGljdGlvbmFyeVJlZiBh dHRyaWJ1dGVzLCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggNmYwZjQ4N2M0NzNmNTI0YzljYjgyOTJiYzgz OTI3NGU1MTYwYzYyNi4uYmY5MzBjNjUzNGE2YjExZGFhMTRiY2Q4Y2U1MTYxNzczYzMzYTNiMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtMTM5OSwx MSArMTM5OSwxNiBAQCBjb25zdCBDRkluZGV4IGF0dGFjaG1lbnRXcmFwcGluZ1RleHRNYXhpbXVt TGluZUNvdW50ID0gMjsKIAogc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFjaG1lbnRB Y3Rpb25Gb250KCkKIHsKKyNpZiBIQVZFKENURk9OVERFU0NSSVBUT1JDUkVBVEVXSVRIVEVYVFNU WUxFQU5EQVRUUklCVVRFUykKKyAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZW1w aGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0 aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoa0NUVUlGb250VGV4dFN0eWxlRm9vdG5vdGUsIFJlbmRl clRoZW1lSU9TOjpjb250ZW50U2l6ZUNhdGVnb3J5KCksIChDRkRpY3Rpb25hcnlSZWYpQHsgKGlk KWtDVEZvbnRUcmFpdHNBdHRyaWJ1dGU6IEB7IChpZClrQ1RGb250U3ltYm9saWNUcmFpdDogQChr Q1RGb250VHJhaXRUaWdodExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB9IH0pKTsK KyNlbHNlCiAgICAgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZvbnREZXNjcmlwdG9y ID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShrQ1RVSUZvbnRU ZXh0U3R5bGVTaG9ydEZvb3Rub3RlLCBSZW5kZXJUaGVtZUlPUzo6c2luZ2xldG9uKCkuY29udGVu dFNpemVDYXRlZ29yeSgpLCAwKSk7CiAgICAgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+ IGVtcGhhc2l6ZWRGb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0 ZUNvcHlXaXRoQXR0cmlidXRlcyhmb250RGVzY3JpcHRvci5nZXQoKSwKICAgICAgICAgKENGRGlj dGlvbmFyeVJlZilAewogICAgICAgICAgICAgKGlkKWtDVEZvbnREZXNjcmlwdG9yVGV4dFN0eWxl QXR0cmlidXRlOiAoaWQpa0NURm9udERlc2NyaXB0b3JUZXh0U3R5bGVFbXBoYXNpemVkCiAgICAg fSkpOworI2VuZGlmCisKICAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERl c2NyaXB0b3IoZW1waGFzaXplZEZvbnREZXNjcmlwdG9yLmdldCgpLCAwLCBudWxscHRyKSk7CiB9 CiAK 408147 2020-09-06 15:59:14 -0700 2020-09-06 17:02:20 -0700 Patch bug-215707-20200906155913.patch text/plain 6187 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmI4NGE3MmFiNGRiYzMwYzQ5N2FiOTBmOWJmNDJjMTg4MjFlNmE1 MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBhdHRhY2htZW50QWN0aW9uRm9u dCgpIE5lZWRzIHRvIHVzZSBrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdo dExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB0byBnZXQgdGhlIHNob3J0IGVtcGhh c2l6ZWQgZm9vdG5vdGUgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzkzMDg5Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0 Zm9ybUhhdmUuaDoKKwogMjAyMC0wOS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVGV4dENvZGVjIHJlZmluZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2YxNGU0YWYy YjI3OTJkOTQ0M2M3NmM2MGFhMzg0ZTM1MDkyZjg2NC4uZDZkNGIzMzkwN2ZmNWI3MDE2YjlmYjdm MWY3NmRhMDBkYzZjMWU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTA2 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lP U10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJh aXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NURm9udFRyYWl0RW1waGFzaXplZCkg dG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTcwNworICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBpcyB0aGUgY29ycmVjdCB3YXkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBo YXNpemVkIGZvb3Rub3RlIGZvbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjphdHRhY2htZW50QWN0aW9uRm9udCk6CisKIDIwMjAt MDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAg ICBMZXR0ZXItc3BhY2luZyBzaG91bGQgZGlzYWJsZSBsaWdhdHVyZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9n CmluZGV4IGM4MzUwMjlkYzRkMWRiYjYyZjczZDgyZTUxNGQwNGNlZTBkMWUzMGUuLjFmMTEyMTFl MmNmODk0MDZhZDE3Y2ZlYjM2YmMwODhlNzM2ZGUwODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDIwLTA5LTA2ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0 byB1c2Uga0NURm9udFN5bWJvbGljVHJhaXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwg a0NURm9udFRyYWl0RW1waGFzaXplZCkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Ru b3RlIGZvbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNTcwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0NvcmVU ZXh0U1BJLmg6IEFkZCBhbiBvcHRpbXphdGlvbiBmb3IgcGxhdGZvcm1zIHdoaWNoIHN1cHBvcnQg aXQuCisKIDIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNv bT4KIAogICAgICAgICBbQ29jb2FdIFVTRShQTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVCkg aXMgdHJ1ZSBvbiBhbGwgQ29jb2EgcGxhdGZvcm1zLCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8gY29u c3VsdCBpdCBpbiBDb2NvYS1zcGVjaWZpYyBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRleCAw YmNmODFmMzA1OTMzYjc5ZjUxYjI0YmZmODk5MDVhNTdlMzE1NWJjLi5jMTk5YjgyMzU4MmY3YTE2 M2M3MmQzMjk2NTVkMjRjMDIzZWUyNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaApAQCAtNzM5LDMg KzczOSwxMCBAQAogICAgIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDE0MDAwMCkKICNkZWZpbmUgSEFWRV9DVEZPTlRJU1NZU1RFTVVJRk9O VCAxCiAjZW5kaWYKKworI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPj0gMTEwMDAwKSBcCisgICAgfHwgKChQTEFURk9STShJT1MpIHx8IFBMQVRG T1JNKE1BQ0NBVEFMWVNUKSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTQwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gNzAwMDApIFwKKyAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYg X19UVl9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVfQ1RG T05UREVTQ1JJUFRPUl9DUkVBVEVfV0lUSF9URVhUX1NUWUxFX0FORF9BVFRSSUJVVEVTIDEKKyNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRl eHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgK aW5kZXggMDJiNzYyNWY4YzIxZjU1Yzc0NDc4MGU0ODk3NjIyZWQ0ZmNiZmI1Mi4uYWEzM2JkNjM4 NWJhMTM0MzM2YTRiMjM0NWNlNzUxZjgzMWVhOTAyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC0xMTUsNiArMTE1LDcgQEAgYm9vbCBD VEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJSYW5nZShDVEZvbnRSZWYsIENHR2x5cGggZ2x5cGhz W10sIENGUmFuZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRl Rm9yVUlUeXBlKENURm9udFVJRm9udFR5cGUsIENHRmxvYXQgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFu Z3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRl eHRTdHlsZShDRlN0cmluZ1JlZiBzdHlsZSwgQ0ZTdHJpbmdSZWYgc2l6ZSwgQ0ZTdHJpbmdSZWYg bGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29w eVdpdGhTeW1ib2xpY1RyYWl0cyhDVEZvbnREZXNjcmlwdG9yUmVmIG9yaWdpbmFsLCBDVEZvbnRT eW1ib2xpY1RyYWl0cyBzeW1UcmFpdFZhbHVlLCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFp dE1hc2spOworQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRl eHRTdHlsZUFuZEF0dHJpYnV0ZXMoQ0ZTdHJpbmdSZWYgc3R5bGUsIENGU3RyaW5nUmVmIHNpemUs IENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzKTsKIENGQml0VmVjdG9yUmVmIENURm9udENvcHlH bHlwaENvdmVyYWdlRm9yRmVhdHVyZShDVEZvbnRSZWYsIENGRGljdGlvbmFyeVJlZiBmZWF0dXJl KTsKIAogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aEF0dHJp YnV0ZXNBbmRPcHRpb25zKENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBDVEZvbnREZXNjcmlw dG9yT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0K aW5kZXggNmYwZjQ4N2M0NzNmNTI0YzljYjgyOTJiYzgzOTI3NGU1MTYwYzYyNi4uYmUyNzRkOTE4 Njc4MjgyNDY4ZGFmM2MwNTZlYTM0ZjU0NmE1MDhjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtMTM5OSwxMSArMTM5OSwxNCBAQCBjb25zdCBDRklu ZGV4IGF0dGFjaG1lbnRXcmFwcGluZ1RleHRNYXhpbXVtTGluZUNvdW50ID0gMjsKIAogc3RhdGlj IFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFjaG1lbnRBY3Rpb25Gb250KCkKIHsKLSAgICBSZXRh aW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9u dERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlKGtDVFVJRm9udFRleHRTdHlsZVNob3J0Rm9v dG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5nbGV0b24oKS5jb250ZW50U2l6ZUNhdGVnb3J5KCks IDApKTsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZW1waGFzaXplZEZvbnRE ZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhBdHRyaWJ1 dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLAotICAgICAgICAoQ0ZEaWN0aW9uYXJ5UmVmKUB7Ci0g ICAgICAgICAgICAoaWQpa0NURm9udERlc2NyaXB0b3JUZXh0U3R5bGVBdHRyaWJ1dGU6IChpZClr Q1RGb250RGVzY3JpcHRvclRleHRTdHlsZUVtcGhhc2l6ZWQKLSAgICB9KSk7CisjaWYgSEFWRShD VEZPTlRERVNDUklQVE9SX0NSRUFURV9XSVRIX1RFWFRfU1RZTEVfQU5EX0FUVFJJQlVURVMpCisg ICAgYXV0byBlbXBoYXNpemVkRm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0 b3JDcmVhdGVXaXRoVGV4dFN0eWxlQW5kQXR0cmlidXRlcyhrQ1RVSUZvbnRUZXh0U3R5bGVGb290 bm90ZSwgUmVuZGVyVGhlbWVJT1M6OmNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgKENGRGljdGlvbmFy eVJlZilAeyAoaWQpa0NURm9udFRyYWl0c0F0dHJpYnV0ZTogQHsgKGlkKWtDVEZvbnRTeW1ib2xp Y1RyYWl0OiBAKGtDVEZvbnRUcmFpdFRpZ2h0TGVhZGluZyB8IGtDVEZvbnRUcmFpdEVtcGhhc2l6 ZWQpIH0gfSkpOworI2Vsc2UKKyAgICBhdXRvIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZv bnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShrQ1RVSUZvbnRUZXh0U3R5bGVTaG9ydEZv b3Rub3RlLCBSZW5kZXJUaGVtZUlPUzo6c2luZ2xldG9uKCkuY29udGVudFNpemVDYXRlZ29yeSgp LCAwKSk7CisgICAgYXV0byBlbXBoYXNpemVkRm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9u dERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0aEF0dHJpYnV0ZXMoZm9udERlc2NyaXB0b3IuZ2V0KCks CisgICAgICAgIChDRkRpY3Rpb25hcnlSZWYpQHsgKGlkKWtDVEZvbnRUcmFpdHNBdHRyaWJ1dGU6 IEB7IChpZClrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdodExlYWRpbmcg fCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB9IH0pKTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIGFk b3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGVtcGhhc2l6ZWRGb250RGVzY3Jp cHRvci5nZXQoKSwgMCwgbnVsbHB0cikpOwogfQogCg== 408151 2020-09-06 17:02:22 -0700 2020-09-06 17:07:23 -0700 Patch bug-215707-20200906170221.patch text/plain 6445 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Njg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmI4NGE3MmFiNGRiYzMwYzQ5N2FiOTBmOWJmNDJjMTg4MjFlNmE1 MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBhdHRhY2htZW50QWN0aW9uRm9u dCgpIE5lZWRzIHRvIHVzZSBrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdo dExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB0byBnZXQgdGhlIHNob3J0IGVtcGhh c2l6ZWQgZm9vdG5vdGUgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzkzMDg5Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0 Zm9ybUhhdmUuaDoKKwogMjAyMC0wOS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVGV4dENvZGVjIHJlZmluZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmVkNzdhOGYy MmI1MGYzYzhlODI1ZDIxN2YwODk1MDNlODc1NTdhYy4uMDVmOTM1NTZhZGIxYTNkNDI1Y2I0OTg3 MWIxYjQ1MTgxMjczMDMxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTA2 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lP U10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJh aXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NURm9udFRyYWl0RW1waGFzaXplZCkg dG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTcwNworICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBpcyB0aGUgY29ycmVjdCB3YXkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBo YXNpemVkIGZvb3Rub3RlIGZvbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjphdHRhY2htZW50QWN0aW9uRm9udCk6CisKIDIwMjAt MDktMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ RkNdIFJlbmFtZSBEaXNwbGF5OjpMaW5lQm94IHRvIERpc3BsYXk6OkxpbmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCmluZGV4IGM4MzUwMjlkYzRkMWRiYjYyZjczZDgyZTUxNGQwNGNlZTBkMWUzMGUuLjFmMTEy MTFlMmNmODk0MDZhZDE3Y2ZlYjM2YmMwODhlNzM2ZGUwODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDIwLTA5LTA2ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs ZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVk cyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJhaXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5n IHwga0NURm9udFRyYWl0RW1waGFzaXplZCkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZv b3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxNTcwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0Nv cmVUZXh0U1BJLmg6IEFkZCBhbiBvcHRpbXphdGlvbiBmb3IgcGxhdGZvcm1zIHdoaWNoIHN1cHBv cnQgaXQuCisKIDIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVTRShQTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElT VCkgaXMgdHJ1ZSBvbiBhbGwgQ29jb2EgcGxhdGZvcm1zLCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8g Y29uc3VsdCBpdCBpbiBDb2NvYS1zcGVjaWZpYyBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRl eCAwYmNmODFmMzA1OTMzYjc5ZjUxYjI0YmZmODk5MDVhNTdlMzE1NWJjLi5jMTk5YjgyMzU4MmY3 YTE2M2M3MmQzMjk2NTVkMjRjMDIzZWUyNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Q bGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaApAQCAtNzM5 LDMgKzczOSwxMCBAQAogICAgIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDE0MDAwMCkKICNkZWZpbmUgSEFWRV9DVEZPTlRJU1NZU1RFTVVJ Rk9OVCAxCiAjZW5kaWYKKworI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwKSBcCisgICAgfHwgKChQTEFURk9STShJT1MpIHx8IFBM QVRGT1JNKE1BQ0NBVEFMWVNUKSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTQwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gNzAwMDApIFwKKyAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikg JiYgX19UVl9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVf Q1RGT05UREVTQ1JJUFRPUl9DUkVBVEVfV0lUSF9URVhUX1NUWUxFX0FORF9BVFRSSUJVVEVTIDEK KyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29y ZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJ LmgKaW5kZXggMDJiNzYyNWY4YzIxZjU1Yzc0NDc4MGU0ODk3NjIyZWQ0ZmNiZmI1Mi4uOTRjYmQ2 Nzc2YmQ3ZmNjOTE1Njc3MzAwMzAwOWFjYTFlOWMxYWM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC03Nyw2ICs3NywxMSBAQCB0eXBl ZGVmIENGX0VOVU0odWludDhfdCwgQ1RDb21wb3NpdGlvbkxhbmd1YWdlKQogICAgIGtDVENvbXBv c2l0aW9uTGFuZ3VhZ2VUcmFkaXRpb25hbENoaW5lc2UsCiB9OwogCitlbnVtIHsKKyAgICBrQ1RG b250VHJhaXRUaWdodExlYWRpbmcgPSAoMSA8PCAxNSksCisgICAga0NURm9udFRyYWl0RW1waGFz aXplZCA9IGtDVEZvbnRUcmFpdEJvbGQsCit9OworCiAjZW5kaWYKIAogV1RGX0VYVEVSTl9DX0JF R0lOCkBAIC0xMTUsNiArMTIwLDcgQEAgYm9vbCBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJS YW5nZShDVEZvbnRSZWYsIENHR2x5cGggZ2x5cGhzW10sIENGUmFuZ2UpOwogQ1RGb250RGVzY3Jp cHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlRm9yVUlUeXBlKENURm9udFVJRm9udFR5cGUs IENHRmxvYXQgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJl ZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShDRlN0cmluZ1JlZiBzdHlsZSwg Q0ZTdHJpbmdSZWYgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRv clJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhTeW1ib2xpY1RyYWl0cyhDVEZvbnRE ZXNjcmlwdG9yUmVmIG9yaWdpbmFsLCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdFZhbHVl LCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdE1hc2spOworQ1RGb250RGVzY3JpcHRvclJl ZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoQ0ZTdHJp bmdSZWYgc3R5bGUsIENGU3RyaW5nUmVmIHNpemUsIENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVz KTsKIENGQml0VmVjdG9yUmVmIENURm9udENvcHlHbHlwaENvdmVyYWdlRm9yRmVhdHVyZShDVEZv bnRSZWYsIENGRGljdGlvbmFyeVJlZiBmZWF0dXJlKTsKIAogQ1RGb250RGVzY3JpcHRvclJlZiBD VEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXNBbmRPcHRpb25zKENGRGljdGlvbmFy eVJlZiBhdHRyaWJ1dGVzLCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggNmYwZjQ4N2M0NzNmNTI0YzljYjgy OTJiYzgzOTI3NGU1MTYwYzYyNi4uYmUyNzRkOTE4Njc4MjgyNDY4ZGFmM2MwNTZlYTM0ZjU0NmE1 MDhjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9T Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAt MTM5OSwxMSArMTM5OSwxNCBAQCBjb25zdCBDRkluZGV4IGF0dGFjaG1lbnRXcmFwcGluZ1RleHRN YXhpbXVtTGluZUNvdW50ID0gMjsKIAogc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFj aG1lbnRBY3Rpb25Gb250KCkKIHsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4g Zm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0 eWxlKGtDVFVJRm9udFRleHRTdHlsZVNob3J0Rm9vdG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5n bGV0b24oKS5jb250ZW50U2l6ZUNhdGVnb3J5KCksIDApKTsKLSAgICBSZXRhaW5QdHI8Q1RGb250 RGVzY3JpcHRvclJlZj4gZW1waGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnRE ZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLAot ICAgICAgICAoQ0ZEaWN0aW9uYXJ5UmVmKUB7Ci0gICAgICAgICAgICAoaWQpa0NURm9udERlc2Ny aXB0b3JUZXh0U3R5bGVBdHRyaWJ1dGU6IChpZClrQ1RGb250RGVzY3JpcHRvclRleHRTdHlsZUVt cGhhc2l6ZWQKLSAgICB9KSk7CisjaWYgSEFWRShDVEZPTlRERVNDUklQVE9SX0NSRUFURV9XSVRI X1RFWFRfU1RZTEVfQU5EX0FUVFJJQlVURVMpCisgICAgYXV0byBlbXBoYXNpemVkRm9udERlc2Ny aXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlQW5kQXR0 cmlidXRlcyhrQ1RVSUZvbnRUZXh0U3R5bGVGb290bm90ZSwgUmVuZGVyVGhlbWVJT1M6OmNvbnRl bnRTaXplQ2F0ZWdvcnkoKSwgKENGRGljdGlvbmFyeVJlZilAeyAoaWQpa0NURm9udFRyYWl0c0F0 dHJpYnV0ZTogQHsgKGlkKWtDVEZvbnRTeW1ib2xpY1RyYWl0OiBAKGtDVEZvbnRUcmFpdFRpZ2h0 TGVhZGluZyB8IGtDVEZvbnRUcmFpdEVtcGhhc2l6ZWQpIH0gfSkpOworI2Vsc2UKKyAgICBhdXRv IGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRT dHlsZShrQ1RVSUZvbnRUZXh0U3R5bGVTaG9ydEZvb3Rub3RlLCBSZW5kZXJUaGVtZUlPUzo6c2lu Z2xldG9uKCkuY29udGVudFNpemVDYXRlZ29yeSgpLCAwKSk7CisgICAgYXV0byBlbXBoYXNpemVk Rm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0aEF0 dHJpYnV0ZXMoZm9udERlc2NyaXB0b3IuZ2V0KCksCisgICAgICAgIChDRkRpY3Rpb25hcnlSZWYp QHsgKGlkKWtDVEZvbnRUcmFpdHNBdHRyaWJ1dGU6IEB7IChpZClrQ1RGb250U3ltYm9saWNUcmFp dDogQChrQ1RGb250VHJhaXRUaWdodExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB9 IH0pKTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnRE ZXNjcmlwdG9yKGVtcGhhc2l6ZWRGb250RGVzY3JpcHRvci5nZXQoKSwgMCwgbnVsbHB0cikpOwog fQogCg== 408152 2020-09-06 17:07:25 -0700 2020-09-06 17:37:34 -0700 Patch bug-215707-20200906170725.patch text/plain 6342 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Njg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmI4NGE3MmFiNGRiYzMwYzQ5N2FiOTBmOWJmNDJjMTg4MjFlNmE1 MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBhdHRhY2htZW50QWN0aW9uRm9u dCgpIE5lZWRzIHRvIHVzZSBrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdo dExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB0byBnZXQgdGhlIHNob3J0IGVtcGhh c2l6ZWQgZm9vdG5vdGUgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzkzMDg5Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0 Zm9ybUhhdmUuaDoKKwogMjAyMC0wOS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVGV4dENvZGVjIHJlZmluZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmVkNzdhOGYy MmI1MGYzYzhlODI1ZDIxN2YwODk1MDNlODc1NTdhYy4uMDVmOTM1NTZhZGIxYTNkNDI1Y2I0OTg3 MWIxYjQ1MTgxMjczMDMxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTA2 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lP U10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJh aXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NURm9udFRyYWl0RW1waGFzaXplZCkg dG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTcwNworICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBpcyB0aGUgY29ycmVjdCB3YXkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBo YXNpemVkIGZvb3Rub3RlIGZvbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjphdHRhY2htZW50QWN0aW9uRm9udCk6CisKIDIwMjAt MDktMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ RkNdIFJlbmFtZSBEaXNwbGF5OjpMaW5lQm94IHRvIERpc3BsYXk6OkxpbmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCmluZGV4IGM4MzUwMjlkYzRkMWRiYjYyZjczZDgyZTUxNGQwNGNlZTBkMWUzMGUuLjFmMTEy MTFlMmNmODk0MDZhZDE3Y2ZlYjM2YmMwODhlNzM2ZGUwODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDIwLTA5LTA2ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVs ZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVk cyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJhaXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5n IHwga0NURm9udFRyYWl0RW1waGFzaXplZCkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZv b3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxNTcwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0Nv cmVUZXh0U1BJLmg6IEFkZCBhbiBvcHRpbXphdGlvbiBmb3IgcGxhdGZvcm1zIHdoaWNoIHN1cHBv cnQgaXQuCisKIDIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVTRShQTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElT VCkgaXMgdHJ1ZSBvbiBhbGwgQ29jb2EgcGxhdGZvcm1zLCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8g Y29uc3VsdCBpdCBpbiBDb2NvYS1zcGVjaWZpYyBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRl eCAwYmNmODFmMzA1OTMzYjc5ZjUxYjI0YmZmODk5MDVhNTdlMzE1NWJjLi5jMTk5YjgyMzU4MmY3 YTE2M2M3MmQzMjk2NTVkMjRjMDIzZWUyNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Q bGF0Zm9ybUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaApAQCAtNzM5 LDMgKzczOSwxMCBAQAogICAgIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDE0MDAwMCkKICNkZWZpbmUgSEFWRV9DVEZPTlRJU1NZU1RFTVVJ Rk9OVCAxCiAjZW5kaWYKKworI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwKSBcCisgICAgfHwgKChQTEFURk9STShJT1MpIHx8IFBM QVRGT1JNKE1BQ0NBVEFMWVNUKSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTQwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gNzAwMDApIFwKKyAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikg JiYgX19UVl9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVf Q1RGT05UREVTQ1JJUFRPUl9DUkVBVEVfV0lUSF9URVhUX1NUWUxFX0FORF9BVFRSSUJVVEVTIDEK KyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29y ZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJ LmgKaW5kZXggMDJiNzYyNWY4YzIxZjU1Yzc0NDc4MGU0ODk3NjIyZWQ0ZmNiZmI1Mi4uOTRjYmQ2 Nzc2YmQ3ZmNjOTE1Njc3MzAwMzAwOWFjYTFlOWMxYWM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC03Nyw2ICs3NywxMSBAQCB0eXBl ZGVmIENGX0VOVU0odWludDhfdCwgQ1RDb21wb3NpdGlvbkxhbmd1YWdlKQogICAgIGtDVENvbXBv c2l0aW9uTGFuZ3VhZ2VUcmFkaXRpb25hbENoaW5lc2UsCiB9OwogCitlbnVtIHsKKyAgICBrQ1RG b250VHJhaXRUaWdodExlYWRpbmcgPSAoMSA8PCAxNSksCisgICAga0NURm9udFRyYWl0RW1waGFz aXplZCA9IGtDVEZvbnRUcmFpdEJvbGQsCit9OworCiAjZW5kaWYKIAogV1RGX0VYVEVSTl9DX0JF R0lOCkBAIC0xMTUsNiArMTIwLDcgQEAgYm9vbCBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJS YW5nZShDVEZvbnRSZWYsIENHR2x5cGggZ2x5cGhzW10sIENGUmFuZ2UpOwogQ1RGb250RGVzY3Jp cHRvclJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlRm9yVUlUeXBlKENURm9udFVJRm9udFR5cGUs IENHRmxvYXQgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJl ZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShDRlN0cmluZ1JlZiBzdHlsZSwg Q0ZTdHJpbmdSZWYgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRv clJlZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhTeW1ib2xpY1RyYWl0cyhDVEZvbnRE ZXNjcmlwdG9yUmVmIG9yaWdpbmFsLCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdFZhbHVl LCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdE1hc2spOworQ1RGb250RGVzY3JpcHRvclJl ZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoQ0ZTdHJp bmdSZWYgc3R5bGUsIENGU3RyaW5nUmVmIHNpemUsIENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVz KTsKIENGQml0VmVjdG9yUmVmIENURm9udENvcHlHbHlwaENvdmVyYWdlRm9yRmVhdHVyZShDVEZv bnRSZWYsIENGRGljdGlvbmFyeVJlZiBmZWF0dXJlKTsKIAogQ1RGb250RGVzY3JpcHRvclJlZiBD VEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXNBbmRPcHRpb25zKENGRGljdGlvbmFy eVJlZiBhdHRyaWJ1dGVzLCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggNmYwZjQ4N2M0NzNmNTI0YzljYjgy OTJiYzgzOTI3NGU1MTYwYzYyNi4uMDZhNWZmNGEzYzM4ZmJjNjExMTg1ZjQ3ODg0MzM2YzhkMDJk ODFhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9T Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAt MTM5OSwxMSArMTM5OSwxNCBAQCBjb25zdCBDRkluZGV4IGF0dGFjaG1lbnRXcmFwcGluZ1RleHRN YXhpbXVtTGluZUNvdW50ID0gMjsKIAogc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFj aG1lbnRBY3Rpb25Gb250KCkKIHsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4g Zm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0 eWxlKGtDVFVJRm9udFRleHRTdHlsZVNob3J0Rm9vdG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5n bGV0b24oKS5jb250ZW50U2l6ZUNhdGVnb3J5KCksIDApKTsKLSAgICBSZXRhaW5QdHI8Q1RGb250 RGVzY3JpcHRvclJlZj4gZW1waGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnRE ZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLAot ICAgICAgICAoQ0ZEaWN0aW9uYXJ5UmVmKUB7Ci0gICAgICAgICAgICAoaWQpa0NURm9udERlc2Ny aXB0b3JUZXh0U3R5bGVBdHRyaWJ1dGU6IChpZClrQ1RGb250RGVzY3JpcHRvclRleHRTdHlsZUVt cGhhc2l6ZWQKLSAgICB9KSk7CisgICAgQ0ZEaWN0aW9uYXJ5UmVmIGF0dHJpYnV0ZXMgPSBAeyAo aWQpa0NURm9udFRyYWl0c0F0dHJpYnV0ZTogQHsgKGlkKWtDVEZvbnRTeW1ib2xpY1RyYWl0OiBA KGtDVEZvbnRUcmFpdFRpZ2h0TGVhZGluZyB8IGtDVEZvbnRUcmFpdEVtcGhhc2l6ZWQpIH0gfTsK KyNpZiBIQVZFKENURk9OVERFU0NSSVBUT1JfQ1JFQVRFX1dJVEhfVEVYVF9TVFlMRV9BTkRfQVRU UklCVVRFUykKKyAgICBhdXRvIGVtcGhhc2l6ZWRGb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RG b250RGVzY3JpcHRvckNyZWF0ZVdpdGhUZXh0U3R5bGVBbmRBdHRyaWJ1dGVzKGtDVFVJRm9udFRl eHRTdHlsZUZvb3Rub3RlLCBSZW5kZXJUaGVtZUlPUzo6Y29udGVudFNpemVDYXRlZ29yeSgpLCBh dHRyaWJ1dGVzKSk7CisjZWxzZQorICAgIGF1dG8gZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENU Rm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlKGtDVFVJRm9udFRleHRTdHlsZVNob3J0 Rm9vdG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5nbGV0b24oKS5jb250ZW50U2l6ZUNhdGVnb3J5 KCksIDApKTsKKyAgICBhdXRvIGVtcGhhc2l6ZWRGb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RG b250RGVzY3JpcHRvckNyZWF0ZUNvcHlXaXRoQXR0cmlidXRlcyhmb250RGVzY3JpcHRvci5nZXQo KSwgYXR0cmlidXRlcykpOworI2VuZGlmCisKICAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVh dGVXaXRoRm9udERlc2NyaXB0b3IoZW1waGFzaXplZEZvbnREZXNjcmlwdG9yLmdldCgpLCAwLCBu dWxscHRyKSk7CiB9CiAK 408155 2020-09-06 17:37:36 -0700 2020-09-06 17:59:05 -0700 Patch bug-215707-20200906173735.patch text/plain 6426 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Njg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmI4NGE3MmFiNGRiYzMwYzQ5N2FiOTBmOWJmNDJjMTg4MjFlNmE1 MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBhdHRhY2htZW50QWN0aW9uRm9u dCgpIE5lZWRzIHRvIHVzZSBrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdo dExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB0byBnZXQgdGhlIHNob3J0IGVtcGhh c2l6ZWQgZm9vdG5vdGUgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzkzMDg5Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0 Zm9ybUhhdmUuaDoKKwogMjAyMC0wOS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVGV4dENvZGVjIHJlZmluZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDA0M2I2YWYz ZTM5YjIzYTdlMzNlMjZiOTJlZTJhNTkzZWY0NDE5Mi4uYWFmY2M3N2E3ZjIwZmE4MTEwNzUzZGFm ZDg0MmQ1MjU2MGRmYWIwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTA2 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lP U10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJh aXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NURm9udFRyYWl0RW1waGFzaXplZCkg dG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTcwNworICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBpcyB0aGUgY29ycmVjdCB3YXkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBo YXNpemVkIGZvb3Rub3RlIGZvbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjphdHRhY2htZW50QWN0aW9uRm9udCk6CisKIDIwMjAt MDktMDYgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJJRExd IEFkZCBtb2RlIHRvIHByZXByb2Nlc3MtaWRscy5wbCB0byB2YWxpZGF0ZSBmYXN0IHJlZ2V4IGJh c2VkIHNjYW5uZXIgd2l0aCB0aGUgbm9ybWFsIElETCBwYXJzZXIKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmlu ZGV4IGM4MzUwMjlkYzRkMWRiYjYyZjczZDgyZTUxNGQwNGNlZTBkMWUzMGUuLjFmMTEyMTFlMmNm ODk0MDZhZDE3Y2ZlYjM2YmMwODhlNzM2ZGUwODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDIwLTA5LTA2ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs ZS5jb20+CisKKyAgICAgICAgW2lPU10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1 c2Uga0NURm9udFN5bWJvbGljVHJhaXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NU Rm9udFRyYWl0RW1waGFzaXplZCkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3Rl IGZvbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NTcwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0NvcmVUZXh0 U1BJLmg6IEFkZCBhbiBvcHRpbXphdGlvbiBmb3IgcGxhdGZvcm1zIHdoaWNoIHN1cHBvcnQgaXQu CisKIDIwMjAtMDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4K IAogICAgICAgICBbQ29jb2FdIFVTRShQTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVCkgaXMg dHJ1ZSBvbiBhbGwgQ29jb2EgcGxhdGZvcm1zLCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8gY29uc3Vs dCBpdCBpbiBDb2NvYS1zcGVjaWZpYyBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv UGxhdGZvcm1IYXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRleCAwYmNm ODFmMzA1OTMzYjc5ZjUxYjI0YmZmODk5MDVhNTdlMzE1NWJjLi5jMTk5YjgyMzU4MmY3YTE2M2M3 MmQzMjk2NTVkMjRjMDIzZWUyNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bUhhdmUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaApAQCAtNzM5LDMgKzcz OSwxMCBAQAogICAgIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlO X1JFUVVJUkVEID49IDE0MDAwMCkKICNkZWZpbmUgSEFWRV9DVEZPTlRJU1NZU1RFTVVJRk9OVCAx CiAjZW5kaWYKKworI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gMTEwMDAwKSBcCisgICAgfHwgKChQTEFURk9STShJT1MpIHx8IFBMQVRGT1JN KE1BQ0NBVEFMWVNUKSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQw MDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPj0gNzAwMDApIFwKKyAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19U Vl9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVfQ1RGT05U REVTQ1JJUFRPUl9DUkVBVEVfV0lUSF9URVhUX1NUWUxFX0FORF9BVFRSSUJVVEVTIDEKKyNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRT UEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKaW5k ZXggMDJiNzYyNWY4YzIxZjU1Yzc0NDc4MGU0ODk3NjIyZWQ0ZmNiZmI1Mi4uOTRjYmQ2Nzc2YmQ3 ZmNjOTE1Njc3MzAwMzAwOWFjYTFlOWMxYWM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwv cGFsL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC03Nyw2ICs3NywxMSBAQCB0eXBlZGVmIENG X0VOVU0odWludDhfdCwgQ1RDb21wb3NpdGlvbkxhbmd1YWdlKQogICAgIGtDVENvbXBvc2l0aW9u TGFuZ3VhZ2VUcmFkaXRpb25hbENoaW5lc2UsCiB9OwogCitlbnVtIHsKKyAgICBrQ1RGb250VHJh aXRUaWdodExlYWRpbmcgPSAoMSA8PCAxNSksCisgICAga0NURm9udFRyYWl0RW1waGFzaXplZCA9 IGtDVEZvbnRUcmFpdEJvbGQsCit9OworCiAjZW5kaWYKIAogV1RGX0VYVEVSTl9DX0JFR0lOCkBA IC0xMTUsNiArMTIwLDcgQEAgYm9vbCBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJSYW5nZShD VEZvbnRSZWYsIENHR2x5cGggZ2x5cGhzW10sIENGUmFuZ2UpOwogQ1RGb250RGVzY3JpcHRvclJl ZiBDVEZvbnREZXNjcmlwdG9yQ3JlYXRlRm9yVUlUeXBlKENURm9udFVJRm9udFR5cGUsIENHRmxv YXQgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZv bnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShDRlN0cmluZ1JlZiBzdHlsZSwgQ0ZTdHJp bmdSZWYgc2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBD VEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhTeW1ib2xpY1RyYWl0cyhDVEZvbnREZXNjcmlw dG9yUmVmIG9yaWdpbmFsLCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdFZhbHVlLCBDVEZv bnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdE1hc2spOworQ1RGb250RGVzY3JpcHRvclJlZiBDVEZv bnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoQ0ZTdHJpbmdSZWYg c3R5bGUsIENGU3RyaW5nUmVmIHNpemUsIENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzKTsKIENG Qml0VmVjdG9yUmVmIENURm9udENvcHlHbHlwaENvdmVyYWdlRm9yRmVhdHVyZShDVEZvbnRSZWYs IENGRGljdGlvbmFyeVJlZiBmZWF0dXJlKTsKIAogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnRE ZXNjcmlwdG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXNBbmRPcHRpb25zKENGRGljdGlvbmFyeVJlZiBh dHRyaWJ1dGVzLCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggNmYwZjQ4N2M0NzNmNTI0YzljYjgyOTJiYzgz OTI3NGU1MTYwYzYyNi4uYWY2YjAxYzA0ODBhNDY3OWJhNGI0MmRkYjAyYWQwODRhMjI3MDAyZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtMTM5OSwx MSArMTM5OSwxNiBAQCBjb25zdCBDRkluZGV4IGF0dGFjaG1lbnRXcmFwcGluZ1RleHRNYXhpbXVt TGluZUNvdW50ID0gMjsKIAogc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFjaG1lbnRB Y3Rpb25Gb250KCkKIHsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZm9udERl c2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlKGtD VFVJRm9udFRleHRTdHlsZVNob3J0Rm9vdG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5nbGV0b24o KS5jb250ZW50U2l6ZUNhdGVnb3J5KCksIDApKTsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3Jp cHRvclJlZj4gZW1waGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlw dG9yQ3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLAotICAgICAg ICAoQ0ZEaWN0aW9uYXJ5UmVmKUB7Ci0gICAgICAgICAgICAoaWQpa0NURm9udERlc2NyaXB0b3JU ZXh0U3R5bGVBdHRyaWJ1dGU6IChpZClrQ1RGb250RGVzY3JpcHRvclRleHRTdHlsZUVtcGhhc2l6 ZWQKLSAgICB9KSk7CisgICAgQ0ZTdHJpbmdSZWYgc3R5bGUgPSBrQ1RVSUZvbnRUZXh0U3R5bGVG b290bm90ZTsKKyAgICBDRlN0cmluZ1JlZiBzaXplID0gUmVuZGVyVGhlbWVJT1M6OnNpbmdsZXRv bigpLmNvbnRlbnRTaXplQ2F0ZWdvcnkoKTsKKyAgICBDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRl cyA9IHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJlZj4oQHsgKGlkKWtDVEZvbnRUcmFpdHNBdHRy aWJ1dGU6IEB7IChpZClrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdodExl YWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB9IH0pOworI2lmIEhBVkUoQ1RGT05UREVT Q1JJUFRPUl9DUkVBVEVfV0lUSF9URVhUX1NUWUxFX0FORF9BVFRSSUJVVEVTKQorICAgIGF1dG8g ZW1waGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRl V2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoc3R5bGUsIHNpemUsIGF0dHJpYnV0ZXMpKTsKKyNl bHNlCisgICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNy ZWF0ZVdpdGhUZXh0U3R5bGUoc3R5bGUsIHNpemUsIDApKTsKKyAgICBhdXRvIGVtcGhhc2l6ZWRG b250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZUNvcHlXaXRoQXR0 cmlidXRlcyhmb250RGVzY3JpcHRvci5nZXQoKSwgYXR0cmlidXRlcykpOworI2VuZGlmCisKICAg ICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3IoZW1waGFzaXpl ZEZvbnREZXNjcmlwdG9yLmdldCgpLCAwLCBudWxscHRyKSk7CiB9CiAK 408157 2020-09-06 18:06:01 -0700 2020-09-06 23:19:43 -0700 Patch for committing bug-215707-20200906180600.patch text/plain 8219 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Njg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDgyYzA0ODU1MGFmYjQ4ODc5MmY4NjQ4 ZWYwZjkyNWIxM2Q3NmUyZmYuLmNkODU5Njg2ZGU3ZjA5YWM1MjZmMGFiMGJjOTZmNzAyM2RmNzdh NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDktMDYgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBhdHRhY2htZW50QWN0aW9uRm9u dCgpIE5lZWRzIHRvIHVzZSBrQ1RGb250U3ltYm9saWNUcmFpdDogQChrQ1RGb250VHJhaXRUaWdo dExlYWRpbmcgfCBrQ1RGb250VHJhaXRFbXBoYXNpemVkKSB0byBnZXQgdGhlIHNob3J0IGVtcGhh c2l6ZWQgZm9vdG5vdGUgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE1NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzkzMDg5Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9y bUhhdmUuaDoKKwogMjAyMC0wOS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgVGV4dENvZGVjIHJlZmluZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDA0M2I2YWYzZTM5 YjIzYTdlMzNlMjZiOTJlZTJhNTkzZWY0NDE5Mi4uYmM1OTM0MzkzZWVjZWZlMTFkMzhhZGY3YWE0 OWIyNzY5ZjE1ZGI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTA2ICBN eWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10g YXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1c2Uga0NURm9udFN5bWJvbGljVHJhaXQ6 IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NURm9udFRyYWl0RW1waGFzaXplZCkgdG8g Z2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3RlIGZvbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTcwNworICAgICAgICA8cmRhcjovL3By b2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAg ICAgICAgVGhpcyBpcyB0aGUgY29ycmVjdCB3YXkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVk IGZvb3Rub3RlIGZvbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW06 CisgICAgICAgIChXZWJDb3JlOjphdHRhY2htZW50QWN0aW9uRm9udCk6CisKIDIwMjAtMDktMDYg IFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJJRExdIEFkZCBt b2RlIHRvIHByZXByb2Nlc3MtaWRscy5wbCB0byB2YWxpZGF0ZSBmYXN0IHJlZ2V4IGJhc2VkIHNj YW5uZXIgd2l0aCB0aGUgbm9ybWFsIElETCBwYXJzZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IGM4 MzUwMjlkYzRkMWRiYjYyZjczZDgyZTUxNGQwNGNlZTBkMWUzMGUuLmNjZjA1YmVmNWFhZWEzYTRk M2ZjZGQ1OGY2YTlmOTVkMDY4OTFkZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTA5LTA2ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgW2lPU10gYXR0YWNobWVudEFjdGlvbkZvbnQoKSBOZWVkcyB0byB1c2Uga0NU Rm9udFN5bWJvbGljVHJhaXQ6IEAoa0NURm9udFRyYWl0VGlnaHRMZWFkaW5nIHwga0NURm9udFRy YWl0RW1waGFzaXplZCkgdG8gZ2V0IHRoZSBzaG9ydCBlbXBoYXNpemVkIGZvb3Rub3RlIGZvbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTcwNwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM5MzA4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmg6IEFk ZCBhbiBvcHRpbXphdGlvbiBmb3IgcGxhdGZvcm1zIHdoaWNoIHN1cHBvcnQgaXQuCisKIDIwMjAt MDktMDUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAg ICBbQ29jb2FdIFVTRShQTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVCkgaXMgdHJ1ZSBvbiBh bGwgQ29jb2EgcGxhdGZvcm1zLCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8gY29uc3VsdCBpdCBpbiBD b2NvYS1zcGVjaWZpYyBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1I YXZlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAppbmRleCAwYmNmODFmMzA1OTMz Yjc5ZjUxYjI0YmZmODk5MDVhNTdlMzE1NWJjLi5jMTk5YjgyMzU4MmY3YTE2M2M3MmQzMjk2NTVk MjRjMDIzZWUyNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaApAQCAtNzM5LDMgKzczOSwxMCBAQAog ICAgIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDE0MDAwMCkKICNkZWZpbmUgSEFWRV9DVEZPTlRJU1NZU1RFTVVJRk9OVCAxCiAjZW5kaWYK KworI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTEwMDAwKSBcCisgICAgfHwgKChQTEFURk9STShJT1MpIHx8IFBMQVRGT1JNKE1BQ0NBVEFM WVNUKSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQwMDAwKSBcCisg ICAgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gNzAwMDApIFwKKyAgICB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19UVl9PU19WRVJT SU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVfQ1RGT05UREVTQ1JJUFRP Ul9DUkVBVEVfV0lUSF9URVhUX1NUWUxFX0FORF9BVFRSSUJVVEVTIDEKKyNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdCBiL1Nv dXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QKaW5kZXggZjc2ZGZh Zjg3NjMyMGRmYWRjNmQxYTg3ZWVhMjNjMDA0NmU3OWI1Yi4uMzAyYzI3NDRlNzI4ZTczM2Y2MmRj ODZiMTljZDRjZGJiNjFkODJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNv dXJjZXMtaW5wdXQueGNmaWxlbGlzdAorKysgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNl cy1pbnB1dC54Y2ZpbGVsaXN0CkBAIC0yMDgsNiArMjA4LDcgQEAgJChQUk9KRUNUX0RJUikvTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENQcmlvcml0eVR5cGUuaWRsCiAkKFBST0pFQ1RfRElSKS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1J0cENhcGFiaWxpdGllcy5pZGwKICQoUFJPSkVDVF9ESVIpL01v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwQ29kZWNDYXBhYmlsaXR5LmlkbAogJChQUk9KRUNUX0RJ UikvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBDb2RlY1BhcmFtZXRlcnMuaWRsCiskKFBST0pF Q1RfRElSKS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cENvZGluZ1BhcmFtZXRlcnMuaWRsCiAk KFBST0pFQ1RfRElSKS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cENvbnRyaWJ1dGluZ1NvdXJj ZS5pZGwKICQoUFJPSkVDVF9ESVIpL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwRW5jb2RpbmdQ YXJhbWV0ZXJzLmlkbAogJChQUk9KRUNUX0RJUikvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBG ZWNQYXJhbWV0ZXJzLmlkbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJj ZXMtb3V0cHV0LnhjZmlsZWxpc3QgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy1vdXRw dXQueGNmaWxlbGlzdAppbmRleCBiYzMxZThhMmRhMWRlNGY2MWJiZjk1NDNmZDk2ZmQ1ODY3YzJl OTEyLi4xMjk2YTcwMDc0NzcxNjhjMDk1ZjAyZDQwYjhlYWNjY2ZhYjAyYmJkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy1vdXRwdXQueGNmaWxlbGlzdAorKysgYi9T b3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy1vdXRwdXQueGNmaWxlbGlzdApAQCAtMTQ1Niw2 ICsxNDU2LDggQEAgJChCVUlMVF9QUk9EVUNUU19ESVIpL0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUv SlNSVENSdHBDb2RlY0NhcGFiaWxpdHkuY3BwCiAkKEJVSUxUX1BST0RVQ1RTX0RJUikvRGVyaXZl ZFNvdXJjZXMvV2ViQ29yZS9KU1JUQ1J0cENvZGVjQ2FwYWJpbGl0eS5oCiAkKEJVSUxUX1BST0RV Q1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvV2ViQ29yZS9KU1JUQ1J0cENvZGVjUGFyYW1ldGVycy5j cHAKICQoQlVJTFRfUFJPRFVDVFNfRElSKS9EZXJpdmVkU291cmNlcy9XZWJDb3JlL0pTUlRDUnRw Q29kZWNQYXJhbWV0ZXJzLmgKKyQoQlVJTFRfUFJPRFVDVFNfRElSKS9EZXJpdmVkU291cmNlcy9X ZWJDb3JlL0pTUlRDUnRwQ29kaW5nUGFyYW1ldGVycy5jcHAKKyQoQlVJTFRfUFJPRFVDVFNfRElS KS9EZXJpdmVkU291cmNlcy9XZWJDb3JlL0pTUlRDUnRwQ29kaW5nUGFyYW1ldGVycy5oCiAkKEJV SUxUX1BST0RVQ1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvV2ViQ29yZS9KU1JUQ1J0cENvbnRyaWJ1 dGluZ1NvdXJjZS5jcHAKICQoQlVJTFRfUFJPRFVDVFNfRElSKS9EZXJpdmVkU291cmNlcy9XZWJD b3JlL0pTUlRDUnRwQ29udHJpYnV0aW5nU291cmNlLmgKICQoQlVJTFRfUFJPRFVDVFNfRElSKS9E ZXJpdmVkU291cmNlcy9XZWJDb3JlL0pTUlRDUnRwRW5jb2RpbmdQYXJhbWV0ZXJzLmNwcApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaCBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvcmVUZXh0U1BJLmgKaW5kZXggMDJi NzYyNWY4YzIxZjU1Yzc0NDc4MGU0ODk3NjIyZWQ0ZmNiZmI1Mi4uOTRjYmQ2Nzc2YmQ3ZmNjOTE1 Njc3MzAwMzAwOWFjYTFlOWMxYWM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3Bh bC9zcGkvY29jb2EvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw aS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC03Nyw2ICs3NywxMSBAQCB0eXBlZGVmIENGX0VOVU0o dWludDhfdCwgQ1RDb21wb3NpdGlvbkxhbmd1YWdlKQogICAgIGtDVENvbXBvc2l0aW9uTGFuZ3Vh Z2VUcmFkaXRpb25hbENoaW5lc2UsCiB9OwogCitlbnVtIHsKKyAgICBrQ1RGb250VHJhaXRUaWdo dExlYWRpbmcgPSAoMSA8PCAxNSksCisgICAga0NURm9udFRyYWl0RW1waGFzaXplZCA9IGtDVEZv bnRUcmFpdEJvbGQsCit9OworCiAjZW5kaWYKIAogV1RGX0VYVEVSTl9DX0JFR0lOCkBAIC0xMTUs NiArMTIwLDcgQEAgYm9vbCBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJSYW5nZShDVEZvbnRS ZWYsIENHR2x5cGggZ2x5cGhzW10sIENGUmFuZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZv bnREZXNjcmlwdG9yQ3JlYXRlRm9yVUlUeXBlKENURm9udFVJRm9udFR5cGUsIENHRmxvYXQgc2l6 ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShDRlN0cmluZ1JlZiBzdHlsZSwgQ0ZTdHJpbmdSZWYg c2l6ZSwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UpOwogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnRE ZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhTeW1ib2xpY1RyYWl0cyhDVEZvbnREZXNjcmlwdG9yUmVm IG9yaWdpbmFsLCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBzeW1UcmFpdFZhbHVlLCBDVEZvbnRTeW1i b2xpY1RyYWl0cyBzeW1UcmFpdE1hc2spOworQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZUFuZEF0dHJpYnV0ZXMoQ0ZTdHJpbmdSZWYgc3R5bGUs IENGU3RyaW5nUmVmIHNpemUsIENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzKTsKIENGQml0VmVj dG9yUmVmIENURm9udENvcHlHbHlwaENvdmVyYWdlRm9yRmVhdHVyZShDVEZvbnRSZWYsIENGRGlj dGlvbmFyeVJlZiBmZWF0dXJlKTsKIAogQ1RGb250RGVzY3JpcHRvclJlZiBDVEZvbnREZXNjcmlw dG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXNBbmRPcHRpb25zKENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1 dGVzLCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVJT1MubW0KaW5kZXggNmYwZjQ4N2M0NzNmNTI0YzljYjgyOTJiYzgzOTI3NGU1 MTYwYzYyNi4uMWI3NDE3NjNiZGJiNjExNzdiZWEwZDFiMjk2NjkxYTQxNDdhMDkxZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtMTM5OSwxMSArMTM5 OSwxNiBAQCBjb25zdCBDRkluZGV4IGF0dGFjaG1lbnRXcmFwcGluZ1RleHRNYXhpbXVtTGluZUNv dW50ID0gMjsKIAogc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFjaG1lbnRBY3Rpb25G b250KCkKIHsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJlZj4gZm9udERlc2NyaXB0 b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlKGtDVFVJRm9u dFRleHRTdHlsZVNob3J0Rm9vdG5vdGUsIFJlbmRlclRoZW1lSU9TOjpzaW5nbGV0b24oKS5jb250 ZW50U2l6ZUNhdGVnb3J5KCksIDApKTsKLSAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRvclJl Zj4gZW1waGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3Jl YXRlQ29weVdpdGhBdHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLAotICAgICAgICAoQ0ZE aWN0aW9uYXJ5UmVmKUB7Ci0gICAgICAgICAgICAoaWQpa0NURm9udERlc2NyaXB0b3JUZXh0U3R5 bGVBdHRyaWJ1dGU6IChpZClrQ1RGb250RGVzY3JpcHRvclRleHRTdHlsZUVtcGhhc2l6ZWQKLSAg ICB9KSk7CisgICAgYXV0byBzdHlsZSA9IGtDVFVJRm9udFRleHRTdHlsZUZvb3Rub3RlOworICAg IGF1dG8gc2l6ZSA9IFJlbmRlclRoZW1lSU9TOjpzaW5nbGV0b24oKS5jb250ZW50U2l6ZUNhdGVn b3J5KCk7CisgICAgYXV0byBhdHRyaWJ1dGVzID0gc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVm PihAeyAoaWQpa0NURm9udFRyYWl0c0F0dHJpYnV0ZTogQHsgKGlkKWtDVEZvbnRTeW1ib2xpY1Ry YWl0OiBAKGtDVEZvbnRUcmFpdFRpZ2h0TGVhZGluZyB8IGtDVEZvbnRUcmFpdEVtcGhhc2l6ZWQp IH0gfSk7CisjaWYgSEFWRShDVEZPTlRERVNDUklQVE9SX0NSRUFURV9XSVRIX1RFWFRfU1RZTEVf QU5EX0FUVFJJQlVURVMpCisgICAgYXV0byBlbXBoYXNpemVkRm9udERlc2NyaXB0b3IgPSBhZG9w dENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoVGV4dFN0eWxlQW5kQXR0cmlidXRlcyhzdHls ZSwgc2l6ZSwgYXR0cmlidXRlcykpOworI2Vsc2UKKyAgICBhdXRvIGZvbnREZXNjcmlwdG9yID0g YWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShzdHlsZSwgc2l6ZSwg MCkpOworICAgIGF1dG8gZW1waGFzaXplZEZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnRE ZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLCBh dHRyaWJ1dGVzKSk7CisjZW5kaWYKKwogICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdp dGhGb250RGVzY3JpcHRvcihlbXBoYXNpemVkRm9udERlc2NyaXB0b3IuZ2V0KCksIDAsIG51bGxw dHIpKTsKIH0KIAo=