234058 2021-12-08 18:39:35 -0800 Make FontCache::m_shouldMockBoldSystemFontForAccessibility static 2023-06-12 16:34:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified NEW InRadar P2 Normal --- 233488 1 heycam heycam bfulgham mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1821930 0 heycam 2021-12-08 18:39:35 -0800 Make FontCache::m_shouldMockBoldSystemFontForAccessibility static 1821931 1 446480 heycam 2021-12-08 18:40:35 -0800 Created attachment 446480 Patch 1821982 2 446480 mmaxfield 2021-12-08 20:48:21 -0800 Comment on attachment 446480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446480&action=review > Source/WebCore/platform/graphics/FontCache.h:151 > + static bool shouldMockBoldSystemFontForAccessibility() { return s_shouldMockBoldSystemFontForAccessibility; } don't you need to do a .load()? > Source/WebCore/platform/graphics/FontCache.h:199 > + static inline std::atomic<bool> s_shouldMockBoldSystemFontForAccessibility { false }; I think adding globals is kind of the wrong direction. There will already be multiple font caches; why can't a worker just read the (non-atomic) bool from its thread's font cache? 1821985 3 heycam 2021-12-08 20:54:26 -0800 (In reply to Myles C. Maxfield from comment #2) > Comment on attachment 446480 [details] > > Source/WebCore/platform/graphics/FontCache.h:151 > > + static bool shouldMockBoldSystemFontForAccessibility() { return s_shouldMockBoldSystemFontForAccessibility; } > > don't you need to do a .load()? std::atomic<T> has an operator T. > > Source/WebCore/platform/graphics/FontCache.h:199 > > + static inline std::atomic<bool> s_shouldMockBoldSystemFontForAccessibility { false }; > > I think adding globals is kind of the wrong direction. There will already be > multiple font caches; why can't a worker just read the (non-atomic) bool > from its thread's font cache? We can easily do that with the callOnAllFontCaches() function from bug 234060. But it seems overkill for a field that when set doesn't need any other special processing to happen. 1821986 4 heycam 2021-12-08 20:55:54 -0800 (In reply to Cameron McCormack (:heycam) from comment #3) > We can easily do that with the callOnAllFontCaches() function from bug > 234060. But it seems overkill for a field that when set doesn't need any > other special processing to happen. But I'm happy to change to use that if you prefer. 1822041 5 446480 mmaxfield 2021-12-09 02:32:26 -0800 Comment on attachment 446480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446480&action=review >>> Source/WebCore/platform/graphics/FontCache.h:199 >>> + static inline std::atomic<bool> s_shouldMockBoldSystemFontForAccessibility { false }; >> >> I think adding globals is kind of the wrong direction. There will already be multiple font caches; why can't a worker just read the (non-atomic) bool from its thread's font cache? > > We can easily do that with the callOnAllFontCaches() function from bug 234060. But it seems overkill for a field that when set doesn't need any other special processing to happen. I think that would be better. I'm also not sure if callOnAllFontCaches() is needed. Do you think that's better than just setting the current thread's value? 1822332 6 heycam 2021-12-09 14:20:54 -0800 (In reply to Myles C. Maxfield from comment #5) > I think that would be better. > > I'm also not sure if callOnAllFontCaches() is needed. Do you think that's > better than just setting the current thread's value? So you're saying: existing tests only need this value to be set on the main thread, and so we shouldn't bother propagating it to workers? 1822361 7 mmaxfield 2021-12-09 14:54:52 -0800 (In reply to Cameron McCormack (:heycam) from comment #6) > (In reply to Myles C. Maxfield from comment #5) > > I'm also not sure if callOnAllFontCaches() is needed. Do you think that's > > better than just setting the current thread's value? > > So you're saying: existing tests only need this value to be set on the main > thread, Yes. > and so we shouldn't bother propagating it to workers? I wasn't going that far as to make a statement. I was just asking the question. If you think it should be set on all the threads because future tests may want that functionality, then sure, that makes sense. But I could also imagine a worker test that require the worker to call this function itself. I think it's up to you. 1822550 8 heycam 2021-12-09 23:59:00 -0800 (In reply to Myles C. Maxfield from comment #7) > I wasn't going that far as to make a statement. I was just asking the > question. If you think it should be set on all the threads because future > tests may want that functionality, then sure, that makes sense. But I could > also imagine a worker test that require the worker to call this function > itself. I think it's up to you. OK that's a fair point. Since this is set through Internals.settings, which feels like a global thing rather than a per-thread thing, I'm going to propagate to workers. 1822551 9 446674 heycam 2021-12-10 00:12:09 -0800 Created attachment 446674 Patch propagating to all FontCaches 1822553 10 heycam 2021-12-10 00:12:50 -0800 I really don't know that this is better than having a static variable that all FontCache instances can consult. 1824638 11 webkit-bug-importer 2021-12-15 18:40:18 -0800 <rdar://problem/86553539> 1961175 12 ahmad.saleem792 2023-06-12 16:34:15 -0700 *** Bug 234057 has been marked as a duplicate of this bug. *** 446480 2021-12-08 18:40:35 -0800 2021-12-08 18:40:35 -0800 Patch bug-234058-20211209134034.patch text/plain 4328 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBlNDI2YTFjMGMzMWUw N2NiZTVmZDkxZTRmMjBkMmQ0ZjNiMTc1MS4uNTMxYTRlY2EzNGFkM2FmZDg3M2YyYTRjYmU1ZDZk NTFjYzU1OTdhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTAzICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBGb250Q2Fj aGU6Om1fc2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSBzdGF0aWMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvbnRDYWNoZTo6 bV9zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5IGlzIHNldCBieQorICAg ICAgICBJbnRlcm5hbFNldHRpbmdzIGJ1dCB3ZSBjdXJyZW50bHkgb25seSBzZXQgaXQgb24gdGhl IG1haW4gdGhyZWFkJ3MKKyAgICAgICAgRm9udENhY2hlIG9iamVjdC4gV2UgZG9uJ3QgbmVlZCB0 byByZXNwb25kIHRvIGNoYW5nZXMgaW4gdGhpcyB2YXJpYWJsZQorICAgICAgICBpbiBhbnkgcGFy dGljdWxhciB3YXksIHNvIHdlIGNhbiBtYWtlIHRoaXMgdmFyaWFibGUgYSBzdGF0aWMgYXRvbWlj IHNvCisgICAgICAgIHRoYXQgd29ya2VyIHRocmVhZHMgY2FuIHJlYWQgdGhlIHNhbWUgc2V0dGlu Zy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhY2hlOjpzaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmls aXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNoZTo6c2V0U2hvdWxkTW9ja0JvbGRTeXN0 ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSk6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OnNo b3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnRlcm5hbFNldHRpbmdzOjpCYWNrdXA6OnJlc3RvcmVUbyk6CisgICAgICAgIChXZWJDb3Jl OjpJbnRlcm5hbFNldHRpbmdzOjpzZXRTaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3Np YmlsaXR5KToKKwogMjAyMS0xMi0wMyAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFVzZSB0aHJlYWQgc2FmZSBpbml0aWFsaXphdGlvbiBmb3Igc3RhdGlj cyBpbiBGb250OjpnZXRDRlN0cmluZ0F0dHJpYnV0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKaW5kZXggM2JjYTgzODQ2ZTMzNmE4MmYwMzIwYWZmZDMy YzM4NzBmYWYxNWNhOC4uNWEwYmRhN2M4OTExMWNlZTI4NTVkNzRjZmEwYjRhYjUwNTYzZTc1MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKQEAgLTE0 OCw4ICsxNDgsOCBAQCBwdWJsaWM6CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3Jt RGF0YT4gY3JlYXRlRm9udFBsYXRmb3JtRGF0YUZvclRlc3RpbmcoY29uc3QgRm9udERlc2NyaXB0 aW9uJiwgY29uc3QgQXRvbVN0cmluZyYgZmFtaWx5KTsKICAgICAKLSAgICBib29sIHNob3VsZE1v Y2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkoKSBjb25zdCB7IHJldHVybiBtX3Nob3Vs ZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHk7IH0KLSAgICB2b2lkIHNldFNob3Vs ZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkoYm9vbCBzaG91bGRNb2NrQm9sZFN5 c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5KSB7IG1fc2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9y QWNjZXNzaWJpbGl0eSA9IHNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHk7 IH0KKyAgICBzdGF0aWMgYm9vbCBzaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmls aXR5KCkgeyByZXR1cm4gc19zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5 OyB9CisgICAgc3RhdGljIHZvaWQgc2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNz aWJpbGl0eShib29sIHNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkpIHsg c19zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5ID0gc2hvdWxkTW9ja0Jv bGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eTsgfQogCiAgICAgc3RydWN0IFByZXdhcm1JbmZv cm1hdGlvbiB7CiAgICAgICAgIFZlY3RvcjxTdHJpbmc+IHNlZW5GYW1pbGllczsKQEAgLTE5Niw3 ICsxOTYsNyBAQCBwcml2YXRlOgogCiAgICAgVGltZXIgbV9wdXJnZVRpbWVyOwogICAgIAotICAg IGJvb2wgbV9zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5IHsgZmFsc2Ug fTsKKyAgICBzdGF0aWMgaW5saW5lIHN0ZDo6YXRvbWljPGJvb2w+IHNfc2hvdWxkTW9ja0JvbGRT eXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSB7IGZhbHNlIH07CiAKICAgICBIYXNoU2V0PEZvbnRT ZWxlY3Rvcio+IG1fY2xpZW50czsKICAgICBzdHJ1Y3QgRm9udERhdGFDYWNoZXM7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwIGIvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAppbmRleCBlMjljNWNhZjQ3OTJk M2Y4OTIyMzMyMmFiOGM2YThkMjAwNGRjMzcxLi45YjRjMDRlZDkwNjkyOTA4MmU1NDc1ODU2YmJj YTZiYTlmMWZhNWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs U2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5n cy5jcHAKQEAgLTEzMSw4ICsxMzEsNyBAQCB2b2lkIEludGVybmFsU2V0dGluZ3M6OkJhY2t1cDo6 cmVzdG9yZVRvKFNldHRpbmdzJiBzZXR0aW5ncykKICNlbmRpZgogCiAgICAgUmVuZGVyVGhlbWU6 OnNpbmdsZXRvbigpLnNldFNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHko bV9zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5KTsKLSAgICAvLyBGSVhN RTogQ2FsbCBzZXRTaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5KCkgb24g YWxsIHdvcmtlcnMuCi0gICAgRm9udENhY2hlOjpmb3JDdXJyZW50VGhyZWFkKCkuc2V0U2hvdWxk TW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eShtX3Nob3VsZE1vY2tCb2xkU3lzdGVt Rm9udEZvckFjY2Vzc2liaWxpdHkpOworICAgIEZvbnRDYWNoZTo6c2V0U2hvdWxkTW9ja0JvbGRT eXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eShtX3Nob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFj Y2Vzc2liaWxpdHkpOwogCiAjaWYgRU5BQkxFKFdFQl9BVURJTykKICAgICBBdWRpb0NvbnRleHQ6 OnNldERlZmF1bHRTYW1wbGVSYXRlRm9yVGVzdGluZyhzdGQ6Om51bGxvcHQpOwpAQCAtNTcxLDgg KzU3MCw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEludGVybmFsU2V0dGluZ3M6OnNldFNob3VsZE1v Y2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkoCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAg ICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkQWNjZXNzRXJyb3IgfTsKICAgICBSZW5kZXJU aGVtZTo6c2luZ2xldG9uKCkuc2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJp bGl0eShyZXF1aXJlcyk7Ci0gICAgLy8gRklYTUU6IENhbGwgc2V0U2hvdWxkTW9ja0JvbGRTeXN0 ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSgpIG9uIGFsbCB3b3JrZXJzLgotICAgIEZvbnRDYWNoZTo6 Zm9yQ3VycmVudFRocmVhZCgpLnNldFNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2li aWxpdHkocmVxdWlyZXMpOworICAgIEZvbnRDYWNoZTo6c2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1G b250Rm9yQWNjZXNzaWJpbGl0eShyZXF1aXJlcyk7CiAgICAgcmV0dXJuIHsgfTsKIH0KIAo= 446674 2021-12-10 00:12:09 -0800 2021-12-10 15:19:25 -0800 Patch propagating to all FontCaches bug-234058-20211210191208.patch text/plain 4514 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjQ3MWNiYTE3ZTI4NTNh NGNiZjZkN2ZlNWMxZWZlMzJkNWU0MTViNS4uNDBjY2IxNjkzYzZjZmI1Y2NhYzA4Mjg0ZDEwOWU3 N2ZhNjNhNTkxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTEyLTAzICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUHJvcGFnYXRlIEZv bnRDYWNoZTo6bV9zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5IGNoYW5n ZXMgdG8gYWxsIEZvbnRDYWNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNDA1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZvbnRDYWNoZTo6bV9zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nl c3NpYmlsaXR5IGlzIHNldCBieQorICAgICAgICBJbnRlcm5hbFNldHRpbmdzIGJ1dCB3ZSBjdXJy ZW50bHkgb25seSBzZXQgaXQgb24gdGhlIG1haW4gdGhyZWFkJ3MKKyAgICAgICAgRm9udENhY2hl IG9iamVjdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nl c3NpYmlsaXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNoZTo6c2V0U2hvdWxkTW9ja0Jv bGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSk6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2Fj aGU6OnNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkgY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnRlcm5hbFNldHRpbmdzOjpCYWNrdXA6OnJlc3RvcmVUbyk6CisgICAgICAgIChX ZWJDb3JlOjpJbnRlcm5hbFNldHRpbmdzOjpzZXRTaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JB Y2Nlc3NpYmlsaXR5KToKKwogMjAyMS0xMi0wOCAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1A YXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRm9udENhY2hlOjppbnZhbGlkYXRlQWxsRm9udENh Y2hlcyBjYWxsIGludmFsaWRhdGUgb24gYWxsIHdvcmtlciBGb250Q2FjaGVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAppbmRleCBkNDRkMmY5OWNm NDM0MWQ1OTJkNzk0ZmEzYmFkMDhhMmQyYjE3YmFhLi5mZWQxYmY4YjdjMDFiOWQwMGRkZDlhYTVk MGU5YWM4OGQ3OTE1ZDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5jcHAKQEAgLTQxNiw2ICs0MTYsMTMgQEAgdm9pZCBGb250Q2FjaGU6OmludmFs aWRhdGVBbGxGb250Q2FjaGVzKCkKICAgICB9KTsKIH0KIAordm9pZCBGb250Q2FjaGU6OnNldFNo b3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHlPbkFsbEZvbnRDYWNoZXMoYm9v bCBzaG91bGRNb2NrKQoreworICAgIGNhbGxPbkFsbEZvbnRDYWNoZXMoW10oRm9udENhY2hlJiBm b250Q2FjaGUpIHsKKyAgICAgICAgZm9udENhY2hlLm1fc2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250 Rm9yQWNjZXNzaWJpbGl0eSA9IHNob3VsZE1vY2s7CisgICAgfSk7Cit9CisKIGJvb2wgRm9udENh Y2hlOjp1c2VCYWNrc2xhc2hBc1llblNpZ25Gb3JGYW1pbHkoY29uc3QgQXRvbVN0cmluZyYgZmFt aWx5KQogewogICAgIGlmIChmYW1pbHkuaXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRleCA2YTI5ZGNmODkxNzNmYjVmYjVlYjI3ZDEy OTFhNDIzMzNlOGMxMDQxLi4yOGEwZGQyYzZiZDNhOTExMmMzYTAyMjQxZDY2MThkYjg0NzRjNGFk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaApAQCAt MTQ5LDggKzE0OSw4IEBAIHB1YmxpYzoKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxGb250UGxhdGZv cm1EYXRhPiBjcmVhdGVGb250UGxhdGZvcm1EYXRhRm9yVGVzdGluZyhjb25zdCBGb250RGVzY3Jp cHRpb24mLCBjb25zdCBBdG9tU3RyaW5nJiBmYW1pbHkpOwogICAgIAotICAgIGJvb2wgc2hvdWxk TW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSgpIGNvbnN0IHsgcmV0dXJuIG1fc2hv dWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eTsgfQotICAgIHZvaWQgc2V0U2hv dWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eShib29sIHNob3VsZE1vY2tCb2xk U3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkpIHsgbV9zaG91bGRNb2NrQm9sZFN5c3RlbUZvbnRG b3JBY2Nlc3NpYmlsaXR5ID0gc2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0 eTsgfQorICAgIGJvb2wgc2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSgp IHsgcmV0dXJuIG1fc2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eTsgfQor ICAgIHZvaWQgc2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eU9uQWxs Rm9udENhY2hlcyhib29sKTsKIAogICAgIHN0cnVjdCBQcmV3YXJtSW5mb3JtYXRpb24gewogICAg ICAgICBWZWN0b3I8U3RyaW5nPiBzZWVuRmFtaWxpZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbFNldHRpbmdzLmNwcAppbmRleCBlMjljNWNhZjQ3OTJkM2Y4OTIyMzMyMmFiOGM2 YThkMjAwNGRjMzcxLi4yZDQzNDkwN2RjNzVmYTc1YmVhNWQ0YjExYmJlMTJmNWU0YzA5Y2IyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAKQEAgLTEzMSw4 ICsxMzEsNyBAQCB2b2lkIEludGVybmFsU2V0dGluZ3M6OkJhY2t1cDo6cmVzdG9yZVRvKFNldHRp bmdzJiBzZXR0aW5ncykKICNlbmRpZgogCiAgICAgUmVuZGVyVGhlbWU6OnNpbmdsZXRvbigpLnNl dFNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkobV9zaG91bGRNb2NrQm9s ZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5KTsKLSAgICAvLyBGSVhNRTogQ2FsbCBzZXRTaG91 bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5KCkgb24gYWxsIHdvcmtlcnMuCi0g ICAgRm9udENhY2hlOjpmb3JDdXJyZW50VGhyZWFkKCkuc2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1G b250Rm9yQWNjZXNzaWJpbGl0eShtX3Nob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2li aWxpdHkpOworICAgIEZvbnRDYWNoZTo6c2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNj ZXNzaWJpbGl0eU9uQWxsRm9udENhY2hlcyhtX3Nob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFj Y2Vzc2liaWxpdHkpOwogCiAjaWYgRU5BQkxFKFdFQl9BVURJTykKICAgICBBdWRpb0NvbnRleHQ6 OnNldERlZmF1bHRTYW1wbGVSYXRlRm9yVGVzdGluZyhzdGQ6Om51bGxvcHQpOwpAQCAtNTcxLDgg KzU3MCw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEludGVybmFsU2V0dGluZ3M6OnNldFNob3VsZE1v Y2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2liaWxpdHkoCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAg ICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkQWNjZXNzRXJyb3IgfTsKICAgICBSZW5kZXJU aGVtZTo6c2luZ2xldG9uKCkuc2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJp bGl0eShyZXF1aXJlcyk7Ci0gICAgLy8gRklYTUU6IENhbGwgc2V0U2hvdWxkTW9ja0JvbGRTeXN0 ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSgpIG9uIGFsbCB3b3JrZXJzLgotICAgIEZvbnRDYWNoZTo6 Zm9yQ3VycmVudFRocmVhZCgpLnNldFNob3VsZE1vY2tCb2xkU3lzdGVtRm9udEZvckFjY2Vzc2li aWxpdHkocmVxdWlyZXMpOworICAgIEZvbnRDYWNoZTo6c2V0U2hvdWxkTW9ja0JvbGRTeXN0ZW1G b250Rm9yQWNjZXNzaWJpbGl0eU9uQWxsRm9udENhY2hlcyhyZXF1aXJlcyk7CiAgICAgcmV0dXJu IHsgfTsKIH0KIAo=