199283 2019-06-27 12:48:41 -0700 Prewarm font cache with more fonts 2019-07-18 17:07:58 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 pvollan pvollan bfulgham cdumez commit-queue dean_johnson ggaren koivisto mmaxfield sam webkit-bug-importer oldest_to_newest 1548583 0 pvollan 2019-06-27 12:48:41 -0700 This is a confirmed improvement in page load time. 1548585 1 373046 pvollan 2019-06-27 12:52:38 -0700 Created attachment 373046 Patch 1548731 2 373046 koivisto 2019-06-27 23:09:04 -0700 Comment on attachment 373046 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373046&action=review > Source/WebCore/page/ProcessWarming.cpp:82 > + static NeverDestroyed<Vector<String>> families = std::initializer_list<String> { > + "-apple-system"_s, > + "-webkit-standard"_s, > + "sans-serif"_s, > + "system-ui"_s, > + "Arial"_s, > + "Avenir"_s, > + "Helvetica"_s, > + "Helvetica Neue"_s, > + "Hiragino Sans GB"_s, > + "Lucida Grande"_s, > + "PingFang"_s, > + "SF Pro Text"_s, > + "SF Pro Icons"_s, > + "STHeiti"_s, > + "Segoe UI"_s, > + "Times"_s, > + "Times New Roman"_s > + }; There is substantial power and memory cost in warming fonts. The code here runs for every web process and should only warm things that are very likely needed. I don't think this list fits the criteria. With language specific fonts, it looks more like a benchmark hack. I'm not opposed to globally prewarming more fonts but each entry needs to be justified based on real world data, not artificial benchmark scenarios. 1548817 3 373118 pvollan 2019-06-28 08:35:07 -0700 Created attachment 373118 Patch 1548818 4 pvollan 2019-06-28 08:36:46 -0700 (In reply to Antti Koivisto from comment #2) > Comment on attachment 373046 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373046&action=review > > > Source/WebCore/page/ProcessWarming.cpp:82 > > + static NeverDestroyed<Vector<String>> families = std::initializer_list<String> { > > + "-apple-system"_s, > > + "-webkit-standard"_s, > > + "sans-serif"_s, > > + "system-ui"_s, > > + "Arial"_s, > > + "Avenir"_s, > > + "Helvetica"_s, > > + "Helvetica Neue"_s, > > + "Hiragino Sans GB"_s, > > + "Lucida Grande"_s, > > + "PingFang"_s, > > + "SF Pro Text"_s, > > + "SF Pro Icons"_s, > > + "STHeiti"_s, > > + "Segoe UI"_s, > > + "Times"_s, > > + "Times New Roman"_s > > + }; > > There is substantial power and memory cost in warming fonts. The code here > runs for every web process and should only warm things that are very likely > needed. I don't think this list fits the criteria. With language specific > fonts, it looks more like a benchmark hack. > > I'm not opposed to globally prewarming more fonts but each entry needs to be > justified based on real world data, not artificial benchmark scenarios. Yes, that makes sense. I have uploaded a new patch with a font list consisting of some of the fonts used by the 10 most popular web sites on Alexa top sites. Thanks for reviewing! 1548822 5 koivisto 2019-06-28 08:52:32 -0700 Is there a radar for this? 1548823 6 webkit-bug-importer 2019-06-28 08:54:06 -0700 <rdar://problem/52333302> 1548824 7 pvollan 2019-06-28 08:55:24 -0700 (In reply to Antti Koivisto from comment #5) > Is there a radar for this? I just had one created by the importer. 1549027 8 373118 sam 2019-06-29 09:51:41 -0700 Comment on attachment 373118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373118&action=review > Source/WebCore/page/ProcessWarming.cpp:71 > + "-apple-system"_s, > + "sans-serif"_s, > + "system-ui"_s, > + "Arial"_s, > + "Helvetica"_s, > + "Helvetica Neue"_s, > + "Segoe UI"_s, It seems wrong to have a very platform specific list like this in non-platform code. This list should probably be moved to WebCore's FontCache so that platforms can override it. 1552933 9 374141 pvollan 2019-07-15 13:18:46 -0700 Created attachment 374141 Patch 1552986 10 374141 mmaxfield 2019-07-15 14:54:51 -0700 Comment on attachment 374141 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374141&action=review > Source/WebCore/page/ProcessWarming.cpp:-77 > - // Cache system UI font fallbacks. Almost every web process needs these. > - // Initializing one size is sufficient to warm CoreText caches. Really? Most web content doesn't use system-ui. Where do the uses come from? > Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp:1644 > + prewarmInfo.fontNamesRequiringSystemFallback = fontFamiliesForPrewarming(); I don't think this is right. We only take the "system fallback" path for the system font. Arial, Helvetica, Helvetica Neue, Times, and Times New Roman would never hit that path. OTOH, it could be that running these CoreText functions ahead-of-time is still helpful regarding the codepath those fonts ::do:: go through. Do we still get the benefit if we move this list to the "seenFamilies" member? "SF Pro Text" shouldn't match any fonts. Are we sure this one is really valuable? 1553256 11 374228 pvollan 2019-07-16 11:47:21 -0700 Created attachment 374228 Patch 1553306 12 374237 pvollan 2019-07-16 14:00:26 -0700 Created attachment 374237 Patch 1553309 13 374238 pvollan 2019-07-16 14:04:19 -0700 Created attachment 374238 Patch 1553335 14 374238 commit-queue 2019-07-16 15:18:44 -0700 Comment on attachment 374238 Patch Clearing flags on attachment: 374238 Committed r247498: <https://trac.webkit.org/changeset/247498> 1554075 15 374427 pvollan 2019-07-18 16:37:37 -0700 Created attachment 374427 Patch 1554086 16 374427 commit-queue 2019-07-18 17:07:58 -0700 Comment on attachment 374427 Patch Clearing flags on attachment: 374427 Committed r247626: <https://trac.webkit.org/changeset/247626> 373046 2019-06-27 12:52:38 -0700 2019-06-28 08:35:05 -0700 Patch bug-199283-20190627125237.patch text/plain 2681 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0Njg5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTI3ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVc2UgdGhlIGV4aXN0aW5nIHByZXdhcm0gbWV0aG9kIGluIEZvbnRDYWNoZSB0 byBwcmV3YXJtIHRoZSBjYWNoZSB3aXRoIGEgc2V0IG9mIGZvbnQgZmFtaWx5IG5hbWVzLgorICAg ICAgICBUaGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICAqIHBhZ2UvUHJvY2Vzc1dhcm1pbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9udEZh bWlsaWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlByb2Nlc3NXYXJtaW5nOjpwcmV3YXJtR2xvYmFs bHkpOgorCiAyMDE5LTA2LTI3ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAg ICAgICBVcHN0cmVhbSB1c2Ugb2YgTUFDQ0FUQUxZU1QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bh Z2UvUHJvY2Vzc1dhcm1pbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv UHJvY2Vzc1dhcm1pbmcuY3BwCShyZXZpc2lvbiAyNDY4MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL1Byb2Nlc3NXYXJtaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsMzEgQEAg dm9pZCBQcm9jZXNzV2FybWluZzo6aW5pdGlhbGl6ZU5hbWVzKCkKICAgICBYTUxOYW1lczo6aW5p dCgpOwogICAgIFdlYktpdEZvbnRGYW1pbHlOYW1lczo6aW5pdCgpOwogfQotICAgIAorCitzdGF0 aWMgVmVjdG9yPFN0cmluZz4mIGZvbnRGYW1pbGllcygpCit7CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPFZlY3RvcjxTdHJpbmc+PiBmYW1pbGllcyA9IHN0ZDo6aW5pdGlhbGl6ZXJfbGlzdDxT dHJpbmc+IHsKKyAgICAgICAgIi1hcHBsZS1zeXN0ZW0iX3MsCisgICAgICAgICItd2Via2l0LXN0 YW5kYXJkIl9zLAorICAgICAgICAic2Fucy1zZXJpZiJfcywKKyAgICAgICAgInN5c3RlbS11aSJf cywKKyAgICAgICAgIkFyaWFsIl9zLAorICAgICAgICAiQXZlbmlyIl9zLAorICAgICAgICAiSGVs dmV0aWNhIl9zLAorICAgICAgICAiSGVsdmV0aWNhIE5ldWUiX3MsCisgICAgICAgICJIaXJhZ2lu byBTYW5zIEdCIl9zLAorICAgICAgICAiTHVjaWRhIEdyYW5kZSJfcywKKyAgICAgICAgIlBpbmdG YW5nIl9zLAorICAgICAgICAiU0YgUHJvIFRleHQiX3MsCisgICAgICAgICJTRiBQcm8gSWNvbnMi X3MsCisgICAgICAgICJTVEhlaXRpIl9zLAorICAgICAgICAiU2Vnb2UgVUkiX3MsCisgICAgICAg ICJUaW1lcyJfcywKKyAgICAgICAgIlRpbWVzIE5ldyBSb21hbiJfcworICAgIH07CisgICAgcmV0 dXJuIGZhbWlsaWVzOworfQorCiB2b2lkIFByb2Nlc3NXYXJtaW5nOjpwcmV3YXJtR2xvYmFsbHko KQogewogICAgIGluaXRpYWxpemVOYW1lcygpOwpAQCAtNzIsMTQgKzk2LDExIEBAIHZvaWQgUHJv Y2Vzc1dhcm1pbmc6OnByZXdhcm1HbG9iYWxseSgpCiAgICAgLy8gUHJld2FybXMgSlMgVk0uCiAg ICAgY29tbW9uVk0oKTsKIAotI2lmIFVTRV9QTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVAot ICAgIC8vIENhY2hlIHN5c3RlbSBVSSBmb250IGZhbGxiYWNrcy4gQWxtb3N0IGV2ZXJ5IHdlYiBw cm9jZXNzIG5lZWRzIHRoZXNlLgotICAgIC8vIEluaXRpYWxpemluZyBvbmUgc2l6ZSBpcyBzdWZm aWNpZW50IHRvIHdhcm0gQ29yZVRleHQgY2FjaGVzLgotICAgIEZvbnRDYXNjYWRlRGVzY3JpcHRp b24gc3lzdGVtRm9udERlc2NyaXB0aW9uOwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRP bmVGYW1pbHkoInN5c3RlbS11aSIpOwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRDb21w dXRlZFNpemUoMTEpOwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5lZmZlY3RpdmVGYW1pbHlD b3VudCgpOwotI2VuZGlmCisgICAgLy8gUHJld2FybSBmb250IGNhY2hlCisgICAgRm9udENhY2hl OjpQcmV3YXJtSW5mb3JtYXRpb24gcHJld2FybUluZm87CisgICAgcHJld2FybUluZm8uc2VlbkZh bWlsaWVzID0gZm9udEZhbWlsaWVzKCk7CisgICAgcHJld2FybUluZm8uZm9udE5hbWVzUmVxdWly aW5nU3lzdGVtRmFsbGJhY2sgPSBmb250RmFtaWxpZXMoKTsKKyAgICBGb250Q2FjaGU6OnNpbmds ZXRvbigpLnByZXdhcm0ocHJld2FybUluZm8pOwogCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1C RVJfREVURUNUSU9OKQogICAgIFRlbGVwaG9uZU51bWJlckRldGVjdG9yOjppc1N1cHBvcnRlZCgp Owo= 373118 2019-06-28 08:35:07 -0700 2019-07-15 13:18:45 -0700 Patch bug-199283-20190628083506.patch text/plain 2569 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0Njg5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA2LTI3ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVc2UgdGhlIGV4aXN0aW5nIHByZXdhcm0gbWV0aG9kIGluIEZvbnRDYWNoZSB0 byBwcmV3YXJtIHRoZSBjYWNoZSB3aXRoIGEgc2V0IG9mIGZvbnQgZmFtaWx5IG5hbWVzLgorICAg ICAgICBUaGUgZm9udCBsaXN0IGNvbnNpc3RzIG9mIHNvbWUgb2YgdGhlIGZvbnRzIHVzZWQgYnkg dGhlIDEwIG1vc3QgcG9wdWxhciBzaXRlcyBvbiBBbGV4YSB0b3Agc2l0ZXMuCisgICAgICAgIFRo aXMgaXMgYSBjb25maXJtZWQgaW1wcm92ZW1lbnQgaW4gcGFnZSBsb2FkIHRpbWUuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog cGFnZS9Qcm9jZXNzV2FybWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmb250RmFtaWxpZXMp OgorICAgICAgICAoV2ViQ29yZTo6UHJvY2Vzc1dhcm1pbmc6OnByZXdhcm1HbG9iYWxseSk6CisK IDIwMTktMDYtMjcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVw c3RyZWFtIHVzZSBvZiBNQUNDQVRBTFlTVApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Qcm9j ZXNzV2FybWluZy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Qcm9jZXNz V2FybWluZy5jcHAJKHJldmlzaW9uIDI0NjgwOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUHJv Y2Vzc1dhcm1pbmcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCwyMSBAQCB2b2lkIFBy b2Nlc3NXYXJtaW5nOjppbml0aWFsaXplTmFtZXMoKQogICAgIFhNTE5hbWVzOjppbml0KCk7CiAg ICAgV2ViS2l0Rm9udEZhbWlseU5hbWVzOjppbml0KCk7CiB9Ci0gICAgCisKK3N0YXRpYyBWZWN0 b3I8U3RyaW5nPiYgZm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpCit7CisgICAgc3RhdGljIE5l dmVyRGVzdHJveWVkPFZlY3RvcjxTdHJpbmc+PiBmYW1pbGllcyA9IHN0ZDo6aW5pdGlhbGl6ZXJf bGlzdDxTdHJpbmc+IHsKKyAgICAgICAgIi1hcHBsZS1zeXN0ZW0iX3MsCisgICAgICAgICJzYW5z LXNlcmlmIl9zLAorICAgICAgICAic3lzdGVtLXVpIl9zLAorICAgICAgICAiQXJpYWwiX3MsCisg ICAgICAgICJIZWx2ZXRpY2EiX3MsCisgICAgICAgICJIZWx2ZXRpY2EgTmV1ZSJfcywKKyAgICAg ICAgIlNlZ29lIFVJIl9zLAorICAgIH07CisgICAgcmV0dXJuIGZhbWlsaWVzOworfQorCiB2b2lk IFByb2Nlc3NXYXJtaW5nOjpwcmV3YXJtR2xvYmFsbHkoKQogewogICAgIGluaXRpYWxpemVOYW1l cygpOwpAQCAtNzIsMTQgKzg2LDExIEBAIHZvaWQgUHJvY2Vzc1dhcm1pbmc6OnByZXdhcm1HbG9i YWxseSgpCiAgICAgLy8gUHJld2FybXMgSlMgVk0uCiAgICAgY29tbW9uVk0oKTsKIAotI2lmIFVT RV9QTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVAotICAgIC8vIENhY2hlIHN5c3RlbSBVSSBm b250IGZhbGxiYWNrcy4gQWxtb3N0IGV2ZXJ5IHdlYiBwcm9jZXNzIG5lZWRzIHRoZXNlLgotICAg IC8vIEluaXRpYWxpemluZyBvbmUgc2l6ZSBpcyBzdWZmaWNpZW50IHRvIHdhcm0gQ29yZVRleHQg Y2FjaGVzLgotICAgIEZvbnRDYXNjYWRlRGVzY3JpcHRpb24gc3lzdGVtRm9udERlc2NyaXB0aW9u OwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRPbmVGYW1pbHkoInN5c3RlbS11aSIpOwot ICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoMTEpOwotICAgIHN5c3Rl bUZvbnREZXNjcmlwdGlvbi5lZmZlY3RpdmVGYW1pbHlDb3VudCgpOwotI2VuZGlmCisgICAgLy8g UHJld2FybSBmb250IGNhY2hlCisgICAgRm9udENhY2hlOjpQcmV3YXJtSW5mb3JtYXRpb24gcHJl d2FybUluZm87CisgICAgcHJld2FybUluZm8uc2VlbkZhbWlsaWVzID0gZm9udEZhbWlsaWVzRm9y UHJld2FybWluZygpOworICAgIHByZXdhcm1JbmZvLmZvbnROYW1lc1JlcXVpcmluZ1N5c3RlbUZh bGxiYWNrID0gZm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpOworICAgIEZvbnRDYWNoZTo6c2lu Z2xldG9uKCkucHJld2FybShwcmV3YXJtSW5mbyk7CiAKICNpZiBFTkFCTEUoVEVMRVBIT05FX05V TUJFUl9ERVRFQ1RJT04pCiAgICAgVGVsZXBob25lTnVtYmVyRGV0ZWN0b3I6OmlzU3VwcG9ydGVk KCk7Cg== 374141 2019-07-15 13:18:46 -0700 2019-07-15 14:54:51 -0700 Patch bug-199283-20190715131845.patch text/plain 4614 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzQ0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA3LTE1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVc2UgdGhlIGV4aXN0aW5nIHByZXdhcm0gbWV0aG9kIGluIEZvbnRDYWNoZSB0 byBwcmV3YXJtIHRoZSBjYWNoZSB3aXRoIGEgc2V0IG9mIGZvbnQgZmFtaWx5IG5hbWVzLgorICAg ICAgICBUaGUgZm9udCBsaXN0IGNvbnNpc3RzIG9mIHNvbWUgb2YgdGhlIGZvbnRzIHVzZWQgYnkg dGhlIDEwIG1vc3QgcG9wdWxhciBzaXRlcyBvbiBBbGV4YSB0b3Agc2l0ZXMuCisgICAgICAgIFRo aXMgaXMgYSBjb25maXJtZWQgaW1wcm92ZW1lbnQgaW4gcGFnZSBsb2FkIHRpbWUuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog cGFnZS9Qcm9jZXNzV2FybWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9jZXNzV2FybWlu Zzo6cHJld2FybUdsb2JhbGx5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2Fj aGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmZvbnRGYW1pbGllc0ZvclByZXdhcm1pbmcpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENh Y2hlOjpwcmV3YXJtR2xvYmFsbHkpOgorCiAyMDE5LTA3LTE1ICBZdXN1a2UgU3V6dWtpICA8eXN1 enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gSW1wcm92ZSB3YXNtIHdwdCB0ZXN0IHJl c3VsdHMgYnkgZml4aW5nIG1pc2NlbGxhbmVvdXMgaXNzdWVzCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL1Byb2Nlc3NXYXJtaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL1Byb2Nlc3NXYXJtaW5nLmNwcAkocmV2aXNpb24gMjQ3MzgwKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9Qcm9jZXNzV2FybWluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4LDcg QEAgdm9pZCBQcm9jZXNzV2FybWluZzo6aW5pdGlhbGl6ZU5hbWVzKCkKICAgICBYTUxOYW1lczo6 aW5pdCgpOwogICAgIFdlYktpdEZvbnRGYW1pbHlOYW1lczo6aW5pdCgpOwogfQotICAgIAorCiB2 b2lkIFByb2Nlc3NXYXJtaW5nOjpwcmV3YXJtR2xvYmFsbHkoKQogewogICAgIGluaXRpYWxpemVO YW1lcygpOwpAQCAtNzIsMTQgKzcyLDggQEAgdm9pZCBQcm9jZXNzV2FybWluZzo6cHJld2FybUds b2JhbGx5KCkKICAgICAvLyBQcmV3YXJtcyBKUyBWTS4KICAgICBjb21tb25WTSgpOwogCi0jaWYg VVNFX1BMQVRGT1JNX1NZU1RFTV9GQUxMQkFDS19MSVNUCi0gICAgLy8gQ2FjaGUgc3lzdGVtIFVJ IGZvbnQgZmFsbGJhY2tzLiBBbG1vc3QgZXZlcnkgd2ViIHByb2Nlc3MgbmVlZHMgdGhlc2UuCi0g ICAgLy8gSW5pdGlhbGl6aW5nIG9uZSBzaXplIGlzIHN1ZmZpY2llbnQgdG8gd2FybSBDb3JlVGV4 dCBjYWNoZXMuCi0gICAgRm9udENhc2NhZGVEZXNjcmlwdGlvbiBzeXN0ZW1Gb250RGVzY3JpcHRp b247Ci0gICAgc3lzdGVtRm9udERlc2NyaXB0aW9uLnNldE9uZUZhbWlseSgic3lzdGVtLXVpIik7 Ci0gICAgc3lzdGVtRm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZSgxMSk7Ci0gICAgc3lz dGVtRm9udERlc2NyaXB0aW9uLmVmZmVjdGl2ZUZhbWlseUNvdW50KCk7Ci0jZW5kaWYKKyAgICAv LyBQcmV3YXJtIGZvbnQgY2FjaGUKKyAgICBGb250Q2FjaGU6OnNpbmdsZXRvbigpLnByZXdhcm1H bG9iYWxseSgpOwogCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQogICAg IFRlbGVwaG9uZU51bWJlckRldGVjdG9yOjppc1N1cHBvcnRlZCgpOwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCShyZXZpc2lvbiAyNDcz ODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00ODgsNiArNDg4LDEwIEBAIEZvbnRDYWNoZTo6UHJld2FybUluZm9y bWF0aW9uIEZvbnRDYWNoZToKICAgICByZXR1cm4geyB9OwogfQogCit2b2lkIEZvbnRDYWNoZTo6 cHJld2FybUdsb2JhbGx5KCkKK3sKK30KKwogdm9pZCBGb250Q2FjaGU6OnByZXdhcm0oY29uc3Qg UHJld2FybUluZm9ybWF0aW9uJikKIHsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYWNoZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCShyZXZpc2lvbiAyNDczODApCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjUy LDYgKzI1Miw3IEBAIHB1YmxpYzoKICAgICB9OwogICAgIFByZXdhcm1JbmZvcm1hdGlvbiBjb2xs ZWN0UHJld2FybUluZm9ybWF0aW9uKCkgY29uc3Q7CiAgICAgdm9pZCBwcmV3YXJtKGNvbnN0IFBy ZXdhcm1JbmZvcm1hdGlvbiYpOworICAgIHZvaWQgcHJld2FybUdsb2JhbGx5KCk7CiAKIHByaXZh dGU6CiAgICAgRm9udENhY2hlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCShyZXZp c2lvbiAyNDczODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G b250Q2FjaGVDb3JlVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKIAog I2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KKyNp bmNsdWRlIDx3dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL05ldmVy RGVzdHJveWVkLmg+CiAKICNkZWZpbmUgSEFTX0NPUkVfVEVYVF9XSURUSF9BVFRSSUJVVEUgKChQ TEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMzAw KSB8fCAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVR VUlSRUQgPj0gMTEwMDAwKSkKQEAgLTE2MjAsNCArMTYyMSwyOCBAQCB2b2lkIEZvbnRDYWNoZTo6 cHJld2FybShjb25zdCBQcmV3YXJtSW5mCiAgICAgfSk7CiB9CiAKK3N0YXRpYyBWZWN0b3I8U3Ry aW5nPiYgZm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpCit7CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPFZlY3RvcjxTdHJpbmc+PiBmYW1pbGllcyA9IHN0ZDo6aW5pdGlhbGl6ZXJfbGlzdDxT dHJpbmc+IHsKKyAgICAgICAgIkFyaWFsIl9zLAorICAgICAgICAiSGVsdmV0aWNhIl9zLAorICAg ICAgICAiSGVsdmV0aWNhIE5ldWUiX3MsCisgICAgICAgICJTRiBQcm8gVGV4dCJfcywKKyAgICAg ICAgIlRpbWVzIl9zLAorICAgICAgICAiVGltZXMgTmV3IFJvbWFuIl9zLAorICAgIH07CisgICAg cmV0dXJuIGZhbWlsaWVzOworfQorCit2b2lkIEZvbnRDYWNoZTo6cHJld2FybUdsb2JhbGx5KCkK K3sKKyAgICBpZiAoTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzaW5nbGV0b24oKS5pc1VuZGVyTWVt b3J5UHJlc3N1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRm9udENhY2hlOjpQcmV3YXJt SW5mb3JtYXRpb24gcHJld2FybUluZm87CisgICAgcHJld2FybUluZm8uc2VlbkZhbWlsaWVzID0g Zm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpOworICAgIHByZXdhcm1JbmZvLmZvbnROYW1lc1Jl cXVpcmluZ1N5c3RlbUZhbGxiYWNrID0gZm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpOworICAg IEZvbnRDYWNoZTo6c2luZ2xldG9uKCkucHJld2FybShwcmV3YXJtSW5mbyk7Cit9CisKIH0K 374228 2019-07-16 11:47:21 -0700 2019-07-16 14:00:53 -0700 Patch bug-199283-20190716114720.patch text/plain 4536 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzQ0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA3LTE1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBNeWxlcyBDLiBNYXhmaWVs ZC4KKworICAgICAgICBVc2UgdGhlIGV4aXN0aW5nIHByZXdhcm0gbWV0aG9kIGluIEZvbnRDYWNo ZSB0byBwcmV3YXJtIHRoZSBjYWNoZSB3aXRoIGEgc2V0IG9mIGZvbnQgZmFtaWx5IG5hbWVzLgor ICAgICAgICBUaGUgZm9udCBsaXN0IGNvbnNpc3RzIG9mIHNvbWUgb2YgdGhlIGZvbnRzIHVzZWQg YnkgdGhlIDEwIG1vc3QgcG9wdWxhciBzaXRlcyBvbiBBbGV4YSB0b3Agc2l0ZXMuCisgICAgICAg IFRoaXMgaXMgYSBjb25maXJtZWQgaW1wcm92ZW1lbnQgaW4gcGFnZSBsb2FkIHRpbWUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogcGFnZS9Qcm9jZXNzV2FybWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9jZXNzV2Fy bWluZzo6cHJld2FybUdsb2JhbGx5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmZvbnRGYW1pbGllc0ZvclByZXdhcm1pbmcpOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dENhY2hlOjpwcmV3YXJtR2xvYmFsbHkpOgorCiAyMDE5LTA3LTE1ICBZdXN1a2UgU3V6dWtpICA8 eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gSW1wcm92ZSB3YXNtIHdwdCB0ZXN0 IHJlc3VsdHMgYnkgZml4aW5nIG1pc2NlbGxhbmVvdXMgaXNzdWVzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wYWdlL1Byb2Nlc3NXYXJtaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL1Byb2Nlc3NXYXJtaW5nLmNwcAkocmV2aXNpb24gMjQ3MzgwKQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9Qcm9jZXNzV2FybWluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4 LDcgQEAgdm9pZCBQcm9jZXNzV2FybWluZzo6aW5pdGlhbGl6ZU5hbWVzKCkKICAgICBYTUxOYW1l czo6aW5pdCgpOwogICAgIFdlYktpdEZvbnRGYW1pbHlOYW1lczo6aW5pdCgpOwogfQotICAgIAor CiB2b2lkIFByb2Nlc3NXYXJtaW5nOjpwcmV3YXJtR2xvYmFsbHkoKQogewogICAgIGluaXRpYWxp emVOYW1lcygpOwpAQCAtNzIsMTQgKzcyLDggQEAgdm9pZCBQcm9jZXNzV2FybWluZzo6cHJld2Fy bUdsb2JhbGx5KCkKICAgICAvLyBQcmV3YXJtcyBKUyBWTS4KICAgICBjb21tb25WTSgpOwogCi0j aWYgVVNFX1BMQVRGT1JNX1NZU1RFTV9GQUxMQkFDS19MSVNUCi0gICAgLy8gQ2FjaGUgc3lzdGVt IFVJIGZvbnQgZmFsbGJhY2tzLiBBbG1vc3QgZXZlcnkgd2ViIHByb2Nlc3MgbmVlZHMgdGhlc2Uu Ci0gICAgLy8gSW5pdGlhbGl6aW5nIG9uZSBzaXplIGlzIHN1ZmZpY2llbnQgdG8gd2FybSBDb3Jl VGV4dCBjYWNoZXMuCi0gICAgRm9udENhc2NhZGVEZXNjcmlwdGlvbiBzeXN0ZW1Gb250RGVzY3Jp cHRpb247Ci0gICAgc3lzdGVtRm9udERlc2NyaXB0aW9uLnNldE9uZUZhbWlseSgic3lzdGVtLXVp Iik7Ci0gICAgc3lzdGVtRm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZSgxMSk7Ci0gICAg c3lzdGVtRm9udERlc2NyaXB0aW9uLmVmZmVjdGl2ZUZhbWlseUNvdW50KCk7Ci0jZW5kaWYKKyAg ICAvLyBQcmV3YXJtIGZvbnQgY2FjaGUKKyAgICBGb250Q2FjaGU6OnNpbmdsZXRvbigpLnByZXdh cm1HbG9iYWxseSgpOwogCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQog ICAgIFRlbGVwaG9uZU51bWJlckRldGVjdG9yOjppc1N1cHBvcnRlZCgpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCShyZXZpc2lvbiAy NDczODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00ODgsNiArNDg4LDEwIEBAIEZvbnRDYWNoZTo6UHJld2FybUlu Zm9ybWF0aW9uIEZvbnRDYWNoZToKICAgICByZXR1cm4geyB9OwogfQogCit2b2lkIEZvbnRDYWNo ZTo6cHJld2FybUdsb2JhbGx5KCkKK3sKK30KKwogdm9pZCBGb250Q2FjaGU6OnByZXdhcm0oY29u c3QgUHJld2FybUluZm9ybWF0aW9uJikKIHsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCShyZXZpc2lvbiAyNDczODApCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAt MjUyLDYgKzI1Miw3IEBAIHB1YmxpYzoKICAgICB9OwogICAgIFByZXdhcm1JbmZvcm1hdGlvbiBj b2xsZWN0UHJld2FybUluZm9ybWF0aW9uKCkgY29uc3Q7CiAgICAgdm9pZCBwcmV3YXJtKGNvbnN0 IFByZXdhcm1JbmZvcm1hdGlvbiYpOworICAgIHZvaWQgcHJld2FybUdsb2JhbGx5KCk7CiAKIHBy aXZhdGU6CiAgICAgRm9udENhY2hlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCShy ZXZpc2lvbiAyNDczODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv YS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAK IAogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4K KyNpbmNsdWRlIDx3dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL05l dmVyRGVzdHJveWVkLmg+CiAKICNkZWZpbmUgSEFTX0NPUkVfVEVYVF9XSURUSF9BVFRSSUJVVEUg KChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAx MzAwKSB8fCAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gMTEwMDAwKSkKQEAgLTE2MjAsNCArMTYyMSwyNyBAQCB2b2lkIEZvbnRDYWNo ZTo6cHJld2FybShjb25zdCBQcmV3YXJtSW5mCiAgICAgfSk7CiB9CiAKK3N0YXRpYyBWZWN0b3I8 U3RyaW5nPiYgZm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpCit7CisgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPFZlY3RvcjxTdHJpbmc+PiBmYW1pbGllcyA9IHN0ZDo6aW5pdGlhbGl6ZXJfbGlz dDxTdHJpbmc+IHsKKyAgICAgICAgIkFyaWFsIl9zLAorICAgICAgICAiSGVsdmV0aWNhIl9zLAor ICAgICAgICAiSGVsdmV0aWNhIE5ldWUiX3MsCisgICAgICAgICJTRiBQcm8gVGV4dCJfcywKKyAg ICAgICAgIlRpbWVzIl9zLAorICAgICAgICAiVGltZXMgTmV3IFJvbWFuIl9zLAorICAgIH07Cisg ICAgcmV0dXJuIGZhbWlsaWVzOworfQorCit2b2lkIEZvbnRDYWNoZTo6cHJld2FybUdsb2JhbGx5 KCkKK3sKKyAgICBpZiAoTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzaW5nbGV0b24oKS5pc1VuZGVy TWVtb3J5UHJlc3N1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRm9udENhY2hlOjpQcmV3 YXJtSW5mb3JtYXRpb24gcHJld2FybUluZm87CisgICAgcHJld2FybUluZm8uc2VlbkZhbWlsaWVz ID0gZm9udEZhbWlsaWVzRm9yUHJld2FybWluZygpOworICAgIEZvbnRDYWNoZTo6c2luZ2xldG9u KCkucHJld2FybShwcmV3YXJtSW5mbyk7Cit9CisKIH0K 374237 2019-07-16 14:00:26 -0700 2019-07-16 14:03:46 -0700 Patch bug-199283-20190716140025.patch text/plain 4376 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzQ0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA3LTE1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBNeWxlcyBDLiBNYXhmaWVs ZC4KKworICAgICAgICBVc2UgdGhlIGV4aXN0aW5nIHByZXdhcm0gbWV0aG9kIGluIEZvbnRDYWNo ZSB0byBwcmV3YXJtIHRoZSBjYWNoZSB3aXRoIGEgc2V0IG9mIGZvbnQgZmFtaWx5IG5hbWVzLgor ICAgICAgICBUaGUgZm9udCBsaXN0IGNvbnNpc3RzIG9mIHNvbWUgb2YgdGhlIGZvbnRzIHVzZWQg YnkgdGhlIDEwIG1vc3QgcG9wdWxhciBzaXRlcyBvbiBBbGV4YSB0b3Agc2l0ZXMuCisgICAgICAg IFRoaXMgaXMgYSBjb25maXJtZWQgaW1wcm92ZW1lbnQgaW4gcGFnZSBsb2FkIHRpbWUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogcGFnZS9Qcm9jZXNzV2FybWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9jZXNzV2Fy bWluZzo6cHJld2FybUdsb2JhbGx5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRDYWNoZTo6cHJld2FybUdsb2JhbGx5KToKKwogMjAxOS0wNy0xNSAgWXVzdWtl IFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEltcHJvdmUgd2Fz bSB3cHQgdGVzdCByZXN1bHRzIGJ5IGZpeGluZyBtaXNjZWxsYW5lb3VzIGlzc3VlcwpJbmRleDog U291cmNlL1dlYkNvcmUvcGFnZS9Qcm9jZXNzV2FybWluZy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGFnZS9Qcm9jZXNzV2FybWluZy5jcHAJKHJldmlzaW9uIDI0NzM4MCkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUHJvY2Vzc1dhcm1pbmcuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01OCw3ICs1OCw3IEBAIHZvaWQgUHJvY2Vzc1dhcm1pbmc6OmluaXRpYWxpemVOYW1lcygpCiAg ICAgWE1MTmFtZXM6OmluaXQoKTsKICAgICBXZWJLaXRGb250RmFtaWx5TmFtZXM6OmluaXQoKTsK IH0KLSAgICAKKwogdm9pZCBQcm9jZXNzV2FybWluZzo6cHJld2FybUdsb2JhbGx5KCkKIHsKICAg ICBpbml0aWFsaXplTmFtZXMoKTsKQEAgLTcyLDE0ICs3Miw4IEBAIHZvaWQgUHJvY2Vzc1dhcm1p bmc6OnByZXdhcm1HbG9iYWxseSgpCiAgICAgLy8gUHJld2FybXMgSlMgVk0uCiAgICAgY29tbW9u Vk0oKTsKIAotI2lmIFVTRV9QTEFURk9STV9TWVNURU1fRkFMTEJBQ0tfTElTVAotICAgIC8vIENh Y2hlIHN5c3RlbSBVSSBmb250IGZhbGxiYWNrcy4gQWxtb3N0IGV2ZXJ5IHdlYiBwcm9jZXNzIG5l ZWRzIHRoZXNlLgotICAgIC8vIEluaXRpYWxpemluZyBvbmUgc2l6ZSBpcyBzdWZmaWNpZW50IHRv IHdhcm0gQ29yZVRleHQgY2FjaGVzLgotICAgIEZvbnRDYXNjYWRlRGVzY3JpcHRpb24gc3lzdGVt Rm9udERlc2NyaXB0aW9uOwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRPbmVGYW1pbHko InN5c3RlbS11aSIpOwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUo MTEpOwotICAgIHN5c3RlbUZvbnREZXNjcmlwdGlvbi5lZmZlY3RpdmVGYW1pbHlDb3VudCgpOwot I2VuZGlmCisgICAgLy8gUHJld2FybSBmb250IGNhY2hlCisgICAgRm9udENhY2hlOjpzaW5nbGV0 b24oKS5wcmV3YXJtR2xvYmFsbHkoKTsKIAogI2lmIEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RF VEVDVElPTikKICAgICBUZWxlcGhvbmVOdW1iZXJEZXRlY3Rvcjo6aXNTdXBwb3J0ZWQoKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAko cmV2aXNpb24gMjQ3MzgwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dENhY2hlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDg4LDYgKzQ4OCwxMCBAQCBGb250Q2FjaGU6 OlByZXdhcm1JbmZvcm1hdGlvbiBGb250Q2FjaGU6CiAgICAgcmV0dXJuIHsgfTsKIH0KIAordm9p ZCBGb250Q2FjaGU6OnByZXdhcm1HbG9iYWxseSgpCit7Cit9CisKIHZvaWQgRm9udENhY2hlOjpw cmV3YXJtKGNvbnN0IFByZXdhcm1JbmZvcm1hdGlvbiYpCiB7CiB9CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAkocmV2aXNpb24gMjQ3MzgwKQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTI1Miw2ICsyNTIsNyBAQCBwdWJsaWM6CiAgICAgfTsKICAgICBQcmV3YXJtSW5m b3JtYXRpb24gY29sbGVjdFByZXdhcm1JbmZvcm1hdGlvbigpIGNvbnN0OwogICAgIHZvaWQgcHJl d2FybShjb25zdCBQcmV3YXJtSW5mb3JtYXRpb24mKTsKKyAgICB2b2lkIHByZXdhcm1HbG9iYWxs eSgpOwogCiBwcml2YXRlOgogICAgIEZvbnRDYWNoZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVU ZXh0LmNwcAkocmV2aXNpb24gMjQ3MzgwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2 ICszNSw3IEBACiAKICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9NYWlu VGhyZWFkLmg+CisjaW5jbHVkZSA8d3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5oPgogI2luY2x1 ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCiAjZGVmaW5lIEhBU19DT1JFX1RFWFRfV0lEVEhf QVRUUklCVVRFICgoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ UkVEID49IDEwMTMwMCkgfHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMCkpCkBAIC0xNjIwLDQgKzE2MjEsMjMgQEAgdm9p ZCBGb250Q2FjaGU6OnByZXdhcm0oY29uc3QgUHJld2FybUluZgogICAgIH0pOwogfQogCit2b2lk IEZvbnRDYWNoZTo6cHJld2FybUdsb2JhbGx5KCkKK3sKKyAgICBpZiAoTWVtb3J5UHJlc3N1cmVI YW5kbGVyOjpzaW5nbGV0b24oKS5pc1VuZGVyTWVtb3J5UHJlc3N1cmUoKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgVmVjdG9yPFN0cmluZz4gZmFtaWxpZXMgPSBzdGQ6OmluaXRpYWxpemVyX2xp c3Q8U3RyaW5nPiB7CisgICAgICAgICJBcmlhbCJfcywKKyAgICAgICAgIkhlbHZldGljYSJfcywK KyAgICAgICAgIkhlbHZldGljYSBOZXVlIl9zLAorICAgICAgICAiU0YgUHJvIFRleHQiX3MsCisg ICAgICAgICJUaW1lcyJfcywKKyAgICAgICAgIlRpbWVzIE5ldyBSb21hbiJfcywKKyAgICB9Owor CisgICAgRm9udENhY2hlOjpQcmV3YXJtSW5mb3JtYXRpb24gcHJld2FybUluZm87CisgICAgcHJl d2FybUluZm8uc2VlbkZhbWlsaWVzID0gV1RGTW92ZShmYW1pbGllcyk7CisgICAgRm9udENhY2hl OjpzaW5nbGV0b24oKS5wcmV3YXJtKHByZXdhcm1JbmZvKTsKK30KKwogfQo= 374238 2019-07-16 14:04:19 -0700 2019-07-16 15:18:44 -0700 Patch bug-199283-20190716140418.patch text/plain 4355 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzQ5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA3LTE1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBNeWxlcyBDLiBNYXhmaWVs ZC4KKworICAgICAgICBVc2UgdGhlIGV4aXN0aW5nIHByZXdhcm0gbWV0aG9kIGluIEZvbnRDYWNo ZSB0byBwcmV3YXJtIHRoZSBjYWNoZSB3aXRoIGEgc2V0IG9mIGZvbnQgZmFtaWx5IG5hbWVzLgor ICAgICAgICBUaGUgZm9udCBsaXN0IGNvbnNpc3RzIG9mIHNvbWUgb2YgdGhlIGZvbnRzIHVzZWQg YnkgdGhlIDEwIG1vc3QgcG9wdWxhciBzaXRlcyBvbiBBbGV4YSB0b3Agc2l0ZXMuCisgICAgICAg IFRoaXMgaXMgYSBjb25maXJtZWQgaW1wcm92ZW1lbnQgaW4gcGFnZSBsb2FkIHRpbWUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogcGFnZS9Qcm9jZXNzV2FybWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9jZXNzV2Fy bWluZzo6cHJld2FybUdsb2JhbGx5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRDYWNoZTo6cHJld2FybUdsb2JhbGx5KToKKwogMjAxOS0wNy0xNiAgUm9iaW4g TW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXSExTTF0gRGVzdWdh ciBmb3IgbG9vcHMgYW5kIHdoaWxlIGxvb3BzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1By b2Nlc3NXYXJtaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1Byb2Nl c3NXYXJtaW5nLmNwcAkocmV2aXNpb24gMjQ3NDk3KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Q cm9jZXNzV2FybWluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4LDcgQEAgdm9pZCBQ cm9jZXNzV2FybWluZzo6aW5pdGlhbGl6ZU5hbWVzKCkKICAgICBYTUxOYW1lczo6aW5pdCgpOwog ICAgIFdlYktpdEZvbnRGYW1pbHlOYW1lczo6aW5pdCgpOwogfQotICAgIAorCiB2b2lkIFByb2Nl c3NXYXJtaW5nOjpwcmV3YXJtR2xvYmFsbHkoKQogewogICAgIGluaXRpYWxpemVOYW1lcygpOwpA QCAtNzIsMTQgKzcyLDggQEAgdm9pZCBQcm9jZXNzV2FybWluZzo6cHJld2FybUdsb2JhbGx5KCkK ICAgICAvLyBQcmV3YXJtcyBKUyBWTS4KICAgICBjb21tb25WTSgpOwogCi0jaWYgVVNFKFBMQVRG T1JNX1NZU1RFTV9GQUxMQkFDS19MSVNUKQotICAgIC8vIENhY2hlIHN5c3RlbSBVSSBmb250IGZh bGxiYWNrcy4gQWxtb3N0IGV2ZXJ5IHdlYiBwcm9jZXNzIG5lZWRzIHRoZXNlLgotICAgIC8vIElu aXRpYWxpemluZyBvbmUgc2l6ZSBpcyBzdWZmaWNpZW50IHRvIHdhcm0gQ29yZVRleHQgY2FjaGVz LgotICAgIEZvbnRDYXNjYWRlRGVzY3JpcHRpb24gc3lzdGVtRm9udERlc2NyaXB0aW9uOwotICAg IHN5c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRPbmVGYW1pbHkoInN5c3RlbS11aSIpOwotICAgIHN5 c3RlbUZvbnREZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoMTEpOwotICAgIHN5c3RlbUZvbnRE ZXNjcmlwdGlvbi5lZmZlY3RpdmVGYW1pbHlDb3VudCgpOwotI2VuZGlmCisgICAgLy8gUHJld2Fy bSBmb250IGNhY2hlCisgICAgRm9udENhY2hlOjpzaW5nbGV0b24oKS5wcmV3YXJtR2xvYmFsbHko KTsKIAogI2lmIEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RFVEVDVElPTikKICAgICBUZWxlcGhv bmVOdW1iZXJEZXRlY3Rvcjo6aXNTdXBwb3J0ZWQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAkocmV2aXNpb24gMjQ3NDk3KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDg4LDYgKzQ4OCwxMCBAQCBGb250Q2FjaGU6OlByZXdhcm1JbmZvcm1hdGlvbiBG b250Q2FjaGU6CiAgICAgcmV0dXJuIHsgfTsKIH0KIAordm9pZCBGb250Q2FjaGU6OnByZXdhcm1H bG9iYWxseSgpCit7Cit9CisKIHZvaWQgRm9udENhY2hlOjpwcmV3YXJtKGNvbnN0IFByZXdhcm1J bmZvcm1hdGlvbiYpCiB7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250Q2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250Q2FjaGUuaAkocmV2aXNpb24gMjQ3NDk3KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1Miw2ICsyNTIs NyBAQCBwdWJsaWM6CiAgICAgfTsKICAgICBQcmV3YXJtSW5mb3JtYXRpb24gY29sbGVjdFByZXdh cm1JbmZvcm1hdGlvbigpIGNvbnN0OwogICAgIHZvaWQgcHJld2FybShjb25zdCBQcmV3YXJtSW5m b3JtYXRpb24mKTsKKyAgICB2b2lkIHByZXdhcm1HbG9iYWxseSgpOwogCiBwcml2YXRlOgogICAg IEZvbnRDYWNoZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j b2EvRm9udENhY2hlQ29yZVRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAkocmV2aXNpb24gMjQ3 NDk3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hl Q29yZVRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3IEBACiAKICNpbmNsdWRl IDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CisjaW5jbHVkZSA8 d3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5oPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3ll ZC5oPgogCiAjZGVmaW5lIEhBU19DT1JFX1RFWFRfV0lEVEhfQVRUUklCVVRFICgoUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTMwMCkgfHwgKFBM QVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDExMDAwMCkpCkBAIC0xNjIxLDQgKzE2MjIsMjMgQEAgdm9pZCBGb250Q2FjaGU6OnByZXdhcm0o Y29uc3QgUHJld2FybUluZgogICAgIH0pOwogfQogCit2b2lkIEZvbnRDYWNoZTo6cHJld2FybUds b2JhbGx5KCkKK3sKKyAgICBpZiAoTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzaW5nbGV0b24oKS5p c1VuZGVyTWVtb3J5UHJlc3N1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgVmVjdG9yPFN0 cmluZz4gZmFtaWxpZXMgPSBzdGQ6OmluaXRpYWxpemVyX2xpc3Q8U3RyaW5nPiB7CisgICAgICAg ICJBcmlhbCJfcywKKyAgICAgICAgIkhlbHZldGljYSJfcywKKyAgICAgICAgIkhlbHZldGljYSBO ZXVlIl9zLAorICAgICAgICAiU0YgUHJvIFRleHQiX3MsCisgICAgICAgICJUaW1lcyJfcywKKyAg ICAgICAgIlRpbWVzIE5ldyBSb21hbiJfcywKKyAgICB9OworCisgICAgRm9udENhY2hlOjpQcmV3 YXJtSW5mb3JtYXRpb24gcHJld2FybUluZm87CisgICAgcHJld2FybUluZm8uc2VlbkZhbWlsaWVz ID0gV1RGTW92ZShmYW1pbGllcyk7CisgICAgRm9udENhY2hlOjpzaW5nbGV0b24oKS5wcmV3YXJt KHByZXdhcm1JbmZvKTsKK30KKwogfQo= 374427 2019-07-18 16:37:37 -0700 2019-07-18 17:07:58 -0700 Patch bug-199283-20190718163736.patch text/plain 2324 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzYyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA3LTE4ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV3YXJtIGZvbnQgY2Fj aGUgd2l0aCBtb3JlIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkyODMKKworICAgICAgICBSZXZpZXdlZCBieSBNeWxlcyBDLiBNYXhmaWVs ZC4KKworICAgICAgICBJbml0aWFsaXplIHRoZSBsaXN0IG9mIGZhbWlsaWVzIHJlcXVpcmluZyBz eXN0ZW0gZmFsbGJhY2sgaW4gdGhlIHByZXdhcm1pbmcgaW5mb3JtYXRpb24gc3RydWN0LCBzaW5j ZQorICAgICAgICB0aGlzIHdhcyBwYXJ0IG9mIHRoZSBvcmlnaW5hbCwgYXBwcm92ZWQgcGF0Y2gs IGFuZCBpcyBuZWVkZWQgZm9yIHRoZSBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudC4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpmb250RmFtaWxpZXNGb3JQcmV3YXJtaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRDYWNoZTo6cHJld2FybUdsb2JhbGx5KToKKwogMjAxOS0wNy0xOCAgQW50b2luZSBRdWludCAg PGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIEVuc3VyZSBRdWlya3M6OnNob3VsZERpc3Bh dGNoU2ltdWxhdGVkTW91c2VFdmVudHMoKSB3b3JrcyBmb3IgYWxsIEdvb2dsZSBNYXBzIGFuZCBB bWF6b24gZG9tYWlucwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j b2EvRm9udENhY2hlQ29yZVRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAkocmV2aXNpb24gMjQ3 NjIyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hl Q29yZVRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQ5LDEyICsxNjQ5LDkgQEAgdm9pZCBG b250Q2FjaGU6OnByZXdhcm0oY29uc3QgUHJld2FybUluZgogICAgIH0pOwogfQogCi12b2lkIEZv bnRDYWNoZTo6cHJld2FybUdsb2JhbGx5KCkKK3N0YXRpYyBWZWN0b3I8U3RyaW5nPiYgZm9udEZh bWlsaWVzRm9yUHJld2FybWluZygpCiB7Ci0gICAgaWYgKE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 c2luZ2xldG9uKCkuaXNVbmRlck1lbW9yeVByZXNzdXJlKCkpCi0gICAgICAgIHJldHVybjsKLQot ICAgIFZlY3RvcjxTdHJpbmc+IGZhbWlsaWVzID0gc3RkOjppbml0aWFsaXplcl9saXN0PFN0cmlu Zz4geworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxWZWN0b3I8U3RyaW5nPj4gZmFtaWxpZXMg PSBzdGQ6OmluaXRpYWxpemVyX2xpc3Q8U3RyaW5nPiB7CiAgICAgICAgICJBcmlhbCJfcywKICAg ICAgICAgIkhlbHZldGljYSJfcywKICAgICAgICAgIkhlbHZldGljYSBOZXVlIl9zLApAQCAtMTY2 Miw5ICsxNjU5LDE3IEBAIHZvaWQgRm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkoKQogICAgICAg ICAiVGltZXMiX3MsCiAgICAgICAgICJUaW1lcyBOZXcgUm9tYW4iX3MsCiAgICAgfTsKKyAgICBy ZXR1cm4gZmFtaWxpZXM7Cit9CisKK3ZvaWQgRm9udENhY2hlOjpwcmV3YXJtR2xvYmFsbHkoKQor eworICAgIGlmIChNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNpbmdsZXRvbigpLmlzVW5kZXJNZW1v cnlQcmVzc3VyZSgpKQorICAgICAgICByZXR1cm47CiAKICAgICBGb250Q2FjaGU6OlByZXdhcm1J bmZvcm1hdGlvbiBwcmV3YXJtSW5mbzsKLSAgICBwcmV3YXJtSW5mby5zZWVuRmFtaWxpZXMgPSBX VEZNb3ZlKGZhbWlsaWVzKTsKKyAgICBwcmV3YXJtSW5mby5zZWVuRmFtaWxpZXMgPSBmb250RmFt aWxpZXNGb3JQcmV3YXJtaW5nKCk7CisgICAgcHJld2FybUluZm8uZm9udE5hbWVzUmVxdWlyaW5n U3lzdGVtRmFsbGJhY2sgPSBmb250RmFtaWxpZXNGb3JQcmV3YXJtaW5nKCk7CiAgICAgRm9udENh Y2hlOjpzaW5nbGV0b24oKS5wcmV3YXJtKHByZXdhcm1JbmZvKTsKIH0KIAo=