206787 2020-01-24 17:50:50 -0800 WebCore: Remove iOS 11 macros from RenderThemeIOS.mm 2020-01-27 18:08:15 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=206096 InRadar P2 Normal --- 1 jbedard jbedard benjamin cdumez cmarcelo commit-queue darin dbates dino esprehn+autocc ews-watchlist glenn jonlee kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1610955 0 jbedard 2020-01-24 17:50:50 -0800 There are a number of platform checks that are implemented as version checks in this file. 1610956 1 388751 jbedard 2020-01-24 17:54:05 -0800 Created attachment 388751 Patch 1611061 2 388751 darin 2020-01-25 09:40:46 -0800 Comment on attachment 388751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388751&action=review > Source/WTF/wtf/PlatformHave.h:571 > +#define HAVE_FONT_STYLE_0 1 > +#define HAVE_FONT_STYLE_4 1 I think "font style 0" is simply too brief to be unambiguous. I think it should be more like SYSTEM_FONT_STYLE_TITLE_0. > Source/WebCore/rendering/RenderThemeIOS.mm:1269 > +#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) Forgot to use HAVE here. > Source/WebCore/rendering/RenderThemeIOS.mm:1287 > +#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) And here. 1611400 3 388857 jbedard 2020-01-27 07:37:28 -0800 Created attachment 388857 Patch 1611761 4 388857 commit-queue 2020-01-27 18:07:11 -0800 Comment on attachment 388857 Patch Clearing flags on attachment: 388857 Committed r255219: <https://trac.webkit.org/changeset/255219> 1611762 5 commit-queue 2020-01-27 18:07:13 -0800 All reviewed patches have been landed. Closing bug. 1611763 6 webkit-bug-importer 2020-01-27 18:08:15 -0800 <rdar://problem/58942377> 388751 2020-01-24 17:54:05 -0800 2020-01-27 07:37:26 -0800 Patch bug-206787-20200124175404.patch text/plain 4574 jbedard SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTUxMTMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAxLTI0ICBKb25hdGhhbiBCZWRhcmQgIDxq YmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJDb3JlOiBSZW1vdmUgaU9TIDExIG1hY3Jv cyBmcm9tIFJlbmRlclRoZW1lSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDY3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUhhdmUuaDogQWRkIEhBVkUoRk9OVF9TVFlM RV8wKSBhbmQgSEFWRShGT05UX1NUWUxFXzQpLgorCiAyMDIwLTAxLTI0ICBNYXJrIExhbSAgPG1h cmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBJbnRsT2JqZWN0J3MgY2FjaGVkIHN0cmluZ3Mg c2hvdWxkIGJlIGltbW9ydGFsIGFuZCBzYWZlIGZvciBjb25jdXJyZW50IGFjY2Vzcy4KSW5kZXg6 IFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYv d3RmL1BsYXRmb3JtSGF2ZS5oCShyZXZpc2lvbiAyNTUxMDgpCisrKyBTb3VyY2UvV1RGL3d0Zi9Q bGF0Zm9ybUhhdmUuaAkod29ya2luZyBjb3B5KQpAQCAtNTY1LDMgKzU2NSw4IEBACiAjaWYgKFBM QVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE0MDAp IHx8IFBMQVRGT1JNKElPU19GQU1JTFkpCiAjZGVmaW5lIEhBVkVfT1NfU0lHTlBPU1QgMQogI2Vu ZGlmCisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKSAmJiAhUExBVEZPUk0oV0FUQ0hPUykgJiYg IVBMQVRGT1JNKEFQUExFVFYpCisjZGVmaW5lIEhBVkVfRk9OVF9TVFlMRV8wIDEKKyNkZWZpbmUg SEFWRV9GT05UX1NUWUxFXzQgMQorI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTUx MTApCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxNiBAQAorMjAyMC0wMS0yNCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViQ29yZTogUmVtb3ZlIGlPUyAxMSBtYWNyb3MgZnJvbSBSZW5kZXJUaGVt ZUlPUy5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA2Nzg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gZnVuY3Rpb25hbCBjaGFuZ2VzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWVJT1M6OmNhY2hlZFN5c3RlbUZvbnREZXNjcmlwdGlvbiBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUaGVtZUlPUzo6dXBkYXRlQ2FjaGVkU3lzdGVtRm9udERlc2NyaXB0 aW9uIGNvbnN0KToKKwogMjAyMC0wMS0yNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBMb25nIHByZXNzaW5nIHRleHQgaW5zaWRlIGEgc2Vs ZWN0aW9uIHNob3VsZCB1cGRhdGUgdGhlIHNlbGVjdGlvbgpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQkocmV2aXNpb24gMjU1MTA4KQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0x MTYzLDEzICsxMTYzLDEzIEBAIEZvbnRDYXNjYWRlRGVzY3JpcHRpb24mIFJlbmRlclRoZW1lSU9T OjoKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlwdGlvbj4gc2hv cnRGb290bm90ZUZvbnQ7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEZvbnRDYXNjYWRlRGVz Y3JpcHRpb24+IHNob3J0Q2FwdGlvbjFGb250OwogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxG b250Q2FzY2FkZURlc2NyaXB0aW9uPiB0YWxsQm9keUZvbnQ7Ci0jaWYgX19JUEhPTkVfT1NfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCisjaWYgSEFWRShGT05UX1NUWUxFXzApCiAgICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPEZvbnRDYXNjYWRlRGVzY3JpcHRpb24+IHRpdGxlMEZvbnQ7 CiAjZW5kaWYKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlwdGlv bj4gdGl0bGUxRm9udDsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNj cmlwdGlvbj4gdGl0bGUyRm9udDsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2Nh ZGVEZXNjcmlwdGlvbj4gdGl0bGUzRm9udDsKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMTAwMDAKKyNpZiBIQVZFKEZPTlRfU1RZTEVfNCkKICAgICBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlwdGlvbj4gdGl0bGU0Rm9udDsKICNlbmRpZgog CkBAIC0xMTk3LDcgKzExOTcsNyBAQCBGb250Q2FzY2FkZURlc2NyaXB0aW9uJiBSZW5kZXJUaGVt ZUlPUzo6CiAgICAgICAgIHJldHVybiBoZWFkbGluZUZvbnQ7CiAgICAgY2FzZSBDU1NWYWx1ZUFw cGxlU3lzdGVtQm9keToKICAgICAgICAgcmV0dXJuIGJvZHlGb250OwotI2lmIF9fSVBIT05FX09T X1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMAorI2lmIEhBVkUoRk9OVF9TVFlMRV8wKQog ICAgIGNhc2UgQ1NTVmFsdWVBcHBsZVN5c3RlbVRpdGxlMDoKICAgICAgICAgcmV0dXJuIHRpdGxl MEZvbnQ7CiAjZW5kaWYKQEAgLTEyMDcsNyArMTIwNyw3IEBAIEZvbnRDYXNjYWRlRGVzY3JpcHRp b24mIFJlbmRlclRoZW1lSU9TOjoKICAgICAgICAgcmV0dXJuIHRpdGxlMkZvbnQ7CiAgICAgY2Fz ZSBDU1NWYWx1ZUFwcGxlU3lzdGVtVGl0bGUzOgogICAgICAgICByZXR1cm4gdGl0bGUzRm9udDsK LSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKyNpZiBIQVZF KEZPTlRfU1RZTEVfNCkKICAgICBjYXNlIENTU1ZhbHVlQXBwbGVTeXN0ZW1UaXRsZTQ6CiAgICAg ICAgIHJldHVybiB0aXRsZTRGb250OwogI2VuZGlmCkBAIC0xMjY2LDcgKzEyNjYsNyBAQCB2b2lk IFJlbmRlclRoZW1lSU9TOjp1cGRhdGVDYWNoZWRTeXN0ZW1GCiAgICAgICAgIHRleHRTdHlsZSA9 IGtDVFVJRm9udFRleHRTdHlsZUJvZHk7CiAgICAgICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRD RihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRT aXplQ2F0ZWdvcnkoKSwgbnVsbHB0cikpOwogICAgICAgICBicmVhazsKLSNpZiBfX0lQSE9ORV9P U19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKyNpZiAhUExBVEZPUk0oV0FUQ0hPUykg JiYgIVBMQVRGT1JNKEFQUExFVFYpCiAgICAgY2FzZSBDU1NWYWx1ZUFwcGxlU3lzdGVtVGl0bGUw OgogICAgICAgICB0ZXh0U3R5bGUgPSBrQ1RVSUZvbnRUZXh0U3R5bGVUaXRsZTA7CiAgICAgICAg IGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRT dHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgbnVsbHB0cikpOwpAQCAtMTI4 NCw3ICsxMjg0LDcgQEAgdm9pZCBSZW5kZXJUaGVtZUlPUzo6dXBkYXRlQ2FjaGVkU3lzdGVtRgog ICAgICAgICB0ZXh0U3R5bGUgPSBrQ1RVSUZvbnRUZXh0U3R5bGVUaXRsZTM7CiAgICAgICAgIGZv bnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHls ZSh0ZXh0U3R5bGUsIGNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgbnVsbHB0cikpOwogICAgICAgICBi cmVhazsKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKyNp ZiAhUExBVEZPUk0oV0FUQ0hPUykgJiYgIVBMQVRGT1JNKEFQUExFVFYpCiAgICAgY2FzZSBDU1NW YWx1ZUFwcGxlU3lzdGVtVGl0bGU0OgogICAgICAgICB0ZXh0U3R5bGUgPSBrQ1RVSUZvbnRUZXh0 U3R5bGVUaXRsZTQ7CiAgICAgICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRTaXplQ2F0ZWdvcnko KSwgbnVsbHB0cikpOwo= 388857 2020-01-27 07:37:28 -0800 2020-01-27 18:07:11 -0800 Patch bug-206787-20200127073727.patch text/plain 4643 jbedard SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTUxNDMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAxLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxq YmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJDb3JlOiBSZW1vdmUgaU9TIDExIG1hY3Jv cyBmcm9tIFJlbmRlclRoZW1lSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDY3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUhhdmUuaDogQWRkIEhBVkUoU1lTVEVNX0ZP TlRfU1RZTEVfVElUTEVfMCkgYW5kIEhBVkUoU1lTVEVNX0ZPTlRfU1RZTEVfVElUTEVfNCkuCisK IDIwMjAtMDEtMjcgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE1h a2UgZ2V0VlRhYmxlUG9pbnRlcigpIGFuIGlubGluZSBmdW5jdGlvbiB0byBiZSBjb21wbGlhbnQg d2l0aCBXZWJLaXQgc3R5bGUgZ3VpZGVsaW5lcy4KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL1BsYXRm b3JtSGF2ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCShy ZXZpc2lvbiAyNTUxNDMpCisrKyBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTY1LDMgKzU2NSw4IEBACiAjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE0MDApIHx8IFBMQVRGT1JNKElPU19GQU1J TFkpCiAjZGVmaW5lIEhBVkVfT1NfU0lHTlBPU1QgMQogI2VuZGlmCisKKyNpZiBQTEFURk9STShJ T1NfRkFNSUxZKSAmJiAhUExBVEZPUk0oV0FUQ0hPUykgJiYgIVBMQVRGT1JNKEFQUExFVFYpCisj ZGVmaW5lIEhBVkVfU1lTVEVNX0ZPTlRfU1RZTEVfVElUTEVfMCAxCisjZGVmaW5lIEhBVkVfU1lT VEVNX0ZPTlRfU1RZTEVfVElUTEVfNCAxCisjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9u IDI1NTE0MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE2IEBACisyMDIwLTAxLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl LmNvbT4KKworICAgICAgICBXZWJDb3JlOiBSZW1vdmUgaU9TIDExIG1hY3JvcyBmcm9tIFJlbmRl clRoZW1lSU9TLm1tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDY3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZXMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW06CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZUlPUzo6Y2FjaGVkU3lzdGVtRm9udERlc2NyaXB0aW9uIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjp1cGRhdGVDYWNoZWRTeXN0ZW1Gb250RGVz Y3JpcHRpb24gY29uc3QpOgorCiAyMDIwLTAxLTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEaXNwbGF5OjpSdW4gaGFzIHBoeXNpY2FsIGdl b21ldHJ5IG9ubHkuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l SU9TLm1tCShyZXZpc2lvbiAyNTUxNDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTExNjMsMTMgKzExNjMsMTMgQEAgRm9u dENhc2NhZGVEZXNjcmlwdGlvbiYgUmVuZGVyVGhlbWVJT1M6OgogICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxGb250Q2FzY2FkZURlc2NyaXB0aW9uPiBzaG9ydEZvb3Rub3RlRm9udDsKICAgICBz dGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlwdGlvbj4gc2hvcnRDYXB0aW9u MUZvbnQ7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEZvbnRDYXNjYWRlRGVzY3JpcHRpb24+ IHRhbGxCb2R5Rm9udDsKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MTAwMDAKKyNpZiBIQVZFKFNZU1RFTV9GT05UX1NUWUxFX1RJVExFXzApCiAgICAgc3RhdGljIE5l dmVyRGVzdHJveWVkPEZvbnRDYXNjYWRlRGVzY3JpcHRpb24+IHRpdGxlMEZvbnQ7CiAjZW5kaWYK ICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlwdGlvbj4gdGl0bGUx Rm9udDsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlwdGlvbj4g dGl0bGUyRm9udDsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udENhc2NhZGVEZXNjcmlw dGlvbj4gdGl0bGUzRm9udDsKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+ PSAxMTAwMDAKKyNpZiBIQVZFKFNZU1RFTV9GT05UX1NUWUxFX1RJVExFXzQpCiAgICAgc3RhdGlj IE5ldmVyRGVzdHJveWVkPEZvbnRDYXNjYWRlRGVzY3JpcHRpb24+IHRpdGxlNEZvbnQ7CiAjZW5k aWYKIApAQCAtMTE5Nyw3ICsxMTk3LDcgQEAgRm9udENhc2NhZGVEZXNjcmlwdGlvbiYgUmVuZGVy VGhlbWVJT1M6OgogICAgICAgICByZXR1cm4gaGVhZGxpbmVGb250OwogICAgIGNhc2UgQ1NTVmFs dWVBcHBsZVN5c3RlbUJvZHk6CiAgICAgICAgIHJldHVybiBib2R5Rm9udDsKLSNpZiBfX0lQSE9O RV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKyNpZiBIQVZFKFNZU1RFTV9GT05U X1NUWUxFX1RJVExFXzApCiAgICAgY2FzZSBDU1NWYWx1ZUFwcGxlU3lzdGVtVGl0bGUwOgogICAg ICAgICByZXR1cm4gdGl0bGUwRm9udDsKICNlbmRpZgpAQCAtMTIwNyw3ICsxMjA3LDcgQEAgRm9u dENhc2NhZGVEZXNjcmlwdGlvbiYgUmVuZGVyVGhlbWVJT1M6OgogICAgICAgICByZXR1cm4gdGl0 bGUyRm9udDsKICAgICBjYXNlIENTU1ZhbHVlQXBwbGVTeXN0ZW1UaXRsZTM6CiAgICAgICAgIHJl dHVybiB0aXRsZTNGb250OwotI2lmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDExMDAwMAorI2lmIEhBVkUoU1lTVEVNX0ZPTlRfU1RZTEVfVElUTEVfNCkKICAgICBjYXNlIENT U1ZhbHVlQXBwbGVTeXN0ZW1UaXRsZTQ6CiAgICAgICAgIHJldHVybiB0aXRsZTRGb250OwogI2Vu ZGlmCkBAIC0xMjY2LDcgKzEyNjYsNyBAQCB2b2lkIFJlbmRlclRoZW1lSU9TOjp1cGRhdGVDYWNo ZWRTeXN0ZW1GCiAgICAgICAgIHRleHRTdHlsZSA9IGtDVFVJRm9udFRleHRTdHlsZUJvZHk7CiAg ICAgICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0 aFRleHRTdHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgbnVsbHB0cikpOwog ICAgICAgICBicmVhazsKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MTAwMDAKKyNpZiBIQVZFKFNZU1RFTV9GT05UX1NUWUxFX1RJVExFXzApCiAgICAgY2FzZSBDU1NW YWx1ZUFwcGxlU3lzdGVtVGl0bGUwOgogICAgICAgICB0ZXh0U3R5bGUgPSBrQ1RVSUZvbnRUZXh0 U3R5bGVUaXRsZTA7CiAgICAgICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRTaXplQ2F0ZWdvcnko KSwgbnVsbHB0cikpOwpAQCAtMTI4NCw3ICsxMjg0LDcgQEAgdm9pZCBSZW5kZXJUaGVtZUlPUzo6 dXBkYXRlQ2FjaGVkU3lzdGVtRgogICAgICAgICB0ZXh0U3R5bGUgPSBrQ1RVSUZvbnRUZXh0U3R5 bGVUaXRsZTM7CiAgICAgICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlw dG9yQ3JlYXRlV2l0aFRleHRTdHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwg bnVsbHB0cikpOwogICAgICAgICBicmVhazsKLSNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMTAwMDAKKyNpZiBIQVZFKFNZU1RFTV9GT05UX1NUWUxFX1RJVExFXzQpCiAg ICAgY2FzZSBDU1NWYWx1ZUFwcGxlU3lzdGVtVGl0bGU0OgogICAgICAgICB0ZXh0U3R5bGUgPSBr Q1RVSUZvbnRUZXh0U3R5bGVUaXRsZTQ7CiAgICAgICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRD RihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZSh0ZXh0U3R5bGUsIGNvbnRlbnRT aXplQ2F0ZWdvcnkoKSwgbnVsbHB0cikpOwo=