155485 2016-03-14 22:25:53 -0700 <attachment> on iOS should use short and emphasized fonts 2020-09-06 16:13:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215707 P2 Normal --- 1 thorton thorton commit-queue enrica esprehn+autocc glenn kondapallykalyan sam simon.fraser oldest_to_newest 1174899 0 thorton 2016-03-14 22:25:53 -0700 <attachment> on iOS should use short and emphasized fonts 1174902 1 274074 thorton 2016-03-14 22:26:26 -0700 Created attachment 274074 Patch 1174911 2 274078 thorton 2016-03-14 22:58:34 -0700 Created attachment 274078 Patch 1175018 3 thorton 2016-03-15 11:26:02 -0700 http://trac.webkit.org/changeset/198217 274074 2016-03-14 22:26:26 -0700 2016-03-14 22:58:30 -0700 Patch bug-155485-20160314222612.patch text/plain 6252 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI2MzBiYjVhYjYxZWY3 NDE3Yzk5NzZmMGNjYjYzZTUwNTIzZmUwYS4uZDhiYWZlNDgwNDM0NmE5ZmVmMWE5MjU3Mzc0ZjEy NGQ4YTk5ZDEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTAzLTE0ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIDxhdHRhY2htZW50 PiBvbiBpT1Mgc2hvdWxkIHVzZSBzaG9ydCBhbmQgZW1waGFzaXplZCBmb250cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NDg1CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8yNDgwNTk5MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHM7IHRoZXJlIGFyZSBleGlzdGluZyB0ZXN0cyB0 aGF0IHdpbGwgYmUgZW5hYmxlZCBzaG9ydGx5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6YXR0YWNobWVudEFjdGlvbkZvbnQpOgor ICAgICAgICAoV2ViQ29yZTo6YXR0YWNobWVudFRpdGxlRm9udCk6CisgICAgICAgIChXZWJDb3Jl OjphdHRhY2htZW50U3VidGl0bGVGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkF0dGFjaG1lbnRJ bmZvOjpidWlsZFRpdGxlTGluZXMpOgorICAgICAgICAoV2ViQ29yZTo6QXR0YWNobWVudEluZm86 OmJ1aWxkU2luZ2xlTGluZSk6CisgICAgICAgIChXZWJDb3JlOjpBdHRhY2htZW50SW5mbzo6QXR0 YWNobWVudEluZm8pOgorICAgICAgICBObyBuZWVkIGZvciBVSUZvbnRzLCB3ZSBjYW4gdXNlIENv cmVUZXh0LCBhbmQgdGhhdCBhbGxvd3MgdXMgdG8gYXNrIGZvciB0aGUKKyAgICAgICAgY29ycmVj dCBTaG9ydCBhbmQgRW1waGFzaXplZCB2YXJpYW50cyB0aGF0IHdlIG5lZWQuCisKIDIwMTYtMDMt MTQgIFBlciBBcm5lIFZvbGxhbiAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtXaW5D YWlyb10gQ29tcGlsZSBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MubW0KaW5kZXggNTI4YjE0MzgzZTUxYzBiYTQwMWI1ZTI1MzVhNGQ2OTk5NjIwZWMyZC4uNmVh NjAyNmQxYmU5OTYwODY0MzY0NGUyNmQzYWYzZjI4MTIzNTU1MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtODEsMTEgKzgxLDggQEAgU09GVF9MSU5L X0ZSQU1FV09SSyhVSUtpdCkKIFNPRlRfTElOS19DTEFTUyhVSUtpdCwgVUlBcHBsaWNhdGlvbikK IFNPRlRfTElOS19DTEFTUyhVSUtpdCwgVUlDb2xvcikKIFNPRlRfTElOS19DTEFTUyhVSUtpdCwg VUlEb2N1bWVudEludGVyYWN0aW9uQ29udHJvbGxlcikKLVNPRlRfTElOS19DTEFTUyhVSUtpdCwg VUlGb250KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBVSUltYWdlKQogU09GVF9MSU5LX0NPTlNU QU5UKFVJS2l0LCBVSUNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2VOb3RpZmljYXRpb24sIENG U3RyaW5nUmVmKQotU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBVSUZvbnRUZXh0U3R5bGVGb290 bm90ZSwgTlNTdHJpbmcgKikKLVNPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlGb250VGV4dFN0 eWxlQ2FwdGlvbjEsIE5TU3RyaW5nICopCiAjZGVmaW5lIFVJQ29udGVudFNpemVDYXRlZ29yeURp ZENoYW5nZU5vdGlmaWNhdGlvbiBnZXRVSUNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2VOb3Rp ZmljYXRpb24oKQogCiBAaW50ZXJmYWNlIFdlYkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSA6IE5TT2Jq ZWN0CkBAIC0xMzUxLDE0ICsxMzQ4LDI2IEBAIGNvbnN0IENHRmxvYXQgYXR0YWNobWVudEl0ZW1N YXJnaW4gPSA4OwogY29uc3QgQ0dGbG9hdCBhdHRhY2htZW50VGl0bGVNYXhpbXVtV2lkdGggPSAx NDA7CiBjb25zdCBDRkluZGV4IGF0dGFjaG1lbnRUaXRsZU1heGltdW1MaW5lQ291bnQgPSAyOwog Ci0vLyBGSVhNRTogU2hvdWxkIGJlIGVtcGhhc2l6ZWQuCi1zdGF0aWMgVUlGb250ICphdHRhY2ht ZW50QWN0aW9uRm9udCgpIHsgcmV0dXJuIFtnZXRVSUZvbnRDbGFzcygpIHByZWZlcnJlZEZvbnRG b3JUZXh0U3R5bGU6Z2V0VUlGb250VGV4dFN0eWxlRm9vdG5vdGUoKV07IH0KK3N0YXRpYyBSZXRh aW5QdHI8Q1RGb250UmVmPiBhdHRhY2htZW50QWN0aW9uRm9udCgpCit7CisgICAgUmV0YWluUHRy PENURm9udERlc2NyaXB0b3JSZWY+IGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNj cmlwdG9yQ3JlYXRlV2l0aFRleHRTdHlsZShrQ1RVSUZvbnRUZXh0U3R5bGVTaG9ydEZvb3Rub3Rl LCBSZW5kZXJUaGVtZUlPUzo6Y29udGVudFNpemVDYXRlZ29yeSgpLCAwKSk7CisgICAgUmV0YWlu UHRyPENURm9udERlc2NyaXB0b3JSZWY+IGVtcGhhc2l6ZWRGb250RGVzY3JpcHRvciA9IGFkb3B0 Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZUNvcHlXaXRoQXR0cmlidXRlcyhmb250RGVzY3JpcHRv ci5nZXQoKSwKKyAgICAgICAgKENGRGljdGlvbmFyeVJlZilAeworICAgICAgICAgICAgKGlkKWtD VEZvbnREZXNjcmlwdG9yVGV4dFN0eWxlQXR0cmlidXRlOiAoaWQpa0NURm9udERlc2NyaXB0b3JU ZXh0U3R5bGVFbXBoYXNpemVkCisgICAgfSkpOworICAgIHJldHVybiBhZG9wdENGKENURm9udENy ZWF0ZVdpdGhGb250RGVzY3JpcHRvcihlbXBoYXNpemVkRm9udERlc2NyaXB0b3IuZ2V0KCksIDAs IG51bGxwdHIpKTsKK30KIHN0YXRpYyBVSUNvbG9yICphdHRhY2htZW50QWN0aW9uQ29sb3IoKSB7 IHJldHVybiBbZ2V0VUlDb2xvckNsYXNzKCkgc3lzdGVtQmx1ZUNvbG9yXTsgfQogCi1zdGF0aWMg VUlGb250ICphdHRhY2htZW50VGl0bGVGb250KCkgeyByZXR1cm4gW2dldFVJRm9udENsYXNzKCkg cHJlZmVycmVkRm9udEZvclRleHRTdHlsZTpnZXRVSUZvbnRUZXh0U3R5bGVDYXB0aW9uMSgpXTsg fQorc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0dGFjaG1lbnRUaXRsZUZvbnQoKQorewor ICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmb250RGVzY3JpcHRvciA9IGFkb3B0 Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhUZXh0U3R5bGUoa0NUVUlGb250VGV4dFN0eWxl U2hvcnRDYXB0aW9uMSwgUmVuZGVyVGhlbWVJT1M6OmNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgMCkp OworICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihmb250 RGVzY3JpcHRvci5nZXQoKSwgMCwgbnVsbHB0cikpOworfQorCiBzdGF0aWMgVUlDb2xvciAqYXR0 YWNobWVudFRpdGxlQ29sb3IoKSB7IHJldHVybiBbZ2V0VUlDb2xvckNsYXNzKCkgc3lzdGVtR3Jh eUNvbG9yXTsgfQogCi1zdGF0aWMgVUlGb250ICphdHRhY2htZW50U3VidGl0bGVGb250KCkgeyBy ZXR1cm4gW2dldFVJRm9udENsYXNzKCkgcHJlZmVycmVkRm9udEZvclRleHRTdHlsZTpnZXRVSUZv bnRUZXh0U3R5bGVDYXB0aW9uMSgpXTsgfQorc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGF0 dGFjaG1lbnRTdWJ0aXRsZUZvbnQoKSB7IHJldHVybiBhdHRhY2htZW50VGl0bGVGb250KCk7IH0K IHN0YXRpYyBVSUNvbG9yICphdHRhY2htZW50U3VidGl0bGVDb2xvcigpIHsgcmV0dXJuIFtnZXRV SUNvbG9yQ2xhc3MoKSBzeXN0ZW1HcmF5Q29sb3JdOyB9CiAKIHN0cnVjdCBBdHRhY2htZW50SW5m byB7CkBAIC0xMzg1LDcgKzEzOTQsNyBAQCBzdHJ1Y3QgQXR0YWNobWVudEluZm8gewogCiBwcml2 YXRlOgogICAgIHZvaWQgYnVpbGRUaXRsZUxpbmVzKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmKTsK LSAgICB2b2lkIGJ1aWxkU2luZ2xlTGluZShjb25zdCBTdHJpbmcmLCBVSUZvbnQgKiwgVUlDb2xv ciAqKTsKKyAgICB2b2lkIGJ1aWxkU2luZ2xlTGluZShjb25zdCBTdHJpbmcmLCBDVEZvbnRSZWYs IFVJQ29sb3IgKik7CiAKICAgICB2b2lkIGFkZExpbmUoQ1RMaW5lUmVmKTsKIH07CkBAIC0xNDA3 LDE0ICsxNDE2LDE0IEBAIHZvaWQgQXR0YWNobWVudEluZm86OmFkZExpbmUoQ1RMaW5lUmVmIGxp bmUpCiAKIHZvaWQgQXR0YWNobWVudEluZm86OmJ1aWxkVGl0bGVMaW5lcyhjb25zdCBSZW5kZXJB dHRhY2htZW50JiBhdHRhY2htZW50KQogewotICAgIFJldGFpblB0cjxVSUZvbnQ+IGZvbnQgPSBh dHRhY2htZW50VGl0bGVGb250KCk7CisgICAgUmV0YWluUHRyPENURm9udFJlZj4gZm9udCA9IGF0 dGFjaG1lbnRUaXRsZUZvbnQoKTsKIAogICAgIFN0cmluZyB0aXRsZSA9IGF0dGFjaG1lbnQuYXR0 YWNobWVudEVsZW1lbnQoKS5hdHRhY2htZW50VGl0bGUoKTsKICAgICBpZiAodGl0bGUuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBOU0RpY3Rpb25hcnkgKnRleHRBdHRyaWJ1dGVz ID0gQHsKLSAgICAgICAgKGlkKWtDVEZvbnRBdHRyaWJ1dGVOYW1lOiBmb250LmdldCgpLAorICAg ICAgICAoaWQpa0NURm9udEF0dHJpYnV0ZU5hbWU6IChpZClmb250LmdldCgpLAogICAgICAgICAo aWQpa0NURm9yZWdyb3VuZENvbG9yQXR0cmlidXRlTmFtZTogYXR0YWNobWVudFRpdGxlQ29sb3Io KQogICAgIH07CiAgICAgUmV0YWluUHRyPE5TQXR0cmlidXRlZFN0cmluZz4gYXR0cmlidXRlZFRp dGxlID0gYWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6 dGl0bGUgYXR0cmlidXRlczp0ZXh0QXR0cmlidXRlc10pOwpAQCAtMTQ1OCwxMyArMTQ2NywxMyBA QCB2b2lkIEF0dGFjaG1lbnRJbmZvOjpidWlsZFRpdGxlTGluZXMoY29uc3QgUmVuZGVyQXR0YWNo bWVudCYgYXR0YWNobWVudCkKICAgICBhZGRMaW5lKHRydW5jYXRlZExpbmUuZ2V0KCkpOwogfQog Ci12b2lkIEF0dGFjaG1lbnRJbmZvOjpidWlsZFNpbmdsZUxpbmUoY29uc3QgU3RyaW5nJiB0ZXh0 LCBVSUZvbnQgKmZvbnQsIFVJQ29sb3IgKmNvbG9yKQordm9pZCBBdHRhY2htZW50SW5mbzo6YnVp bGRTaW5nbGVMaW5lKGNvbnN0IFN0cmluZyYgdGV4dCwgQ1RGb250UmVmIGZvbnQsIFVJQ29sb3Ig KmNvbG9yKQogewogICAgIGlmICh0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgTlNEaWN0aW9uYXJ5ICp0ZXh0QXR0cmlidXRlcyA9IEB7Ci0gICAgICAgIChpZClrQ1RGb250 QXR0cmlidXRlTmFtZTogZm9udCwKKyAgICAgICAgKGlkKWtDVEZvbnRBdHRyaWJ1dGVOYW1lOiAo aWQpZm9udCwKICAgICAgICAgKGlkKWtDVEZvcmVncm91bmRDb2xvckF0dHJpYnV0ZU5hbWU6IGNv bG9yCiAgICAgfTsKICAgICBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3RyaW5nPiBhdHRyaWJ1dGVk VGV4dCA9IGFkb3B0TlMoW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxsb2NdIGluaXRXaXRoU3RyaW5n OnRleHQgYXR0cmlidXRlczp0ZXh0QXR0cmlidXRlc10pOwpAQCAtMTU1MSwxMCArMTU2MCwxMCBA QCBBdHRhY2htZW50SW5mbzo6QXR0YWNobWVudEluZm8oY29uc3QgUmVuZGVyQXR0YWNobWVudCYg YXR0YWNobWVudCkKICAgICAgICAgICAgIHlPZmZzZXQgKz0gaWNvblJlY3QuaGVpZ2h0KCkgKyBh dHRhY2htZW50SXRlbU1hcmdpbjsKICAgICAgICAgfQogICAgIH0gZWxzZQotICAgICAgICBidWls ZFNpbmdsZUxpbmUoYWN0aW9uLCBhdHRhY2htZW50QWN0aW9uRm9udCgpLCBhdHRhY2htZW50QWN0 aW9uQ29sb3IoKSk7CisgICAgICAgIGJ1aWxkU2luZ2xlTGluZShhY3Rpb24sIGF0dGFjaG1lbnRB Y3Rpb25Gb250KCkuZ2V0KCksIGF0dGFjaG1lbnRBY3Rpb25Db2xvcigpKTsKIAogICAgIGJ1aWxk VGl0bGVMaW5lcyhhdHRhY2htZW50KTsKLSAgICBidWlsZFNpbmdsZUxpbmUoc3VidGl0bGUsIGF0 dGFjaG1lbnRTdWJ0aXRsZUZvbnQoKSwgYXR0YWNobWVudFN1YnRpdGxlQ29sb3IoKSk7CisgICAg YnVpbGRTaW5nbGVMaW5lKHN1YnRpdGxlLCBhdHRhY2htZW50U3VidGl0bGVGb250KCkuZ2V0KCks IGF0dGFjaG1lbnRTdWJ0aXRsZUNvbG9yKCkpOwogCiAgICAgaWYgKCFsaW5lcy5pc0VtcHR5KCkp IHsKICAgICAgICAgZm9yIChhdXRvJiBsaW5lIDogbGluZXMpIHsK 274078 2016-03-14 22:58:34 -0700 2016-03-15 11:22:32 -0700 Patch bug-155485-20160314225822.patch text/plain 6850 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI2MzBiYjVhYjYxZWY3 NDE3Yzk5NzZmMGNjYjYzZTUwNTIzZmUwYS4uZDhiYWZlNDgwNDM0NmE5ZmVmMWE5MjU3Mzc0ZjEy NGQ4YTk5ZDEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTAzLTE0ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIDxhdHRhY2htZW50 PiBvbiBpT1Mgc2hvdWxkIHVzZSBzaG9ydCBhbmQgZW1waGFzaXplZCBmb250cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NDg1CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8yNDgwNTk5MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHM7IHRoZXJlIGFyZSBleGlzdGluZyB0ZXN0cyB0 aGF0IHdpbGwgYmUgZW5hYmxlZCBzaG9ydGx5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6YXR0YWNobWVudEFjdGlvbkZvbnQpOgor ICAgICAgICAoV2ViQ29yZTo6YXR0YWNobWVudFRpdGxlRm9udCk6CisgICAgICAgIChXZWJDb3Jl OjphdHRhY2htZW50U3VidGl0bGVGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkF0dGFjaG1lbnRJ bmZvOjpidWlsZFRpdGxlTGluZXMpOgorICAgICAgICAoV2ViQ29yZTo6QXR0YWNobWVudEluZm86 OmJ1aWxkU2luZ2xlTGluZSk6CisgICAgICAgIChXZWJDb3JlOjpBdHRhY2htZW50SW5mbzo6QXR0 YWNobWVudEluZm8pOgorICAgICAgICBObyBuZWVkIGZvciBVSUZvbnRzLCB3ZSBjYW4gdXNlIENv cmVUZXh0LCBhbmQgdGhhdCBhbGxvd3MgdXMgdG8gYXNrIGZvciB0aGUKKyAgICAgICAgY29ycmVj dCBTaG9ydCBhbmQgRW1waGFzaXplZCB2YXJpYW50cyB0aGF0IHdlIG5lZWQuCisKIDIwMTYtMDMt MTQgIFBlciBBcm5lIFZvbGxhbiAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtXaW5D YWlyb10gQ29tcGlsZSBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9z cGkvY29jb2EvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2Nv YS9Db3JlVGV4dFNQSS5oCmluZGV4IDAzMGQyYWE3ZWYzOTlkMDlhODQzZDI1ZTgzMDVlNTc0Y2Q4 MTg2NzcuLmM0ZjE0ZjJjMmEzNzI4N2ZjNGJlMjRjNTBmNjI2ZWUwYmFjODlkOTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCkBAIC04NSw2 ICs4NSw4IEBAIHR5cGVkZWYgQ0ZfT1BUSU9OUyh1aW50MzJfdCwgQ1RGb250RGVzY3JpcHRvck9w dGlvbnMpCiB9OwogCiBDVEZvbnREZXNjcmlwdG9yUmVmIENURm9udERlc2NyaXB0b3JDcmVhdGVX aXRoQXR0cmlidXRlc0FuZE9wdGlvbnMoQ0ZEaWN0aW9uYXJ5UmVmIGF0dHJpYnV0ZXMsIENURm9u dERlc2NyaXB0b3JPcHRpb25zKTsKKworZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZvbnRE ZXNjcmlwdG9yVGV4dFN0eWxlQXR0cmlidXRlOwogI2VuZGlmCiAjZW5kaWYKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCmluZGV4IDUyOGIxNDM4M2U1MWMwYmE0 MDFiNWUyNTM1YTRkNjk5OTYyMGVjMmQuLjZlYTYwMjZkMWJlOTk2MDg2NDM2NDRlMjZkM2FmM2Yy ODEyMzU1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0K QEAgLTgxLDExICs4MSw4IEBAIFNPRlRfTElOS19GUkFNRVdPUksoVUlLaXQpCiBTT0ZUX0xJTktf Q0xBU1MoVUlLaXQsIFVJQXBwbGljYXRpb24pCiBTT0ZUX0xJTktfQ0xBU1MoVUlLaXQsIFVJQ29s b3IpCiBTT0ZUX0xJTktfQ0xBU1MoVUlLaXQsIFVJRG9jdW1lbnRJbnRlcmFjdGlvbkNvbnRyb2xs ZXIpCi1TT0ZUX0xJTktfQ0xBU1MoVUlLaXQsIFVJRm9udCkKIFNPRlRfTElOS19DTEFTUyhVSUtp dCwgVUlJbWFnZSkKIFNPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlDb250ZW50U2l6ZUNhdGVn b3J5RGlkQ2hhbmdlTm90aWZpY2F0aW9uLCBDRlN0cmluZ1JlZikKLVNPRlRfTElOS19DT05TVEFO VChVSUtpdCwgVUlGb250VGV4dFN0eWxlRm9vdG5vdGUsIE5TU3RyaW5nICopCi1TT0ZUX0xJTktf Q09OU1RBTlQoVUlLaXQsIFVJRm9udFRleHRTdHlsZUNhcHRpb24xLCBOU1N0cmluZyAqKQogI2Rl ZmluZSBVSUNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2VOb3RpZmljYXRpb24gZ2V0VUlDb250 ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdlTm90aWZpY2F0aW9uKCkKIAogQGludGVyZmFjZSBXZWJD b3JlUmVuZGVyVGhlbWVCdW5kbGUgOiBOU09iamVjdApAQCAtMTM1MSwxNCArMTM0OCwyNiBAQCBj b25zdCBDR0Zsb2F0IGF0dGFjaG1lbnRJdGVtTWFyZ2luID0gODsKIGNvbnN0IENHRmxvYXQgYXR0 YWNobWVudFRpdGxlTWF4aW11bVdpZHRoID0gMTQwOwogY29uc3QgQ0ZJbmRleCBhdHRhY2htZW50 VGl0bGVNYXhpbXVtTGluZUNvdW50ID0gMjsKIAotLy8gRklYTUU6IFNob3VsZCBiZSBlbXBoYXNp emVkLgotc3RhdGljIFVJRm9udCAqYXR0YWNobWVudEFjdGlvbkZvbnQoKSB7IHJldHVybiBbZ2V0 VUlGb250Q2xhc3MoKSBwcmVmZXJyZWRGb250Rm9yVGV4dFN0eWxlOmdldFVJRm9udFRleHRTdHls ZUZvb3Rub3RlKCldOyB9CitzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gYXR0YWNobWVudEFj dGlvbkZvbnQoKQoreworICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmb250RGVz Y3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhUZXh0U3R5bGUoa0NU VUlGb250VGV4dFN0eWxlU2hvcnRGb290bm90ZSwgUmVuZGVyVGhlbWVJT1M6OmNvbnRlbnRTaXpl Q2F0ZWdvcnkoKSwgMCkpOworICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBlbXBo YXNpemVkRm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVDb3B5 V2l0aEF0dHJpYnV0ZXMoZm9udERlc2NyaXB0b3IuZ2V0KCksCisgICAgICAgIChDRkRpY3Rpb25h cnlSZWYpQHsKKyAgICAgICAgICAgIChpZClrQ1RGb250RGVzY3JpcHRvclRleHRTdHlsZUF0dHJp YnV0ZTogKGlkKWtDVEZvbnREZXNjcmlwdG9yVGV4dFN0eWxlRW1waGFzaXplZAorICAgIH0pKTsK KyAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3IoZW1waGFz aXplZEZvbnREZXNjcmlwdG9yLmdldCgpLCAwLCBudWxscHRyKSk7Cit9CiBzdGF0aWMgVUlDb2xv ciAqYXR0YWNobWVudEFjdGlvbkNvbG9yKCkgeyByZXR1cm4gW2dldFVJQ29sb3JDbGFzcygpIHN5 c3RlbUJsdWVDb2xvcl07IH0KIAotc3RhdGljIFVJRm9udCAqYXR0YWNobWVudFRpdGxlRm9udCgp IHsgcmV0dXJuIFtnZXRVSUZvbnRDbGFzcygpIHByZWZlcnJlZEZvbnRGb3JUZXh0U3R5bGU6Z2V0 VUlGb250VGV4dFN0eWxlQ2FwdGlvbjEoKV07IH0KK3N0YXRpYyBSZXRhaW5QdHI8Q1RGb250UmVm PiBhdHRhY2htZW50VGl0bGVGb250KCkKK3sKKyAgICBSZXRhaW5QdHI8Q1RGb250RGVzY3JpcHRv clJlZj4gZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRo VGV4dFN0eWxlKGtDVFVJRm9udFRleHRTdHlsZVNob3J0Q2FwdGlvbjEsIFJlbmRlclRoZW1lSU9T Ojpjb250ZW50U2l6ZUNhdGVnb3J5KCksIDApKTsKKyAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRD cmVhdGVXaXRoRm9udERlc2NyaXB0b3IoZm9udERlc2NyaXB0b3IuZ2V0KCksIDAsIG51bGxwdHIp KTsKK30KKwogc3RhdGljIFVJQ29sb3IgKmF0dGFjaG1lbnRUaXRsZUNvbG9yKCkgeyByZXR1cm4g W2dldFVJQ29sb3JDbGFzcygpIHN5c3RlbUdyYXlDb2xvcl07IH0KIAotc3RhdGljIFVJRm9udCAq YXR0YWNobWVudFN1YnRpdGxlRm9udCgpIHsgcmV0dXJuIFtnZXRVSUZvbnRDbGFzcygpIHByZWZl cnJlZEZvbnRGb3JUZXh0U3R5bGU6Z2V0VUlGb250VGV4dFN0eWxlQ2FwdGlvbjEoKV07IH0KK3N0 YXRpYyBSZXRhaW5QdHI8Q1RGb250UmVmPiBhdHRhY2htZW50U3VidGl0bGVGb250KCkgeyByZXR1 cm4gYXR0YWNobWVudFRpdGxlRm9udCgpOyB9CiBzdGF0aWMgVUlDb2xvciAqYXR0YWNobWVudFN1 YnRpdGxlQ29sb3IoKSB7IHJldHVybiBbZ2V0VUlDb2xvckNsYXNzKCkgc3lzdGVtR3JheUNvbG9y XTsgfQogCiBzdHJ1Y3QgQXR0YWNobWVudEluZm8gewpAQCAtMTM4NSw3ICsxMzk0LDcgQEAgc3Ry dWN0IEF0dGFjaG1lbnRJbmZvIHsKIAogcHJpdmF0ZToKICAgICB2b2lkIGJ1aWxkVGl0bGVMaW5l cyhjb25zdCBSZW5kZXJBdHRhY2htZW50Jik7Ci0gICAgdm9pZCBidWlsZFNpbmdsZUxpbmUoY29u c3QgU3RyaW5nJiwgVUlGb250ICosIFVJQ29sb3IgKik7CisgICAgdm9pZCBidWlsZFNpbmdsZUxp bmUoY29uc3QgU3RyaW5nJiwgQ1RGb250UmVmLCBVSUNvbG9yICopOwogCiAgICAgdm9pZCBhZGRM aW5lKENUTGluZVJlZik7CiB9OwpAQCAtMTQwNywxNCArMTQxNiwxNCBAQCB2b2lkIEF0dGFjaG1l bnRJbmZvOjphZGRMaW5lKENUTGluZVJlZiBsaW5lKQogCiB2b2lkIEF0dGFjaG1lbnRJbmZvOjpi dWlsZFRpdGxlTGluZXMoY29uc3QgUmVuZGVyQXR0YWNobWVudCYgYXR0YWNobWVudCkKIHsKLSAg ICBSZXRhaW5QdHI8VUlGb250PiBmb250ID0gYXR0YWNobWVudFRpdGxlRm9udCgpOworICAgIFJl dGFpblB0cjxDVEZvbnRSZWY+IGZvbnQgPSBhdHRhY2htZW50VGl0bGVGb250KCk7CiAKICAgICBT dHJpbmcgdGl0bGUgPSBhdHRhY2htZW50LmF0dGFjaG1lbnRFbGVtZW50KCkuYXR0YWNobWVudFRp dGxlKCk7CiAgICAgaWYgKHRpdGxlLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg TlNEaWN0aW9uYXJ5ICp0ZXh0QXR0cmlidXRlcyA9IEB7Ci0gICAgICAgIChpZClrQ1RGb250QXR0 cmlidXRlTmFtZTogZm9udC5nZXQoKSwKKyAgICAgICAgKGlkKWtDVEZvbnRBdHRyaWJ1dGVOYW1l OiAoaWQpZm9udC5nZXQoKSwKICAgICAgICAgKGlkKWtDVEZvcmVncm91bmRDb2xvckF0dHJpYnV0 ZU5hbWU6IGF0dGFjaG1lbnRUaXRsZUNvbG9yKCkKICAgICB9OwogICAgIFJldGFpblB0cjxOU0F0 dHJpYnV0ZWRTdHJpbmc+IGF0dHJpYnV0ZWRUaXRsZSA9IGFkb3B0TlMoW1tOU0F0dHJpYnV0ZWRT dHJpbmcgYWxsb2NdIGluaXRXaXRoU3RyaW5nOnRpdGxlIGF0dHJpYnV0ZXM6dGV4dEF0dHJpYnV0 ZXNdKTsKQEAgLTE0NTgsMTMgKzE0NjcsMTMgQEAgdm9pZCBBdHRhY2htZW50SW5mbzo6YnVpbGRU aXRsZUxpbmVzKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQpCiAgICAgYWRkTGlu ZSh0cnVuY2F0ZWRMaW5lLmdldCgpKTsKIH0KIAotdm9pZCBBdHRhY2htZW50SW5mbzo6YnVpbGRT aW5nbGVMaW5lKGNvbnN0IFN0cmluZyYgdGV4dCwgVUlGb250ICpmb250LCBVSUNvbG9yICpjb2xv cikKK3ZvaWQgQXR0YWNobWVudEluZm86OmJ1aWxkU2luZ2xlTGluZShjb25zdCBTdHJpbmcmIHRl eHQsIENURm9udFJlZiBmb250LCBVSUNvbG9yICpjb2xvcikKIHsKICAgICBpZiAodGV4dC5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIE5TRGljdGlvbmFyeSAqdGV4dEF0dHJpYnV0 ZXMgPSBAewotICAgICAgICAoaWQpa0NURm9udEF0dHJpYnV0ZU5hbWU6IGZvbnQsCisgICAgICAg IChpZClrQ1RGb250QXR0cmlidXRlTmFtZTogKGlkKWZvbnQsCiAgICAgICAgIChpZClrQ1RGb3Jl Z3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lOiBjb2xvcgogICAgIH07CiAgICAgUmV0YWluUHRyPE5T QXR0cmlidXRlZFN0cmluZz4gYXR0cmlidXRlZFRleHQgPSBhZG9wdE5TKFtbTlNBdHRyaWJ1dGVk U3RyaW5nIGFsbG9jXSBpbml0V2l0aFN0cmluZzp0ZXh0IGF0dHJpYnV0ZXM6dGV4dEF0dHJpYnV0 ZXNdKTsKQEAgLTE1NTEsMTAgKzE1NjAsMTAgQEAgQXR0YWNobWVudEluZm86OkF0dGFjaG1lbnRJ bmZvKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQpCiAgICAgICAgICAgICB5T2Zm c2V0ICs9IGljb25SZWN0LmhlaWdodCgpICsgYXR0YWNobWVudEl0ZW1NYXJnaW47CiAgICAgICAg IH0KICAgICB9IGVsc2UKLSAgICAgICAgYnVpbGRTaW5nbGVMaW5lKGFjdGlvbiwgYXR0YWNobWVu dEFjdGlvbkZvbnQoKSwgYXR0YWNobWVudEFjdGlvbkNvbG9yKCkpOworICAgICAgICBidWlsZFNp bmdsZUxpbmUoYWN0aW9uLCBhdHRhY2htZW50QWN0aW9uRm9udCgpLmdldCgpLCBhdHRhY2htZW50 QWN0aW9uQ29sb3IoKSk7CiAKICAgICBidWlsZFRpdGxlTGluZXMoYXR0YWNobWVudCk7Ci0gICAg YnVpbGRTaW5nbGVMaW5lKHN1YnRpdGxlLCBhdHRhY2htZW50U3VidGl0bGVGb250KCksIGF0dGFj aG1lbnRTdWJ0aXRsZUNvbG9yKCkpOworICAgIGJ1aWxkU2luZ2xlTGluZShzdWJ0aXRsZSwgYXR0 YWNobWVudFN1YnRpdGxlRm9udCgpLmdldCgpLCBhdHRhY2htZW50U3VidGl0bGVDb2xvcigpKTsK IAogICAgIGlmICghbGluZXMuaXNFbXB0eSgpKSB7CiAgICAgICAgIGZvciAoYXV0byYgbGluZSA6 IGxpbmVzKSB7Cg==