170495 2017-04-04 22:28:59 -0700 Add fallback fonts to video captions stylesheet. 2017-04-19 22:52:59 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue eric.carlson jonlee mmaxfield ryanhaddad oldest_to_newest 1294378 0 pvollan 2017-04-04 22:28:59 -0700 The kCTFontCascadeListAttribute key is used to obtain the cascade list for a font reference. 1294380 1 306253 pvollan 2017-04-04 22:34:50 -0700 Created attachment 306253 Patch 1294556 2 306253 eric.carlson 2017-04-05 10:42:18 -0700 Comment on attachment 306253 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306253&action=review This looks OK to me, but someone that understands more about fonts (Myles...) should review. > Source/WebCore/ChangeLog:10 > + I have not added a test, since CaptionUserPreferences::testingMode() returns true whe running tests, Nit: whe -> when 1295543 3 306253 mmaxfield 2017-04-07 16:45:48 -0700 Comment on attachment 306253 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306253&action=review > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:87 > +#define kCTFontCascadeListAttribute getkCTFontCascadeListAttribute() Why are we soft linking CoreText? It's available on all platforms which also have MACaptionAppearanceCopyFontDescriptorForStyle(). > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:437 > + auto cascadeList = adoptCF(CTFontDescriptorCopyAttribute(font.get(), kCTFontCascadeListAttribute)); Put the static_cast<CFArrayRef>() here rather than on line 440. > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:441 > + auto fontCascadeName = adoptCF(CTFontDescriptorCopyAttribute(fontCascade, kCTFontNameAttribute)); Ditto. 1295941 4 pvollan 2017-04-10 02:55:33 -0700 (In reply to Myles C. Maxfield from comment #3) > Comment on attachment 306253 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=306253&action=review > > > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:87 > > +#define kCTFontCascadeListAttribute getkCTFontCascadeListAttribute() > > Why are we soft linking CoreText? It's available on all platforms which also > have MACaptionAppearanceCopyFontDescriptorForStyle(). > I added this to fix the Windows build. > > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:437 > > + auto cascadeList = adoptCF(CTFontDescriptorCopyAttribute(font.get(), kCTFontCascadeListAttribute)); > > Put the static_cast<CFArrayRef>() here rather than on line 440. > > > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:441 > > + auto fontCascadeName = adoptCF(CTFontDescriptorCopyAttribute(fontCascade, kCTFontNameAttribute)); > > Ditto. Thanks for reviewing! I will update the patch before landing. 1295946 5 pvollan 2017-04-10 03:03:35 -0700 Committed <https://trac.webkit.org/changeset/215175/webkit>. 1296030 6 ryanhaddad 2017-04-10 10:17:25 -0700 (In reply to Per Arne Vollan from comment #5) > Committed <https://trac.webkit.org/changeset/215175/webkit>. This change introduced a flaky crash seen with LayoutTest media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html https://build.webkit.org/results/Apple%20El%20Capitan%20Release%20WK2%20(Tests)/r215180%20(579)/results.html 1296034 7 ryanhaddad 2017-04-10 10:26:24 -0700 (In reply to Ryan Haddad from comment #6) > (In reply to Per Arne Vollan from comment #5) > > Committed <https://trac.webkit.org/changeset/215175/webkit>. > > This change introduced a flaky crash seen with LayoutTest > media/modern-media-controls/tracks-support/tracks-support-auto-text-track. > html > > https://build.webkit.org/results/ > Apple%20El%20Capitan%20Release%20WK2%20(Tests)/r215180%20(579)/results.html Another example seen here with fast/performance/performance-now-crash-on-navigated-window.html. The crashlog is actually attributed to fast/media/window-oncuechange.html https://build.webkit.org/results/Apple%20El%20Capitan%20Debug%20WK2%20(Tests)/r215181%20(433)/results.html 1296035 8 ryanhaddad 2017-04-10 10:28:06 -0700 Reverted r215175 for reason: This change caused a flaky crash in existing media tests. Committed r215185: <http://trac.webkit.org/changeset/215185> 1296140 9 306253 mmaxfield 2017-04-10 13:58:31 -0700 Comment on attachment 306253 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306253&action=review >>> Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:87 >>> +#define kCTFontCascadeListAttribute getkCTFontCascadeListAttribute() >> >> Why are we soft linking CoreText? It's available on all platforms which also have MACaptionAppearanceCopyFontDescriptorForStyle(). > > I added this to fix the Windows build. You shouldn't need soft linking to do this. We use Core Text stuff elsewhere in our Windows port. You should remove this soft linking stuff (including the part you didn't write) and instead put the declarations in Source/WebCore/platform/spi/win/CoreTextSPIWin.h 1296343 10 306797 pvollan 2017-04-11 03:57:13 -0700 Created attachment 306797 Patch 1296381 11 306813 pvollan 2017-04-11 07:06:15 -0700 Created attachment 306813 Patch 1296382 12 pvollan 2017-04-11 07:07:34 -0700 (In reply to Myles C. Maxfield from comment #9) > Comment on attachment 306253 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=306253&action=review > > >>> Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:87 > >>> +#define kCTFontCascadeListAttribute getkCTFontCascadeListAttribute() > >> > >> Why are we soft linking CoreText? It's available on all platforms which also have MACaptionAppearanceCopyFontDescriptorForStyle(). > > > > I added this to fix the Windows build. > > You shouldn't need soft linking to do this. We use Core Text stuff elsewhere > in our Windows port. You should remove this soft linking stuff (including > the part you didn't write) and instead put the declarations in > Source/WebCore/platform/spi/win/CoreTextSPIWin.h Thanks! I have removed the soft linking, and added null pointer checks. 1296612 13 mmaxfield 2017-04-11 17:19:33 -0700 Did you figure out why the flakiness happened? 1296668 14 pvollan 2017-04-12 00:25:57 -0700 (In reply to Myles C. Maxfield from comment #13) > Did you figure out why the flakiness happened? Yes, the problem was that the call CTFontDescriptorCopyAttribute(font.get(), kCTFontCascadeListAttribute) returned null in some cases. I added null pointer checks in the latest patch. 1298302 15 306813 commit-queue 2017-04-18 09:15:35 -0700 Comment on attachment 306813 Patch Clearing flags on attachment: 306813 Committed r215461: <http://trac.webkit.org/changeset/215461> 1298303 16 commit-queue 2017-04-18 09:15:37 -0700 All reviewed patches have been landed. Closing bug. 1299026 17 pvollan 2017-04-19 22:52:59 -0700 rdar://problem/31725856 306253 2017-04-04 22:34:50 -0700 2017-04-11 03:57:08 -0700 Patch bug-170495-20170405073449.patch text/plain 2959 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNDkyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA0LTA0ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgZmFsbGJhY2sgZm9u dHMgdG8gdmlkZW8gY2FwdGlvbnMgc3R5bGVzaGVldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBrQ1RGb250Q2FzY2FkZUxpc3RBdHRyaWJ1dGUg a2V5IGlzIHVzZWQgdG8gb2J0YWluIHRoZSBjYXNjYWRlIGxpc3QgZm9yIGEgZm9udCByZWZlcmVu Y2UuCisKKyAgICAgICAgSSBoYXZlIG5vdCBhZGRlZCBhIHRlc3QsIHNpbmNlIENhcHRpb25Vc2Vy UHJlZmVyZW5jZXM6OnRlc3RpbmdNb2RlKCkgcmV0dXJucyB0cnVlIHdoZSBydW5uaW5nIHRlc3Rz LAorICAgICAgICBwcmV2ZW50aW5nIHRoaXMgY29kZSBwYXRoIGZyb20gYmVpbmcgZXhlY3V0ZWQu CisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uc0Rl ZmF1bHRGb250Q1NTKToKKwogMjAxNy0wNC0wNCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgQ2FudmFzIGlzIHRhaW50ZWQgd2hlbiBwYWludGluZyBhIHZpZGVv IHdpdGggTWVkaWFTdHJlYW1UcmFjawpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9u VXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHJldmlzaW9uIDIxNDg2NSkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC04Myw2ICs4Myw4IEBAIFNPRlRfTElOS19BVkZfRlJBTUVXT1JL KENvcmVUZXh0KQogU09GVF9MSU5LX0FWRl9GUkFNRVdPUktfSU1QT1JUKENvcmVUZXh0LCBDVEZv bnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZSwgIENGVHlwZVJlZiwgKENURm9udERlc2NyaXB0b3JS ZWYgZGVzY3JpcHRvciwgQ0ZTdHJpbmdSZWYgYXR0cmlidXRlKSwgKGRlc2NyaXB0b3IsIGF0dHJp YnV0ZSkpOwogU09GVF9MSU5LX0FWRl9QT0lOVEVSKENvcmVUZXh0LCBrQ1RGb250TmFtZUF0dHJp YnV0ZSwgQ0ZTdHJpbmdSZWYpCiAjZGVmaW5lIGtDVEZvbnROYW1lQXR0cmlidXRlIGdldGtDVEZv bnROYW1lQXR0cmlidXRlKCkKK1NPRlRfTElOS19BVkZfUE9JTlRFUihDb3JlVGV4dCwga0NURm9u dENhc2NhZGVMaXN0QXR0cmlidXRlLCBDRlN0cmluZ1JlZikKKyNkZWZpbmUga0NURm9udENhc2Nh ZGVMaXN0QXR0cmlidXRlIGdldGtDVEZvbnRDYXNjYWRlTGlzdEF0dHJpYnV0ZSgpCiAKICNkZWZp bmUgQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUgc29mdExpbmtfQ1RGb250RGVzY3JpcHRv ckNvcHlBdHRyaWJ1dGUKIApAQCAtNDI0LDEzICs0MjYsMjQgQEAgU3RyaW5nIENhcHRpb25Vc2Vy UHJlZmVyZW5jZXNNZWRpYUFGOjpjYQogICAgIFJldGFpblB0cjxDRlR5cGVSZWY+IG5hbWUgPSBh ZG9wdENGKENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlKGZvbnQuZ2V0KCksIGtDVEZvbnRO YW1lQXR0cmlidXRlKSk7CiAgICAgaWYgKCFuYW1lKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJp bmcoKTsKLSAgICAKKwogICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKICAgICAKICAgICBidWls ZGVyLmFwcGVuZChnZXRQcm9wZXJ0eU5hbWVTdHJpbmcoQ1NTUHJvcGVydHlGb250RmFtaWx5KSk7 CiAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCI6IFwiIik7CiAgICAgYnVpbGRlci5hcHBlbmQo c3RhdGljX2Nhc3Q8Q0ZTdHJpbmdSZWY+KG5hbWUuZ2V0KCkpKTsKICAgICBidWlsZGVyLmFwcGVu ZCgnIicpOworCisgICAgYXV0byBjYXNjYWRlTGlzdCA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRv ckNvcHlBdHRyaWJ1dGUoZm9udC5nZXQoKSwga0NURm9udENhc2NhZGVMaXN0QXR0cmlidXRlKSk7 CisKKyAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCBDRkFycmF5R2V0Q291bnQoc3RhdGljX2Nh c3Q8Q0ZBcnJheVJlZj4oY2FzY2FkZUxpc3QuZ2V0KCkpKTsgaSsrKSB7CisgICAgICAgIGF1dG8g Zm9udENhc2NhZGUgPSBzdGF0aWNfY2FzdDxDVEZvbnREZXNjcmlwdG9yUmVmPihDRkFycmF5R2V0 VmFsdWVBdEluZGV4KHN0YXRpY19jYXN0PENGQXJyYXlSZWY+KGNhc2NhZGVMaXN0LmdldCgpKSwg aSkpOworICAgICAgICBhdXRvIGZvbnRDYXNjYWRlTmFtZSA9IGFkb3B0Q0YoQ1RGb250RGVzY3Jp cHRvckNvcHlBdHRyaWJ1dGUoZm9udENhc2NhZGUsIGtDVEZvbnROYW1lQXR0cmlidXRlKSk7Cisg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIsIFwiIik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHN0 YXRpY19jYXN0PENGU3RyaW5nUmVmPihmb250Q2FzY2FkZU5hbWUuZ2V0KCkpKTsKKyAgICAgICAg YnVpbGRlci5hcHBlbmQoJyInKTsKKyAgICB9CisgICAgCiAgICAgaWYgKGJlaGF2aW9yID09IGtN QUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSkKICAgICAgICAgYnVpbGRlci5hcHBl bmRMaXRlcmFsKCIgIWltcG9ydGFudCIpOwogICAgIGJ1aWxkZXIuYXBwZW5kKCc7Jyk7Cg== 306797 2017-04-11 03:57:13 -0700 2017-04-11 07:06:07 -0700 Patch bug-170495-20170411035708.patch text/plain 4359 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA0LTExICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgZmFsbGJhY2sgZm9u dHMgdG8gdmlkZW8gY2FwdGlvbnMgc3R5bGVzaGVldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE15 bGVzIEMuIE1heGZpZWxkLgorCisgICAgICAgIFRoZSBrQ1RGb250Q2FzY2FkZUxpc3RBdHRyaWJ1 dGUga2V5IGlzIHVzZWQgdG8gb2J0YWluIHRoZSBjYXNjYWRlIGxpc3QgZm9yIGEgZm9udCByZWZl cmVuY2UuCisKKyAgICAgICAgSSBoYXZlIG5vdCBhZGRlZCBhIHRlc3QsIHNpbmNlIENhcHRpb25V c2VyUHJlZmVyZW5jZXM6OnRlc3RpbmdNb2RlKCkgcmV0dXJucyB0cnVlIHdoZW4gcnVubmluZyB0 ZXN0cywKKyAgICAgICAgcHJldmVudGluZyB0aGlzIGNvZGUgcGF0aCBmcm9tIGJlaW5nIGV4ZWN1 dGVkLgorCisgICAgICAgICogcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y2FwdGlv bnNEZWZhdWx0Rm9udENTUyk6CisgICAgICAgICogcGxhdGZvcm0vc3BpL3dpbi9Db3JlVGV4dFNQ SVdpbi5oOgorCiAyMDE3LTA0LTEwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2ZXJ0IHIyMTUyMTcKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwCShyZXZp c2lvbiAyMTUyMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5j ZXNNZWRpYUFGLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsOSBAQAogI2luY2x1ZGUg IkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmgiCiAKICNpbmNsdWRlICJBdWRpb1RyYWNr TGlzdC5oIgorI2lmIFBMQVRGT1JNKFdJTikKKyNpbmNsdWRlICJDb3JlVGV4dFNQSVdpbi5oIgor I2VuZGlmCiAjaW5jbHVkZSAiRmxvYXRDb252ZXJzaW9uLmgiCiAjaW5jbHVkZSAiSFRNTE1lZGlh RWxlbWVudC5oIgogI2luY2x1ZGUgIlVSTC5oIgpAQCAtNzgsMTQgKzgxLDYgQEAKICNkZWZpbmUg U09GVF9MSU5LX0FWRl9GUkFNRVdPUktfSU1QT1JUKExpYiwgRnVuLCBSZXR1cm5UeXBlLCBBcmd1 bWVudHMsIFNpZ25hdHVyZSkgU09GVF9MSU5LX0RMTF9JTVBPUlQoTGliLCBGdW4sIFJldHVyblR5 cGUsIF9fY2RlY2wsIEFyZ3VtZW50cywgU2lnbmF0dXJlKQogI2RlZmluZSBTT0ZUX0xJTktfQVZG X0ZSQU1FV09SS19JTVBPUlRfT1BUSU9OQUwoTGliLCBGdW4sIFJldHVyblR5cGUsIEFyZ3VtZW50 cykgU09GVF9MSU5LX0RMTF9JTVBPUlRfT1BUSU9OQUwoTGliLCBGdW4sIFJldHVyblR5cGUsIF9f Y2RlY2wsIEFyZ3VtZW50cykKIAotLy8gQ29yZVRleHQgb25seSBuZWVkcyB0byBiZSBzb2Z0LWxp bmtlZCBvbiBXaW5kb3dzLgotU09GVF9MSU5LX0FWRl9GUkFNRVdPUksoQ29yZVRleHQpCi1TT0ZU X0xJTktfQVZGX0ZSQU1FV09SS19JTVBPUlQoQ29yZVRleHQsIENURm9udERlc2NyaXB0b3JDb3B5 QXR0cmlidXRlLCAgQ0ZUeXBlUmVmLCAoQ1RGb250RGVzY3JpcHRvclJlZiBkZXNjcmlwdG9yLCBD RlN0cmluZ1JlZiBhdHRyaWJ1dGUpLCAoZGVzY3JpcHRvciwgYXR0cmlidXRlKSk7Ci1TT0ZUX0xJ TktfQVZGX1BPSU5URVIoQ29yZVRleHQsIGtDVEZvbnROYW1lQXR0cmlidXRlLCBDRlN0cmluZ1Jl ZikKLSNkZWZpbmUga0NURm9udE5hbWVBdHRyaWJ1dGUgZ2V0a0NURm9udE5hbWVBdHRyaWJ1dGUo KQotCi0jZGVmaW5lIENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlIHNvZnRMaW5rX0NURm9u dERlc2NyaXB0b3JDb3B5QXR0cmlidXRlCi0KIFNPRlRfTElOS19BVkZfRlJBTUVXT1JLKENvcmVN ZWRpYSkKIFNPRlRfTElOS19BVkZfRlJBTUVXT1JLX0lNUE9SVF9PUFRJT05BTChDb3JlTWVkaWEs IE1URW5hYmxlQ2FwdGlvbjIwMTVCZWhhdmlvciwgQm9vbGVhbiwgKCkpCiAKQEAgLTQyNCwxMyAr NDE5LDMwIEBAIFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y2EKICAgICBS ZXRhaW5QdHI8Q0ZUeXBlUmVmPiBuYW1lID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ29weUF0 dHJpYnV0ZShmb250LmdldCgpLCBrQ1RGb250TmFtZUF0dHJpYnV0ZSkpOwogICAgIGlmICghbmFt ZSkKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7Ci0gICAgCisKICAgICBTdHJpbmdCdWls ZGVyIGJ1aWxkZXI7CiAgICAgCiAgICAgYnVpbGRlci5hcHBlbmQoZ2V0UHJvcGVydHlOYW1lU3Ry aW5nKENTU1Byb3BlcnR5Rm9udEZhbWlseSkpOwogICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgi OiBcIiIpOwogICAgIGJ1aWxkZXIuYXBwZW5kKHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPihuYW1l LmdldCgpKSk7CiAgICAgYnVpbGRlci5hcHBlbmQoJyInKTsKKworICAgIGF1dG8gY2FzY2FkZUxp c3QgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGQXJyYXlSZWY+KENURm9udERlc2NyaXB0b3JDb3B5 QXR0cmlidXRlKGZvbnQuZ2V0KCksIGtDVEZvbnRDYXNjYWRlTGlzdEF0dHJpYnV0ZSkpKTsKKwor ICAgIGlmIChjYXNjYWRlTGlzdCkgeworICAgICAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCBD RkFycmF5R2V0Q291bnQoY2FzY2FkZUxpc3QuZ2V0KCkpOyBpKyspIHsKKyAgICAgICAgICAgIGF1 dG8gZm9udENhc2NhZGUgPSBzdGF0aWNfY2FzdDxDVEZvbnREZXNjcmlwdG9yUmVmPihDRkFycmF5 R2V0VmFsdWVBdEluZGV4KGNhc2NhZGVMaXN0LmdldCgpLCBpKSk7CisgICAgICAgICAgICBpZiAo IWZvbnRDYXNjYWRlKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgYXV0 byBmb250Q2FzY2FkZU5hbWUgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRl KGZvbnRDYXNjYWRlLCBrQ1RGb250TmFtZUF0dHJpYnV0ZSkpOworICAgICAgICAgICAgaWYgKCFm b250Q2FzY2FkZU5hbWUpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBi dWlsZGVyLmFwcGVuZCgiLCBcIiIpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoc3RhdGlj X2Nhc3Q8Q0ZTdHJpbmdSZWY+KGZvbnRDYXNjYWRlTmFtZS5nZXQoKSkpOworICAgICAgICAgICAg YnVpbGRlci5hcHBlbmQoJyInKTsKKyAgICAgICAgfQorICAgIH0KKyAgICAKICAgICBpZiAoYmVo YXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlvclVzZVZhbHVlKQogICAgICAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIiAhaW1wb3J0YW50Iik7CiAgICAgYnVpbGRlci5hcHBlbmQo JzsnKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS93aW4vQ29yZVRleHRTUElX aW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvd2luL0NvcmVU ZXh0U1BJV2luLmgJKHJldmlzaW9uIDIxNTIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3NwaS93aW4vQ29yZVRleHRTUElXaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsNyBA QCB0eXBlZGVmIFVJbnQzMiBGb3VyQ2hhckNvZGU7CiB0eXBlZGVmIEZvdXJDaGFyQ29kZSBDVEZv bnRUYWJsZVRhZzsKIAogQ1RfRVhQT1JUIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZvbnRBdHRyaWJ1 dGVOYW1lOworQ1RfRVhQT1JUIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZvbnRDYXNjYWRlTGlzdEF0 dHJpYnV0ZTsKIENUX0VYUE9SVCBjb25zdCBDRlN0cmluZ1JlZiBrQ1RGb3JlZ3JvdW5kQ29sb3JG cm9tQ29udGV4dEF0dHJpYnV0ZU5hbWU7CiBDVF9FWFBPUlQgY29uc3QgQ0ZTdHJpbmdSZWYga0NU U3Ryb2tlV2lkdGhBdHRyaWJ1dGVOYW1lOwogQ1RfRVhQT1JUIGNvbnN0IENGU3RyaW5nUmVmIGtD VFN0cm9rZUNvbG9yQXR0cmlidXRlTmFtZTsK 306813 2017-04-11 07:06:15 -0700 2017-04-18 09:15:35 -0700 Patch bug-170495-20170411070612.patch text/plain 4489 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTIyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA0LTExICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgZmFsbGJhY2sgZm9u dHMgdG8gdmlkZW8gY2FwdGlvbnMgc3R5bGVzaGVldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBrQ1RGb250Q2FzY2FkZUxpc3RBdHRyaWJ1dGUg a2V5IGlzIHVzZWQgdG8gb2J0YWluIHRoZSBjYXNjYWRlIGxpc3QgZm9yIGEgZm9udCByZWZlcmVu Y2UuCisKKyAgICAgICAgSSBoYXZlIG5vdCBhZGRlZCBhIHRlc3QsIHNpbmNlIENhcHRpb25Vc2Vy UHJlZmVyZW5jZXM6OnRlc3RpbmdNb2RlKCkgcmV0dXJucyB0cnVlIHdoZW4gcnVubmluZyB0ZXN0 cywKKyAgICAgICAgcHJldmVudGluZyB0aGlzIGNvZGUgcGF0aCBmcm9tIGJlaW5nIGV4ZWN1dGVk LgorCisgICAgICAgICogcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y2FwdGlvbnNE ZWZhdWx0Rm9udENTUyk6CisgICAgICAgICogcGxhdGZvcm0vc3BpL3dpbi9Db3JlVGV4dFNQSVdp bi5oOgorCiAyMDE3LTA0LTExICBNaWd1ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTihyMjE1MjExKTogW0dUS10gTG90cyBvZiBpbWFnZSByZWxhdGVk IHRlc3RzIGFyZSB0aW1pbmcgb3V0LCBjYXVzaW5nIHRoZSB0ZXN0IGJvdCB0byBleGl0IGVhcmx5 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFG LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVy ZW5jZXNNZWRpYUFGLmNwcAkocmV2aXNpb24gMjE1MjI3KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMy LDYgKzMyLDkgQEAKICNpbmNsdWRlICJDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5oIgog CiAjaW5jbHVkZSAiQXVkaW9UcmFja0xpc3QuaCIKKyNpZiBQTEFURk9STShXSU4pCisjaW5jbHVk ZSAiQ29yZVRleHRTUElXaW4uaCIKKyNlbmRpZgogI2luY2x1ZGUgIkZsb2F0Q29udmVyc2lvbi5o IgogI2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnQuaCIKICNpbmNsdWRlICJVUkwuaCIKQEAgLTc4 LDE0ICs4MSw2IEBACiAjZGVmaW5lIFNPRlRfTElOS19BVkZfRlJBTUVXT1JLX0lNUE9SVChMaWIs IEZ1biwgUmV0dXJuVHlwZSwgQXJndW1lbnRzLCBTaWduYXR1cmUpIFNPRlRfTElOS19ETExfSU1Q T1JUKExpYiwgRnVuLCBSZXR1cm5UeXBlLCBfX2NkZWNsLCBBcmd1bWVudHMsIFNpZ25hdHVyZSkK ICNkZWZpbmUgU09GVF9MSU5LX0FWRl9GUkFNRVdPUktfSU1QT1JUX09QVElPTkFMKExpYiwgRnVu LCBSZXR1cm5UeXBlLCBBcmd1bWVudHMpIFNPRlRfTElOS19ETExfSU1QT1JUX09QVElPTkFMKExp YiwgRnVuLCBSZXR1cm5UeXBlLCBfX2NkZWNsLCBBcmd1bWVudHMpCiAKLS8vIENvcmVUZXh0IG9u bHkgbmVlZHMgdG8gYmUgc29mdC1saW5rZWQgb24gV2luZG93cy4KLVNPRlRfTElOS19BVkZfRlJB TUVXT1JLKENvcmVUZXh0KQotU09GVF9MSU5LX0FWRl9GUkFNRVdPUktfSU1QT1JUKENvcmVUZXh0 LCBDVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZSwgIENGVHlwZVJlZiwgKENURm9udERlc2Ny aXB0b3JSZWYgZGVzY3JpcHRvciwgQ0ZTdHJpbmdSZWYgYXR0cmlidXRlKSwgKGRlc2NyaXB0b3Is IGF0dHJpYnV0ZSkpOwotU09GVF9MSU5LX0FWRl9QT0lOVEVSKENvcmVUZXh0LCBrQ1RGb250TmFt ZUF0dHJpYnV0ZSwgQ0ZTdHJpbmdSZWYpCi0jZGVmaW5lIGtDVEZvbnROYW1lQXR0cmlidXRlIGdl dGtDVEZvbnROYW1lQXR0cmlidXRlKCkKLQotI2RlZmluZSBDVEZvbnREZXNjcmlwdG9yQ29weUF0 dHJpYnV0ZSBzb2Z0TGlua19DVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZQotCiBTT0ZUX0xJ TktfQVZGX0ZSQU1FV09SSyhDb3JlTWVkaWEpCiBTT0ZUX0xJTktfQVZGX0ZSQU1FV09SS19JTVBP UlRfT1BUSU9OQUwoQ29yZU1lZGlhLCBNVEVuYWJsZUNhcHRpb24yMDE1QmVoYXZpb3IsIEJvb2xl YW4sICgpKQogCkBAIC00MjQsMTMgKzQxOSwzMCBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJl bmNlc01lZGlhQUY6OmNhCiAgICAgUmV0YWluUHRyPENGVHlwZVJlZj4gbmFtZSA9IGFkb3B0Q0Yo Q1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUoZm9udC5nZXQoKSwga0NURm9udE5hbWVBdHRy aWJ1dGUpKTsKICAgICBpZiAoIW5hbWUpCiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwot ICAgIAorCiAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwogICAgIAogICAgIGJ1aWxkZXIuYXBw ZW5kKGdldFByb3BlcnR5TmFtZVN0cmluZyhDU1NQcm9wZXJ0eUZvbnRGYW1pbHkpKTsKICAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIjogXCIiKTsKICAgICBidWlsZGVyLmFwcGVuZChzdGF0aWNf Y2FzdDxDRlN0cmluZ1JlZj4obmFtZS5nZXQoKSkpOwogICAgIGJ1aWxkZXIuYXBwZW5kKCciJyk7 CisKKyAgICBhdXRvIGNhc2NhZGVMaXN0ID0gYWRvcHRDRihzdGF0aWNfY2FzdDxDRkFycmF5UmVm PihDVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZShmb250LmdldCgpLCBrQ1RGb250Q2FzY2Fk ZUxpc3RBdHRyaWJ1dGUpKSk7CisKKyAgICBpZiAoY2FzY2FkZUxpc3QpIHsKKyAgICAgICAgZm9y IChDRkluZGV4IGkgPSAwOyBpIDwgQ0ZBcnJheUdldENvdW50KGNhc2NhZGVMaXN0LmdldCgpKTsg aSsrKSB7CisgICAgICAgICAgICBhdXRvIGZvbnRDYXNjYWRlID0gc3RhdGljX2Nhc3Q8Q1RGb250 RGVzY3JpcHRvclJlZj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChjYXNjYWRlTGlzdC5nZXQoKSwg aSkpOworICAgICAgICAgICAgaWYgKCFmb250Q2FzY2FkZSkKKyAgICAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgICAgIGF1dG8gZm9udENhc2NhZGVOYW1lID0gYWRvcHRDRihDVEZvbnRE ZXNjcmlwdG9yQ29weUF0dHJpYnV0ZShmb250Q2FzY2FkZSwga0NURm9udE5hbWVBdHRyaWJ1dGUp KTsKKyAgICAgICAgICAgIGlmICghZm9udENhc2NhZGVOYW1lKQorICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIiwgXCIiKTsKKyAgICAgICAgICAg IGJ1aWxkZXIuYXBwZW5kKHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPihmb250Q2FzY2FkZU5hbWUu Z2V0KCkpKTsKKyAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCciJyk7CisgICAgICAgIH0KKyAg ICB9CisgICAgCiAgICAgaWYgKGJlaGF2aW9yID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZp b3JVc2VWYWx1ZSkKICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIgIWltcG9ydGFudCIp OwogICAgIGJ1aWxkZXIuYXBwZW5kKCc7Jyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9zcGkvd2luL0NvcmVUZXh0U1BJV2luLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3BpL3dpbi9Db3JlVGV4dFNQSVdpbi5oCShyZXZpc2lvbiAyMTUyMjcpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvd2luL0NvcmVUZXh0U1BJV2luLmgJKHdvcmtpbmcg Y29weSkKQEAgLTM3LDYgKzM3LDggQEAgdHlwZWRlZiBVSW50MzIgRm91ckNoYXJDb2RlOwogdHlw ZWRlZiBGb3VyQ2hhckNvZGUgQ1RGb250VGFibGVUYWc7CiAKIENUX0VYUE9SVCBjb25zdCBDRlN0 cmluZ1JlZiBrQ1RGb250QXR0cmlidXRlTmFtZTsKK0NUX0VYUE9SVCBjb25zdCBDRlN0cmluZ1Jl ZiBrQ1RGb250Q2FzY2FkZUxpc3RBdHRyaWJ1dGU7CitDVF9FWFBPUlQgY29uc3QgQ0ZTdHJpbmdS ZWYga0NURm9udE5hbWVBdHRyaWJ1dGU7CiBDVF9FWFBPUlQgY29uc3QgQ0ZTdHJpbmdSZWYga0NU Rm9yZWdyb3VuZENvbG9yRnJvbUNvbnRleHRBdHRyaWJ1dGVOYW1lOwogQ1RfRVhQT1JUIGNvbnN0 IENGU3RyaW5nUmVmIGtDVFN0cm9rZVdpZHRoQXR0cmlidXRlTmFtZTsKIENUX0VYUE9SVCBjb25z dCBDRlN0cmluZ1JlZiBrQ1RTdHJva2VDb2xvckF0dHJpYnV0ZU5hbWU7Cg==