167871 2017-02-06 01:19:54 -0800 Read stroke width of subtitles from MediaAccessibility framework. 2017-02-07 05:11:48 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen bfulgham eric.carlson jonlee webkit-bug-importer oldest_to_newest 1273501 0 pvollan 2017-02-06 01:19:54 -0800 We can receive MACaptionFontAttributeStrokeWidth embedded in the CTFontDescriptor. 1273506 1 300699 pvollan 2017-02-06 02:21:45 -0800 Created attachment 300699 Patch 1273517 2 300705 pvollan 2017-02-06 03:46:33 -0800 Created attachment 300705 Patch 1273613 3 300705 bfulgham 2017-02-06 10:12:20 -0800 Comment on attachment 300705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300705&action=review > Source/WebCore/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=167871 Can you include the relevant Radar here, please? > Source/WebCore/ChangeLog:12 > + (WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS): You can delete this line. "prepare-ChangeLog" misunderstood the whitespace change and though 'captionsTextEdgeCSS' was updated, too. > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:393 > + if (!MACaptionFontAttributeStrokeWidth) We should build a test system for this, possibly as a TestWebKitAPI test where you set the MACaptionFontAttributeStrokeWidth and confirm that the resulting rendering is correct. I'm fine with you doing this as a separate patch dealing with macOS and Windows. > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:396 > + RetainPtr<CTFontDescriptorRef> font = adoptCF(MACaptionAppearanceCopyFontDescriptorForStyle(kMACaptionAppearanceDomainUser, nullptr, kMACaptionAppearanceFontStyleDefault)); Could this be auto? > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:400 > + RetainPtr<CFTypeRef> strokeWidthAttribute = adoptCF(CTFontDescriptorCopyAttribute(font.get(), MACaptionFontAttributeStrokeWidth)); Ditto auto? 1273913 4 pvollan 2017-02-07 03:28:05 -0800 (In reply to comment #3) > Comment on attachment 300705 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=300705&action=review > > > Source/WebCore/ChangeLog:4 > > + https://bugs.webkit.org/show_bug.cgi?id=167871 > > Can you include the relevant Radar here, please? > > > Source/WebCore/ChangeLog:12 > > + (WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS): > > You can delete this line. "prepare-ChangeLog" misunderstood the whitespace > change and though 'captionsTextEdgeCSS' was updated, too. > > > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:393 > > + if (!MACaptionFontAttributeStrokeWidth) > > We should build a test system for this, possibly as a TestWebKitAPI test > where you set the MACaptionFontAttributeStrokeWidth and confirm that the > resulting rendering is correct. > > I'm fine with you doing this as a separate patch dealing with macOS and > Windows. > > > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:396 > > + RetainPtr<CTFontDescriptorRef> font = adoptCF(MACaptionAppearanceCopyFontDescriptorForStyle(kMACaptionAppearanceDomainUser, nullptr, kMACaptionAppearanceFontStyleDefault)); > > Could this be auto? > > > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:400 > > + RetainPtr<CFTypeRef> strokeWidthAttribute = adoptCF(CTFontDescriptorCopyAttribute(font.get(), MACaptionFontAttributeStrokeWidth)); > > Ditto auto? Thanks for reviewing :) I will update the patch. 1273914 5 300799 pvollan 2017-02-07 03:40:47 -0800 Created attachment 300799 Patch 1273915 6 pvollan 2017-02-07 03:44:54 -0800 <rdar://problem/29265906> 1273954 7 pvollan 2017-02-07 05:11:48 -0800 Committed <https://trac.webkit.org/changeset/211803> 300699 2017-02-06 02:21:45 -0800 2017-02-06 03:46:28 -0800 Patch bug-167871-20170206111924.patch text/plain 6491 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMTcxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAyLTA2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSZWFkIHN0cm9rZSB3aWR0 aCBvZiBzdWJ0aXRsZXMgZnJvbSBNZWRpYUFjY2Vzc2liaWxpdHkgZnJhbWV3b3JrLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3ODcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhZCBNQUNhcHRpb25G b250QXR0cmlidXRlU3Ryb2tlV2lkdGggZnJvbSBDVEZvbnREZXNjcmlwdG9yUmVmLgorCisgICAg ICAgICogcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6c3Ryb2tlV2lkdGgpOgorICAg ICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zVGV4 dEVkZ2VDU1MpOgorICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jZi9NZWRpYUFjY2Vzc2liaWxpdHlTb2Z0TGluay5jcHA6 CisgICAgICAgICogcGxhdGZvcm0vY2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuaDoKKwog MjAxNy0wMi0wNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgog CiAgICAgICAgIEZpeCBXaW5DYWlybyBidWlsZCBhZnRlciByMjExNjgxCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNw cAkocmV2aXNpb24gMjExNzE4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclBy ZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDggQEAgU09G VF9MSU5LX0FWRl9GUkFNRVdPUksoQ29yZVRleHQpCiBTT0ZUX0xJTktfQVZGX0ZSQU1FV09SS19J TVBPUlQoQ29yZVRleHQsIENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlLCAgQ0ZUeXBlUmVm LCAoQ1RGb250RGVzY3JpcHRvclJlZiBkZXNjcmlwdG9yLCBDRlN0cmluZ1JlZiBhdHRyaWJ1dGUp LCAoZGVzY3JpcHRvciwgYXR0cmlidXRlKSk7CiBTT0ZUX0xJTktfQVZGX1BPSU5URVIoQ29yZVRl eHQsIGtDVEZvbnROYW1lQXR0cmlidXRlLCBDRlN0cmluZ1JlZikKICNkZWZpbmUga0NURm9udE5h bWVBdHRyaWJ1dGUgZ2V0a0NURm9udE5hbWVBdHRyaWJ1dGUoKQorU09GVF9MSU5LX0FWRl9QT0lO VEVSKENvcmVUZXh0LCBNQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGgsIENGU3RyaW5n UmVmKQorI2RlZmluZSBNQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGggZ2V0TUFDYXB0 aW9uRm9udEF0dHJpYnV0ZVN0cm9rZVdpZHRoKCkKIAogI2RlZmluZSBDVEZvbnREZXNjcmlwdG9y Q29weUF0dHJpYnV0ZSBzb2Z0TGlua19DVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZQogCkBA IC0zODYsMTIgKzM4OCwzMyBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6 OmNvCiAgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAorU3RyaW5nIENhcHRpb25V c2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpzdHJva2VXaWR0aCgpIGNvbnN0Cit7CisgICAgc3RhdGlj IE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gc3Ryb2tlV2lkdGhEZWZhdWx0KEFTQ0lJTGl0 ZXJhbCgiIC4wM2VtICIpKTsKKworICAgIGlmICghTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0cm9r ZVdpZHRoKQorICAgICAgICByZXR1cm4gc3Ryb2tlV2lkdGhEZWZhdWx0OworICAgIAorICAgIFJl dGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmb250ID0gYWRvcHRDRihNQUNhcHRpb25BcHBl YXJhbmNlQ29weUZvbnREZXNjcmlwdG9yRm9yU3R5bGUoa01BQ2FwdGlvbkFwcGVhcmFuY2VEb21h aW5Vc2VyLCBudWxscHRyLCBrTUFDYXB0aW9uQXBwZWFyYW5jZUZvbnRTdHlsZURlZmF1bHQpKTsK KyAgICBpZiAoIWZvbnQpCisgICAgICAgIHJldHVybiBzdHJva2VXaWR0aERlZmF1bHQ7CisgICAg CisgICAgUmV0YWluUHRyPENGVHlwZVJlZj4gc3Ryb2tlV2lkdGhBdHRyaWJ1dGUgPSBhZG9wdENG KENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlKGZvbnQuZ2V0KCksIE1BQ2FwdGlvbkZvbnRB dHRyaWJ1dGVTdHJva2VXaWR0aCkpOworICAgIGlmICghc3Ryb2tlV2lkdGhBdHRyaWJ1dGUpCisg ICAgICAgIHJldHVybiBzdHJva2VXaWR0aERlZmF1bHQ7CisgICAgCisgICAgaW50IHN0cm9rZVdp ZHRoID0gMDsKKyAgICBpZiAoIUNGTnVtYmVyR2V0VmFsdWUoc3RhdGljX2Nhc3Q8Q0ZOdW1iZXJS ZWY+KHN0cm9rZVdpZHRoQXR0cmlidXRlLmdldCgpKSwga0NGTnVtYmVySW50VHlwZSwgJnN0cm9r ZVdpZHRoKSkKKyAgICAgICAgcmV0dXJuIHN0cm9rZVdpZHRoRGVmYXVsdDsKKworICAgIHJldHVy biBTdHJpbmc6OmZvcm1hdCgiICVkcHggIiwgc3Ryb2tlV2lkdGgpOworfQorCiBTdHJpbmcgQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zVGV4dEVkZ2VDU1MoKSBjb25zdAog ewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGVkZ2VTdHlsZVJhaXNl ZChBU0NJSUxpdGVyYWwoIiAtLjA1ZW0gLS4wNWVtIDAgIikpOwogICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxjb25zdCBTdHJpbmc+IGVkZ2VTdHlsZURlcHJlc3NlZChBU0NJSUxpdGVyYWwoIiAu MDVlbSAuMDVlbSAwICIpKTsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5n PiBlZGdlU3R5bGVEcm9wU2hhZG93KEFTQ0lJTGl0ZXJhbCgiIC4wNzVlbSAuMDc1ZW0gMCAiKSk7 Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmluZz4gZWRnZVN0eWxlVW5pZm9y bShBU0NJSUxpdGVyYWwoIiAuMDNlbSAiKSk7CiAKICAgICBib29sIHVudXNlZDsKICAgICBDb2xv ciBjb2xvciA9IGNhcHRpb25zVGV4dENvbG9yKHVudXNlZCk7CkBAIC00MTMsOCArNDM2LDggQEAg U3RyaW5nIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYQogICAgIGNhc2Uga01BQ2Fw dGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlRHJvcFNoYWRvdzoKICAgICAgICAgcmV0dXJuIGNz c1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlUZXh0U2hhZG93LCBlZGdlU3R5 bGVEcm9wU2hhZG93LCBjb2xvciwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VCZWhh dmlvclVzZVZhbHVlKTsKICAgICBjYXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VTdHls ZVVuaWZvcm06Ci0gICAgICAgIHJldHVybiBjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9yKENT U1Byb3BlcnR5V2Via2l0VGV4dFN0cm9rZSwgZWRnZVN0eWxlVW5pZm9ybSwgY29sb3IsIGJlaGF2 aW9yID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7Ci0gICAgICAgICAg ICAKKyAgICAgICAgcmV0dXJuIGNzc1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVy dHlXZWJraXRUZXh0U3Ryb2tlLCBzdHJva2VXaWR0aCgpLCBjb2xvciwgYmVoYXZpb3IgPT0ga01B Q2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlvclVzZVZhbHVlKTsKKyAgICAKICAgICBkZWZhdWx0Ogog ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5o CShyZXZpc2lvbiAyMTE3MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJl ZmVyZW5jZXNNZWRpYUFGLmgJKHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDcgQEAgcHJpdmF0 ZToKICAgICBTdHJpbmcgY2FwdGlvbnNEZWZhdWx0Rm9udENTUygpIGNvbnN0OwogICAgIENvbG9y IGNhcHRpb25zRWRnZUNvbG9yRm9yVGV4dENvbG9yKGNvbnN0IENvbG9yJikgY29uc3Q7CiAgICAg U3RyaW5nIHdpbmRvd1JvdW5kZWRDb3JuZXJSYWRpdXNDU1MoKSBjb25zdDsKKyAgICBTdHJpbmcg c3Ryb2tlV2lkdGgoKSBjb25zdDsKICAgICBTdHJpbmcgY2FwdGlvbnNUZXh0RWRnZUNTUygpIGNv bnN0OwogICAgIFN0cmluZyBjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9yKENTU1Byb3BlcnR5 SUQsIGNvbnN0IFN0cmluZyYsIGNvbnN0IENvbG9yJiwgYm9vbCkgY29uc3Q7CiAgICAgU3RyaW5n IGNvbG9yUHJvcGVydHlDU1MoQ1NTUHJvcGVydHlJRCwgY29uc3QgQ29sb3ImLCBib29sKSBjb25z dDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL01lZGlhQWNjZXNzaWJpbGl0eVNv ZnRMaW5rLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9NZWRp YUFjY2Vzc2liaWxpdHlTb2Z0TGluay5jcHAJKHJldmlzaW9uIDIxMTcxOCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2NmL01lZGlhQWNjZXNzaWJpbGl0eVNvZnRMaW5rLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTYsNSArNTYsNiBAQCBTT0ZUX0xJTktfRlVOQ1RJT05fTUFZX0ZBSUxfRk9S X1NPVVJDRShXCiAKIFNPRlRfTElOS19DT05TVEFOVF9GT1JfU09VUkNFKFdlYkNvcmUsIE1lZGlh QWNjZXNzaWJpbGl0eSwga01BWENhcHRpb25BcHBlYXJhbmNlU2V0dGluZ3NDaGFuZ2VkTm90aWZp Y2F0aW9uLCBDRlN0cmluZ1JlZikKIFNPRlRfTElOS19DT05TVEFOVF9NQVlfRkFJTF9GT1JfU09V UkNFKFdlYkNvcmUsIE1lZGlhQWNjZXNzaWJpbGl0eSwga01BQXVkaWJsZU1lZGlhU2V0dGluZ3ND aGFuZ2VkTm90aWZpY2F0aW9uLCBDRlN0cmluZ1JlZikKK1NPRlRfTElOS19DT05TVEFOVF9NQVlf RkFJTF9GT1JfU09VUkNFKFdlYkNvcmUsIE1lZGlhQWNjZXNzaWJpbGl0eSwgTUFDYXB0aW9uRm9u dEF0dHJpYnV0ZVN0cm9rZVdpZHRoLCBDRlN0cmluZ1JlZikKIAogI2VuZGlmIC8vIEhBVkUoTUVE SUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jZi9NZWRpYUFjY2Vzc2liaWxpdHlTb2Z0TGluay5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2NmL01lZGlhQWNjZXNzaWJpbGl0eVNvZnRMaW5rLmgJKHJldmlzaW9u IDIxMTcxOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL01lZGlhQWNjZXNzaWJpbGl0 eVNvZnRMaW5rLmgJKHdvcmtpbmcgY29weSkKQEAgLTcwLDYgKzcwLDggQEAgU09GVF9MSU5LX0NP TlNUQU5UX0ZPUl9IRUFERVIoV2ViQ29yZSwgTQogI2RlZmluZSBrTUFYQ2FwdGlvbkFwcGVhcmFu Y2VTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24gZ2V0X01lZGlhQWNjZXNzaWJpbGl0eV9rTUFY Q2FwdGlvbkFwcGVhcmFuY2VTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24oKQogU09GVF9MSU5L X0NPTlNUQU5UX01BWV9GQUlMX0ZPUl9IRUFERVIoV2ViQ29yZSwgTWVkaWFBY2Nlc3NpYmlsaXR5 LCBrTUFBdWRpYmxlTWVkaWFTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24sIENGU3RyaW5nUmVm KQogI2RlZmluZSBrTUFBdWRpYmxlTWVkaWFTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24gZ2V0 X01lZGlhQWNjZXNzaWJpbGl0eV9rTUFBdWRpYmxlTWVkaWFTZXR0aW5nc0NoYW5nZWROb3RpZmlj YXRpb24oKQorU09GVF9MSU5LX0NPTlNUQU5UX01BWV9GQUlMX0ZPUl9IRUFERVIoV2ViQ29yZSwg TWVkaWFBY2Nlc3NpYmlsaXR5LCBNQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGgsIENG U3RyaW5nUmVmKQorI2RlZmluZSBNQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGggZ2V0 X01lZGlhQWNjZXNzaWJpbGl0eV9NQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGgoKQog CiAjZW5kaWYgLy8gSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykKIAo= 300705 2017-02-06 03:46:33 -0800 2017-02-06 10:12:20 -0800 Patch bug-167871-20170206124412.patch text/plain 5902 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMTcxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAyLTA2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSZWFkIHN0cm9rZSB3aWR0 aCBvZiBzdWJ0aXRsZXMgZnJvbSBNZWRpYUFjY2Vzc2liaWxpdHkgZnJhbWV3b3JrLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3ODcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhZCBNQUNhcHRpb25G b250QXR0cmlidXRlU3Ryb2tlV2lkdGggZnJvbSBDVEZvbnREZXNjcmlwdG9yUmVmLgorCisgICAg ICAgICogcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6c3Ryb2tlV2lkdGgpOgorICAg ICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zVGV4 dEVkZ2VDU1MpOgorICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jZi9NZWRpYUFjY2Vzc2liaWxpdHlTb2Z0TGluay5jcHA6 CisgICAgICAgICogcGxhdGZvcm0vY2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuaDoKKwog MjAxNy0wMi0wNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgog CiAgICAgICAgIEZpeCBXaW5DYWlybyBidWlsZCBhZnRlciByMjExNjgxCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNw cAkocmV2aXNpb24gMjExNzE4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclBy ZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4NiwxMiArMzg2LDMzIEBA IFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y28KICAgICByZXR1cm4gYnVp bGRlci50b1N0cmluZygpOwogfQogCitTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUY6OnN0cm9rZVdpZHRoKCkgY29uc3QKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29u c3QgU3RyaW5nPiBzdHJva2VXaWR0aERlZmF1bHQoQVNDSUlMaXRlcmFsKCIgLjAzZW0gIikpOwor CisgICAgaWYgKCFNQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGgpCisgICAgICAgIHJl dHVybiBzdHJva2VXaWR0aERlZmF1bHQ7CisgICAgCisgICAgUmV0YWluUHRyPENURm9udERlc2Ny aXB0b3JSZWY+IGZvbnQgPSBhZG9wdENGKE1BQ2FwdGlvbkFwcGVhcmFuY2VDb3B5Rm9udERlc2Ny aXB0b3JGb3JTdHlsZShrTUFDYXB0aW9uQXBwZWFyYW5jZURvbWFpblVzZXIsIG51bGxwdHIsIGtN QUNhcHRpb25BcHBlYXJhbmNlRm9udFN0eWxlRGVmYXVsdCkpOworICAgIGlmICghZm9udCkKKyAg ICAgICAgcmV0dXJuIHN0cm9rZVdpZHRoRGVmYXVsdDsKKyAgICAKKyAgICBSZXRhaW5QdHI8Q0ZU eXBlUmVmPiBzdHJva2VXaWR0aEF0dHJpYnV0ZSA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNv cHlBdHRyaWJ1dGUoZm9udC5nZXQoKSwgTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0cm9rZVdpZHRo KSk7CisgICAgaWYgKCFzdHJva2VXaWR0aEF0dHJpYnV0ZSkKKyAgICAgICAgcmV0dXJuIHN0cm9r ZVdpZHRoRGVmYXVsdDsKKyAgICAKKyAgICBpbnQgc3Ryb2tlV2lkdGggPSAwOworICAgIGlmICgh Q0ZOdW1iZXJHZXRWYWx1ZShzdGF0aWNfY2FzdDxDRk51bWJlclJlZj4oc3Ryb2tlV2lkdGhBdHRy aWJ1dGUuZ2V0KCkpLCBrQ0ZOdW1iZXJJbnRUeXBlLCAmc3Ryb2tlV2lkdGgpKQorICAgICAgICBy ZXR1cm4gc3Ryb2tlV2lkdGhEZWZhdWx0OworCisgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIg JWRweCAiLCBzdHJva2VXaWR0aCk7Cit9CisKIFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2Vz TWVkaWFBRjo6Y2FwdGlvbnNUZXh0RWRnZUNTUygpIGNvbnN0CiB7CiAgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPGNvbnN0IFN0cmluZz4gZWRnZVN0eWxlUmFpc2VkKEFTQ0lJTGl0ZXJhbCgiIC0u MDVlbSAtLjA1ZW0gMCAiKSk7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0cmlu Zz4gZWRnZVN0eWxlRGVwcmVzc2VkKEFTQ0lJTGl0ZXJhbCgiIC4wNWVtIC4wNWVtIDAgIikpOwog ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGVkZ2VTdHlsZURyb3BTaGFk b3coQVNDSUlMaXRlcmFsKCIgLjA3NWVtIC4wNzVlbSAwICIpKTsKLSAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdlU3R5bGVVbmlmb3JtKEFTQ0lJTGl0ZXJhbCgiIC4w M2VtICIpKTsKIAogICAgIGJvb2wgdW51c2VkOwogICAgIENvbG9yIGNvbG9yID0gY2FwdGlvbnNU ZXh0Q29sb3IodW51c2VkKTsKQEAgLTQxMyw4ICs0MzQsOCBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQ cmVmZXJlbmNlc01lZGlhQUY6OmNhCiAgICAgY2FzZSBrTUFDYXB0aW9uQXBwZWFyYW5jZVRleHRF ZGdlU3R5bGVEcm9wU2hhZG93OgogICAgICAgICByZXR1cm4gY3NzUHJvcGVydHlXaXRoVGV4dEVk Z2VDb2xvcihDU1NQcm9wZXJ0eVRleHRTaGFkb3csIGVkZ2VTdHlsZURyb3BTaGFkb3csIGNvbG9y LCBiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWUpOwogICAg IGNhc2Uga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlVW5pZm9ybToKLSAgICAgICAg cmV0dXJuIGNzc1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlXZWJraXRUZXh0 U3Ryb2tlLCBlZGdlU3R5bGVVbmlmb3JtLCBjb2xvciwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFw cGVhcmFuY2VCZWhhdmlvclVzZVZhbHVlKTsKLSAgICAgICAgICAgIAorICAgICAgICByZXR1cm4g Y3NzUHJvcGVydHlXaXRoVGV4dEVkZ2VDb2xvcihDU1NQcm9wZXJ0eVdlYmtpdFRleHRTdHJva2Us IHN0cm9rZVdpZHRoKCksIGNvbG9yLCBiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJl aGF2aW9yVXNlVmFsdWUpOworICAgIAogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgICAgICBicmVhazsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmgJKHJldmlzaW9uIDIxMTcxOCkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuaAko d29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBjYXB0 aW9uc0RlZmF1bHRGb250Q1NTKCkgY29uc3Q7CiAgICAgQ29sb3IgY2FwdGlvbnNFZGdlQ29sb3JG b3JUZXh0Q29sb3IoY29uc3QgQ29sb3ImKSBjb25zdDsKICAgICBTdHJpbmcgd2luZG93Um91bmRl ZENvcm5lclJhZGl1c0NTUygpIGNvbnN0OworICAgIFN0cmluZyBzdHJva2VXaWR0aCgpIGNvbnN0 OwogICAgIFN0cmluZyBjYXB0aW9uc1RleHRFZGdlQ1NTKCkgY29uc3Q7CiAgICAgU3RyaW5nIGNz c1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiwg Y29uc3QgQ29sb3ImLCBib29sKSBjb25zdDsKICAgICBTdHJpbmcgY29sb3JQcm9wZXJ0eUNTUyhD U1NQcm9wZXJ0eUlELCBjb25zdCBDb2xvciYsIGJvb2wpIGNvbnN0OwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL01lZGlhQWNjZXNzaWJpbGl0eVNvZnRM aW5rLmNwcAkocmV2aXNpb24gMjExNzE4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2Yv TWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw1ICs1 Niw2IEBAIFNPRlRfTElOS19GVU5DVElPTl9NQVlfRkFJTF9GT1JfU09VUkNFKFcKIAogU09GVF9M SU5LX0NPTlNUQU5UX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgTWVkaWFBY2Nlc3NpYmlsaXR5LCBrTUFY Q2FwdGlvbkFwcGVhcmFuY2VTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24sIENGU3RyaW5nUmVm KQogU09GVF9MSU5LX0NPTlNUQU5UX01BWV9GQUlMX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgTWVkaWFB Y2Nlc3NpYmlsaXR5LCBrTUFBdWRpYmxlTWVkaWFTZXR0aW5nc0NoYW5nZWROb3RpZmljYXRpb24s IENGU3RyaW5nUmVmKQorU09GVF9MSU5LX0NPTlNUQU5UX01BWV9GQUlMX0ZPUl9TT1VSQ0UoV2Vi Q29yZSwgTWVkaWFBY2Nlc3NpYmlsaXR5LCBNQUNhcHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lk dGgsIENGU3RyaW5nUmVmKQogCiAjZW5kaWYgLy8gSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZS QU1FV09SSykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL01lZGlhQWNjZXNzaWJp bGl0eVNvZnRMaW5rLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2Yv TWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuaAkocmV2aXNpb24gMjExNzE4KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuaAkod29ya2lu ZyBjb3B5KQpAQCAtNzAsNiArNzAsOCBAQCBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX0hFQURFUihX ZWJDb3JlLCBNCiAjZGVmaW5lIGtNQVhDYXB0aW9uQXBwZWFyYW5jZVNldHRpbmdzQ2hhbmdlZE5v dGlmaWNhdGlvbiBnZXRfTWVkaWFBY2Nlc3NpYmlsaXR5X2tNQVhDYXB0aW9uQXBwZWFyYW5jZVNl dHRpbmdzQ2hhbmdlZE5vdGlmaWNhdGlvbigpCiBTT0ZUX0xJTktfQ09OU1RBTlRfTUFZX0ZBSUxf Rk9SX0hFQURFUihXZWJDb3JlLCBNZWRpYUFjY2Vzc2liaWxpdHksIGtNQUF1ZGlibGVNZWRpYVNl dHRpbmdzQ2hhbmdlZE5vdGlmaWNhdGlvbiwgQ0ZTdHJpbmdSZWYpCiAjZGVmaW5lIGtNQUF1ZGli bGVNZWRpYVNldHRpbmdzQ2hhbmdlZE5vdGlmaWNhdGlvbiBnZXRfTWVkaWFBY2Nlc3NpYmlsaXR5 X2tNQUF1ZGlibGVNZWRpYVNldHRpbmdzQ2hhbmdlZE5vdGlmaWNhdGlvbigpCitTT0ZUX0xJTktf Q09OU1RBTlRfTUFZX0ZBSUxfRk9SX0hFQURFUihXZWJDb3JlLCBNZWRpYUFjY2Vzc2liaWxpdHks IE1BQ2FwdGlvbkZvbnRBdHRyaWJ1dGVTdHJva2VXaWR0aCwgQ0ZTdHJpbmdSZWYpCisjZGVmaW5l IE1BQ2FwdGlvbkZvbnRBdHRyaWJ1dGVTdHJva2VXaWR0aCBnZXRfTWVkaWFBY2Nlc3NpYmlsaXR5 X01BQ2FwdGlvbkZvbnRBdHRyaWJ1dGVTdHJva2VXaWR0aCgpCiAKICNlbmRpZiAvLyBIQVZFKE1F RElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQogCg== 300799 2017-02-07 03:40:47 -0800 2017-02-07 03:40:47 -0800 Patch bug-167871-20170207123824.patch text/plain 6045 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMTgwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE3LTAyLTA2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSZWFkIHN0cm9rZSB3aWR0 aCBvZiBzdWJ0aXRsZXMgZnJvbSBNZWRpYUFjY2Vzc2liaWxpdHkgZnJhbWV3b3JrLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3ODcxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yOTI2NTkwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBG dWxnaGFtLgorCisgICAgICAgIFJlYWQgTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0cm9rZVdpZHRo IGZyb20gQ1RGb250RGVzY3JpcHRvclJlZi4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQ cmVmZXJlbmNlc01lZGlhQUYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVm ZXJlbmNlc01lZGlhQUY6OnN0cm9rZVdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkNhcHRpb25V c2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uc1RleHRFZGdlQ1NTKToKKyAgICAgICAgKiBw YWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmg6CisgICAgICAgICogcGxhdGZvcm0v Y2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2Nm L01lZGlhQWNjZXNzaWJpbGl0eVNvZnRMaW5rLmg6CisKIDIwMTctMDItMDcgIEFudG9pbmUgUXVp bnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xz XSBJbXByb3ZlIGhhbmRsaW5nIG9mIDx2aWRlbz4gd2l0aCBvbmx5IGF1ZGlvIHRyYWNrcwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2Vz TWVkaWFBRi5jcHAJKHJldmlzaW9uIDIxMTgwMikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODYsMTIg KzM4NiwzNSBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNvCiAgICAg cmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAorU3RyaW5nIENhcHRpb25Vc2VyUHJlZmVy ZW5jZXNNZWRpYUFGOjpzdHJva2VXaWR0aCgpIGNvbnN0Cit7CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPGNvbnN0IFN0cmluZz4gc3Ryb2tlV2lkdGhEZWZhdWx0KEFTQ0lJTGl0ZXJhbCgiIC4w M2VtICIpKTsKKyAgICAKKyAgICBpZiAoIU1BQ2FwdGlvbkZvbnRBdHRyaWJ1dGVTdHJva2VXaWR0 aCAmJiAhY2FuTG9hZF9NZWRpYUFjY2Vzc2liaWxpdHlfTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0 cm9rZVdpZHRoKCkpCisgICAgICAgIHJldHVybiBzdHJva2VXaWR0aERlZmF1bHQ7CisgICAgCisg ICAgTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yIGJlaGF2aW9yOworCisgICAgYXV0byBmb250 ID0gYWRvcHRDRihNQUNhcHRpb25BcHBlYXJhbmNlQ29weUZvbnREZXNjcmlwdG9yRm9yU3R5bGUo a01BQ2FwdGlvbkFwcGVhcmFuY2VEb21haW5Vc2VyLCAmYmVoYXZpb3IsIGtNQUNhcHRpb25BcHBl YXJhbmNlRm9udFN0eWxlRGVmYXVsdCkpOworICAgIGlmICghZm9udCkKKyAgICAgICAgcmV0dXJu IHN0cm9rZVdpZHRoRGVmYXVsdDsKKyAgICAKKyAgICBhdXRvIHN0cm9rZVdpZHRoQXR0cmlidXRl ID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZShmb250LmdldCgpLCBNQUNh cHRpb25Gb250QXR0cmlidXRlU3Ryb2tlV2lkdGgpKTsKKyAgICBpZiAoIXN0cm9rZVdpZHRoQXR0 cmlidXRlKQorICAgICAgICByZXR1cm4gc3Ryb2tlV2lkdGhEZWZhdWx0OworICAgIAorICAgIGlu dCBzdHJva2VXaWR0aCA9IDA7CisgICAgaWYgKCFDRk51bWJlckdldFZhbHVlKHN0YXRpY19jYXN0 PENGTnVtYmVyUmVmPihzdHJva2VXaWR0aEF0dHJpYnV0ZS5nZXQoKSksIGtDRk51bWJlckludFR5 cGUsICZzdHJva2VXaWR0aCkpCisgICAgICAgIHJldHVybiBzdHJva2VXaWR0aERlZmF1bHQ7CisK KyAgICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiAlZHB4ICIsIHN0cm9rZVdpZHRoKTsKK30KKwog U3RyaW5nIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uc1RleHRFZGdlQ1NT KCkgY29uc3QKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdl U3R5bGVSYWlzZWQoQVNDSUlMaXRlcmFsKCIgLS4wNWVtIC0uMDVlbSAwICIpKTsKICAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdlU3R5bGVEZXByZXNzZWQoQVNDSUlM aXRlcmFsKCIgLjA1ZW0gLjA1ZW0gMCAiKSk7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNv bnN0IFN0cmluZz4gZWRnZVN0eWxlRHJvcFNoYWRvdyhBU0NJSUxpdGVyYWwoIiAuMDc1ZW0gLjA3 NWVtIDAgIikpOwotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGVkZ2VT dHlsZVVuaWZvcm0oQVNDSUlMaXRlcmFsKCIgLjAzZW0gIikpOwogCiAgICAgYm9vbCB1bnVzZWQ7 CiAgICAgQ29sb3IgY29sb3IgPSBjYXB0aW9uc1RleHRDb2xvcih1bnVzZWQpOwpAQCAtNDEzLDgg KzQzNiw4IEBAIFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y2EKICAgICBj YXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VTdHlsZURyb3BTaGFkb3c6CiAgICAgICAg IHJldHVybiBjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9yKENTU1Byb3BlcnR5VGV4dFNoYWRv dywgZWRnZVN0eWxlRHJvcFNoYWRvdywgY29sb3IsIGJlaGF2aW9yID09IGtNQUNhcHRpb25BcHBl YXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7CiAgICAgY2FzZSBrTUFDYXB0aW9uQXBwZWFyYW5jZVRl eHRFZGdlU3R5bGVVbmlmb3JtOgotICAgICAgICByZXR1cm4gY3NzUHJvcGVydHlXaXRoVGV4dEVk Z2VDb2xvcihDU1NQcm9wZXJ0eVdlYmtpdFRleHRTdHJva2UsIGVkZ2VTdHlsZVVuaWZvcm0sIGNv bG9yLCBiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWUpOwot ICAgICAgICAgICAgCisgICAgICAgIHJldHVybiBjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9y KENTU1Byb3BlcnR5V2Via2l0VGV4dFN0cm9rZSwgc3Ryb2tlV2lkdGgoKSwgY29sb3IsIGJlaGF2 aW9yID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7CisgICAgCiAgICAg ZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIGJyZWFrOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNl c01lZGlhQUYuaAkocmV2aXNpb24gMjExODAyKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0 aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5oCSh3b3JraW5nIGNvcHkpCkBAIC04MSw2ICs4MSw3 IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIGNhcHRpb25zRGVmYXVsdEZvbnRDU1MoKSBjb25zdDsK ICAgICBDb2xvciBjYXB0aW9uc0VkZ2VDb2xvckZvclRleHRDb2xvcihjb25zdCBDb2xvciYpIGNv bnN0OwogICAgIFN0cmluZyB3aW5kb3dSb3VuZGVkQ29ybmVyUmFkaXVzQ1NTKCkgY29uc3Q7Cisg ICAgU3RyaW5nIHN0cm9rZVdpZHRoKCkgY29uc3Q7CiAgICAgU3RyaW5nIGNhcHRpb25zVGV4dEVk Z2VDU1MoKSBjb25zdDsKICAgICBTdHJpbmcgY3NzUHJvcGVydHlXaXRoVGV4dEVkZ2VDb2xvcihD U1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmLCBjb25zdCBDb2xvciYsIGJvb2wpIGNvbnN0Owog ICAgIFN0cmluZyBjb2xvclByb3BlcnR5Q1NTKENTU1Byb3BlcnR5SUQsIGNvbnN0IENvbG9yJiwg Ym9vbCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9NZWRpYUFjY2Vz c2liaWxpdHlTb2Z0TGluay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuY3BwCShyZXZpc2lvbiAyMTE4MDIpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9NZWRpYUFjY2Vzc2liaWxpdHlTb2Z0TGluay5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU2LDUgKzU2LDYgQEAgU09GVF9MSU5LX0ZVTkNUSU9OX01B WV9GQUlMX0ZPUl9TT1VSQ0UoVwogCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX1NPVVJDRShXZWJD b3JlLCBNZWRpYUFjY2Vzc2liaWxpdHksIGtNQVhDYXB0aW9uQXBwZWFyYW5jZVNldHRpbmdzQ2hh bmdlZE5vdGlmaWNhdGlvbiwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfQ09OU1RBTlRfTUFZX0ZB SUxfRk9SX1NPVVJDRShXZWJDb3JlLCBNZWRpYUFjY2Vzc2liaWxpdHksIGtNQUF1ZGlibGVNZWRp YVNldHRpbmdzQ2hhbmdlZE5vdGlmaWNhdGlvbiwgQ0ZTdHJpbmdSZWYpCitTT0ZUX0xJTktfQ09O U1RBTlRfTUFZX0ZBSUxfRk9SX1NPVVJDRShXZWJDb3JlLCBNZWRpYUFjY2Vzc2liaWxpdHksIE1B Q2FwdGlvbkZvbnRBdHRyaWJ1dGVTdHJva2VXaWR0aCwgQ0ZTdHJpbmdSZWYpCiAKICNlbmRpZiAv LyBIQVZFKE1FRElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY2YvTWVkaWFBY2Nlc3NpYmlsaXR5U29mdExpbmsuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9NZWRpYUFjY2Vzc2liaWxpdHlTb2Z0TGluay5o CShyZXZpc2lvbiAyMTE4MDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9NZWRpYUFj Y2Vzc2liaWxpdHlTb2Z0TGluay5oCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3MCw4IEBAIFNP RlRfTElOS19DT05TVEFOVF9GT1JfSEVBREVSKFdlYkNvcmUsIE0KICNkZWZpbmUga01BWENhcHRp b25BcHBlYXJhbmNlU2V0dGluZ3NDaGFuZ2VkTm90aWZpY2F0aW9uIGdldF9NZWRpYUFjY2Vzc2li aWxpdHlfa01BWENhcHRpb25BcHBlYXJhbmNlU2V0dGluZ3NDaGFuZ2VkTm90aWZpY2F0aW9uKCkK IFNPRlRfTElOS19DT05TVEFOVF9NQVlfRkFJTF9GT1JfSEVBREVSKFdlYkNvcmUsIE1lZGlhQWNj ZXNzaWJpbGl0eSwga01BQXVkaWJsZU1lZGlhU2V0dGluZ3NDaGFuZ2VkTm90aWZpY2F0aW9uLCBD RlN0cmluZ1JlZikKICNkZWZpbmUga01BQXVkaWJsZU1lZGlhU2V0dGluZ3NDaGFuZ2VkTm90aWZp Y2F0aW9uIGdldF9NZWRpYUFjY2Vzc2liaWxpdHlfa01BQXVkaWJsZU1lZGlhU2V0dGluZ3NDaGFu Z2VkTm90aWZpY2F0aW9uKCkKK1NPRlRfTElOS19DT05TVEFOVF9NQVlfRkFJTF9GT1JfSEVBREVS KFdlYkNvcmUsIE1lZGlhQWNjZXNzaWJpbGl0eSwgTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0cm9r ZVdpZHRoLCBDRlN0cmluZ1JlZikKKyNkZWZpbmUgTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0cm9r ZVdpZHRoIGdldF9NZWRpYUFjY2Vzc2liaWxpdHlfTUFDYXB0aW9uRm9udEF0dHJpYnV0ZVN0cm9r ZVdpZHRoKCkKIAogI2VuZGlmIC8vIEhBVkUoTUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUksp CiAK