143738 2015-04-14 16:12:59 -0700 Re-enable custom dilation for antialiased fonts 2015-04-14 17:27:42 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser mmaxfield simon.fraser thorton oldest_to_newest 1085311 0 simon.fraser 2015-04-14 16:12:59 -0700 Need to re-land the parts of r182516 that were reverted. 1085316 1 250754 simon.fraser 2015-04-14 16:16:34 -0700 Created attachment 250754 Patch 1085351 2 simon.fraser 2015-04-14 17:27:42 -0700 https://trac.webkit.org/r182824 250754 2015-04-14 16:16:34 -0700 2015-04-14 17:24:50 -0700 Patch 143738-patch.txt text/plain 12774 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OWZiNTMzNmI5YTkzN2E0YjU1NjgyYmE2YTQzMTU3ZWUzODdkNzVkLi4y MWU3MjAxNDE2MzMyZmM2Zjg4MmY5NGYzZGRlZmZmNTQxMDM1YWFjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTUtMDQtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmUtZW5hYmxlIGN1c3RvbSBkaWxhdGlvbiBmb3IgYW50aWFsaWFz ZWQgZm9udHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MzczOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgRW5hYmxpbmcgY3VzdG9tIGRpbGF0aW9uIGZvciBhbnRpYWxpc2VkIGZvbnRzIGJy b2tlIGxheW91dCB0ZXN0cywgc28gcmUtbGFuZCBpdCwKKyAgICAgICAgYnV0IGRpc2FibGUgaW4g V2ViS2l0VGVzdFJ1bm5lciBhbmQgRHVtcFJlbmRlclRyZWUuIFRoZSBsYXR0ZXIgcmVxdWlyZXMg YWRkaW5nCisgICAgICAgIGEgcHJpdmF0ZSBXZWJLaXQgcHJlZi4gVGhpcyBwcmVmIGRlZmF1bHRz IHRvIFlFUywgZW5hYmxpbmcgdGhlIGZlYXR1cmUgYnkgZGVmYXVsdAorICAgICAgICBpbiBXSzEg YXMgd2UgZG8gZm9yIFdLMi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0Zv bnRDYXNjYWRlQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpkaWxhdGlvblNpemVGb3JUZXh0 Q29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OmRyYXdHbHlwaHMpOgorCiAy MDE1LTA0LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQVNT RVJUKGZyYW1lKCkudmlldygpID09IHRoaXMpIGFzc2VydGlvbiBoaXQgaW4gRnJhbWVWaWV3Ojp3 aW5kb3dDbGlwUmVjdCgpIG9uIFdpbmRvd3MgYm90cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNjYWRlQ29jb2EubW0KaW5kZXgg ZWRkM2U0M2Q3OGVmNzRkYjRkNDJiZTk3MDY1ZmYzZWFmZDA1YzlkMC4uNGUwMmEwZTg3NWM4Mzlm ZTYxNzc3NThjYjUwNGFkMGYzYjM1ZWZiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tCkBAIC0yMDMs NiArMjAzLDI2IEBAIHN0YXRpYyB2b2lkIHNldENHRm9udFJlbmRlcmluZ01vZGUoQ0dDb250ZXh0 UmVmIGNnQ29udGV4dCwgTlNGb250UmVuZGVyaW5nTW9kZSByCiB9CiAjZW5kaWYKIAorI2lmIFBM QVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDExMDAK K3N0YXRpYyBDR1NpemUgZGlsYXRpb25TaXplRm9yVGV4dENvbG9yKGNvbnN0IENvbG9yJiBjb2xv cikKK3sKKyAgICBkb3VibGUgaHVlOworICAgIGRvdWJsZSBzYXR1cmF0aW9uOworICAgIGRvdWJs ZSBsaWdodG5lc3M7CisgICAgY29sb3IuZ2V0SFNMKGh1ZSwgc2F0dXJhdGlvbiwgbGlnaHRuZXNz KTsKKyAgICAKKyAgICAvLyBUaGVzZSB2YWx1ZXMgd2VyZSBkZXJpdmVkIGVtcGlyaWNhbGx5LCBh bmQgYXJlIG9ubHkgZXhwZXJpbWVudGFsLgorICAgIGlmIChsaWdodG5lc3MgPCAwLjMzMzMpIC8v IERhcmsKKyAgICAgICAgcmV0dXJuIENHU2l6ZU1ha2UoMC4wMDcsIDAuMDE5KTsKKworICAgIGlm IChsaWdodG5lc3MgPCAwLjY2NjcpIC8vIE1lZGl1bQorICAgICAgICByZXR1cm4gQ0dTaXplTWFr ZSgwLjAzMiwgMC4wMzIpOworCisgICAgLy8gTGlnaHQKKyAgICByZXR1cm4gQ0dTaXplTWFrZSgw LjA0NzUsIDAuMDM5KTsKK30KKyNlbmRpZgorCiB2b2lkIEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhz KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRm9udCogZm9udCwgY29uc3QgR2x5cGhC dWZmZXImIGdseXBoQnVmZmVyLCBpbnQgZnJvbSwgaW50IG51bUdseXBocywgY29uc3QgRmxvYXRQ b2ludCYgYW5jaG9yUG9pbnQpIGNvbnN0CiB7CiAgICAgY29uc3QgRm9udFBsYXRmb3JtRGF0YSYg cGxhdGZvcm1EYXRhID0gZm9udC0+cGxhdGZvcm1EYXRhKCk7CkBAIC0yNTcsNiArMjc3LDE3IEBA IHZvaWQgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBj b25zdCBGb250KiBmb250LCBjb25zdCBHCiAgICAgICAgIG9yaWdpbmFsU2hvdWxkVXNlRm9udFNt b290aGluZyA9IENHQ29udGV4dEdldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCk7CiAgICAg ICAgIENHQ29udGV4dFNldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCwgc2hvdWxkU21vb3Ro Rm9udHMpOwogICAgIH0KKyAgICAKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEwMTEwMAorICAgIENHRm9udEFudGlhbGlhc2luZ1N0eWxlIG9sZEFudGlhbGlhc2luZ1N0 eWxlOworICAgIGJvb2wgcmVzZXRBbnRpYWxpYXNpbmdTdHlsZSA9IGZhbHNlOworICAgIGlmIChh bnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoKSAmJiAhQ0dDb250ZXh0R2V0U2hvdWxkU21v b3RoRm9udHMoY2dDb250ZXh0KSAmJiBtYXRjaEFudGlhbGlhc2VkQW5kU21vb3RoZWRGb250cykg eworICAgICAgICByZXNldEFudGlhbGlhc2luZ1N0eWxlID0gdHJ1ZTsKKyAgICAgICAgb2xkQW50 aWFsaWFzaW5nU3R5bGUgPSBDR0NvbnRleHRHZXRGb250QW50aWFsaWFzaW5nU3R5bGUoY2dDb250 ZXh0KTsKKyAgICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2luZ1N0eWxlKGNnQ29udGV4 dCwga0NHRm9udEFudGlhbGlhc2luZ1N0eWxlVW5maWx0ZXJlZEN1c3RvbURpbGF0aW9uKTsKKyAg ICAgICAgQ0dDb250ZXh0U2V0Rm9udERpbGF0aW9uKGNnQ29udGV4dCwgZGlsYXRpb25TaXplRm9y VGV4dENvbG9yKGNvbnRleHQtPmZpbGxDb2xvcigpKSk7CisgICAgfQorI2VuZGlmCiAjZW5kaWYK IAogI2lmICFQTEFURk9STShJT1MpCkBAIC0zNzQsNiArNDA1LDExIEBAIHZvaWQgRm9udENhc2Nh ZGU6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGb250KiBmb250 LCBjb25zdCBHCiAgICAgICAgIGNvbnRleHQtPnNldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRv d0JsdXIsIHNoYWRvd0NvbG9yLCBzaGFkb3dDb2xvclNwYWNlKTsKIAogI2lmICFQTEFURk9STShJ T1MpCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDExMDAKKyAgICBp ZiAocmVzZXRBbnRpYWxpYXNpbmdTdHlsZSkKKyAgICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlh bGlhc2luZ1N0eWxlKGNnQ29udGV4dCwgb2xkQW50aWFsaWFzaW5nU3R5bGUpOworI2VuZGlmCisg ICAgCiAgICAgaWYgKGNoYW5nZUZvbnRTbW9vdGhpbmcpCiAgICAgICAgIENHQ29udGV4dFNldFNo b3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCwgb3JpZ2luYWxTaG91bGRVc2VGb250U21vb3RoaW5n KTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGZlNTUxNDU3ZTYxODI4YzI0ZGRjNWIyMTNh Y2ZhN2ZjOWM2NDAzYjUuLjJjMTczYjM1MjUyYWQ2MzdiYmIzNGM5ZTdkZWVhYmU1ZWFiYjU5MTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNS0wNC0xNCAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZS1lbmFibGUgY3VzdG9t IGRpbGF0aW9uIGZvciBhbnRpYWxpYXNlZCBmb250cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNzM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBFbmFibGluZyBjdXN0b20gZGlsYXRpb24g Zm9yIGFudGlhbGlzZWQgZm9udHMgYnJva2UgbGF5b3V0IHRlc3RzLCBzbyByZS1sYW5kIGl0LAor ICAgICAgICBidXQgZGlzYWJsZSBpbiBXZWJLaXRUZXN0UnVubmVyIGFuZCBEdW1wUmVuZGVyVHJl ZS4gVGhlIGxhdHRlciByZXF1aXJlcyBhZGRpbmcKKyAgICAgICAgYSBwcml2YXRlIFdlYktpdCBw cmVmLiBUaGlzIHByZWYgZGVmYXVsdHMgdG8gWUVTLCBlbmFibGluZyB0aGUgZmVhdHVyZSBieSBk ZWZhdWx0CisgICAgICAgIGluIFdLMSBhcyB3ZSBkbyBmb3IgV0syLgorCisgICAgICAgICogV2Vi Vmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlBy ZWZlcmVuY2VzLm1tOgorICAgICAgICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFsaXplXSk6Cisg ICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxl ZDpdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgYW50aWFsaWFzZWRGb250RGlsYXRpb25F bmFibGVkXSk6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVu Y2VzQ2hhbmdlZDpdKToKKwogMjAxNS0wNC0xMyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgU2hhcmUgc2hlZXRzIGZyb20gU2hhcmUgbWVudXMgYXBwZWFyIG91 dHNpZGUgdGhlIGJyb3dzZXIgd2luZG93LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKaW5kZXggYmVlYzIzMDIwZTA3ZWFmYmNk MThiMmUxOWRkN2IwMTZhMmI4ZjY3Yi4uYWQ1ZDdlOWM1ZDY4ZmU5ZmNkZGQ0ZjkwOTYxZjJlNWEx MDlhZWRkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJl bmNlS2V5c1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZl cmVuY2VLZXlzUHJpdmF0ZS5oCkBAIC0xNTksNiArMTU5LDcgQEAKICNkZWZpbmUgV2ViS2l0UERG RGlzcGxheU1vZGVQcmVmZXJlbmNlS2V5IEAiV2ViS2l0UERGRGlzcGxheU1vZGUiCiAjZGVmaW5l IFdlYktpdFBERlNjYWxlRmFjdG9yUHJlZmVyZW5jZUtleSBAIldlYktpdFBERlNjYWxlRmFjdG9y IgogI2VuZGlmCisKICNkZWZpbmUgV2ViS2l0VXNlU2l0ZVNwZWNpZmljU3Bvb2ZpbmdQcmVmZXJl bmNlS2V5IEAiV2ViS2l0VXNlU2l0ZVNwZWNpZmljU3Bvb2ZpbmciCiAjZGVmaW5lIFdlYktpdEVk aXRhYmxlTGlua0JlaGF2aW9yUHJlZmVyZW5jZUtleSBAIldlYktpdEVkaXRhYmxlTGlua0JlaGF2 aW9yIgogI2RlZmluZSBXZWJLaXRDYWNoZU1vZGVsUHJlZmVyZW5jZUtleSBAIldlYktpdENhY2hl TW9kZWxQcmVmZXJlbmNlS2V5IgpAQCAtMTY3LDEwICsxNjgsOSBAQAogI2RlZmluZSBXZWJLaXRC YWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZEtleSBAIldlYktpdEJhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkIgogI2RlZmluZSBXZWJLaXRJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNz aW9uVGltZW91dEluU2Vjb25kc0tleSBAIldlYktpdEluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJl c3Npb25UaW1lb3V0SW5TZWNvbmRzIgogI2RlZmluZSBXZWJLaXRXYW50c0JhbGFuY2VkU2V0RGVm ZXJzTG9hZGluZ0JlaGF2aW9yS2V5IEAiV2ViS2l0V2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRp bmdCZWhhdmlvciIKLQogI2RlZmluZSBXZWJLaXREZWJ1Z0Z1bGxQYWdlWm9vbVByZWZlcmVuY2VL ZXkgQCJXZWJLaXREZWJ1Z0Z1bGxQYWdlWm9vbVByZWZlcmVuY2VLZXkiCi0KICNkZWZpbmUgV2Vi S2l0TWluaW11bVpvb21Gb250U2l6ZVByZWZlcmVuY2VLZXkgQCJXZWJLaXRNaW5pbXVtWm9vbUZv bnRTaXplUHJlZmVyZW5jZUtleSIKKyNkZWZpbmUgV2ViS2l0QW50aWFsaWFzZWRGb250RGlsYXRp b25FbmFibGVkS2V5IEAiQW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkIgogCiAjaWYgVEFS R0VUX09TX0lQSE9ORQogI2RlZmluZSBXZWJLaXRTdGFuZGFsb25lUHJlZmVyZW5jZUtleSBAIldl YktpdFN0YW5kYWxvbmVQcmVmZXJlbmNlS2V5IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZXMubW0KaW5kZXggYmY3MjQxMGU1NDY4N2YxMGQ0MjVmMDQxOWVhYWEyMjVi NTQ4Y2UzNy4uZjMyMzYxNzMxMWViOTAxOWNjNmQzZDU2NTQ2NTJkYTZkYTI2M2FhMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCkBAIC00MTcsNiArNDE3 LDcgQEAgcHVibGljOgogICAgICAgICBAIjAiLCAgICAgICAgICAgICAgICAgICAgICAgICAgIFdl YktpdE1pbmltdW1Gb250U2l6ZVByZWZlcmVuY2VLZXksCiAgICAgICAgIEAiOSIsICAgICAgICAg ICAgICAgICAgICAgICAgICAgV2ViS2l0TWluaW11bUxvZ2ljYWxGb250U2l6ZVByZWZlcmVuY2VL ZXksIAogICAgICAgICBAIjE2IiwgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdERlZmF1 bHRGb250U2l6ZVByZWZlcmVuY2VLZXksCisgICAgICAgIEAoWUVTKSwgICAgICAgICAgICAgICAg ICAgICAgICAgV2ViS2l0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkS2V5LAogICAgICAg ICBAIjEzIiwgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdERlZmF1bHRGaXhlZEZvbnRT aXplUHJlZmVyZW5jZUtleSwKICAgICAgICAgQCJJU08tODg1OS0xIiwgICAgICAgICAgICAgICAg ICBXZWJLaXREZWZhdWx0VGV4dEVuY29kaW5nTmFtZVByZWZlcmVuY2VLZXksCiAgICAgICAgIFtO U051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0VXNlc0VuY29kaW5nRGV0ZWN0b3JQ cmVmZXJlbmNlS2V5LApAQCAtMjQ4Myw2ICsyNDg0LDE2IEBAIHN0YXRpYyBOU1N0cmluZyAqY2xh c3NJQkNyZWF0b3JJRCA9IG5pbDsKICAgICBbc2VsZiBfc2V0U3RyaW5nVmFsdWU6ZGlyZWN0b3J5 IGZvcktleTpXZWJLaXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5S2V5XTsKIH0KIAorLSAodm9p ZClzZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQ6KEJPT0wpZW5hYmxlZAoreworICAg IFtzZWxmIF9zZXRCb29sVmFsdWU6ZW5hYmxlZCBmb3JLZXk6V2ViS2l0QW50aWFsaWFzZWRGb250 RGlsYXRpb25FbmFibGVkS2V5XTsKK30KKworLSAoQk9PTClhbnRpYWxpYXNlZEZvbnREaWxhdGlv bkVuYWJsZWQKK3sKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRBbnRp YWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWRLZXldOworfQorCiBAZW5kCiAKIEBpbXBsZW1lbnRh dGlvbiBXZWJQcmVmZXJlbmNlcyAoV2ViSW50ZXJuYWwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA1NDU1Mjc3N2U1OGY0YTI2 YjQ0MGZkYThkNDliOTk5MGRhYjVmMWE2Li4xMDQxMGY2Yjg1M2MzZTJkODM5YzBkZGNiYWJkNmNj ZjU0YWJhMmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZl cmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXNQcml2YXRlLmgKQEAgLTQzNiw2ICs0MzYsOSBAQCBleHRlcm4gTlNTdHJpbmcgKldlYlBy ZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5vdGlmaWNhdGlvbjsKIC0gKHZvaWQp c2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeTooTlNTdHJpbmcgKilkaXJlY3Rvcnk7CiAtIChO U1N0cmluZyAqKW1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnk7CiAKKy0gKHZvaWQpc2V0QW50aWFs aWFzZWRGb250RGlsYXRpb25FbmFibGVkOihCT09MKWZsYWc7CistIChCT09MKWFudGlhbGlhc2Vk Rm9udERpbGF0aW9uRW5hYmxlZDsKKwogI2lmIFRBUkdFVF9PU19JUEhPTkUgJiYgX19JUEhPTkVf T1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCA4MDAwMAogLSAodm9pZClfc2V0QWxsb3dDb21wb3Np dGluZ0xheWVyVmlzdWFsRGVncmFkYXRpb246KEJPT0wpZmxhZzsKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDgyNDE2YmUyNDZjZDRhMzkxYWRkNGNlZDE3MDJl MjNhYzc0NTRmYzAuLjlmNmQxMzkzNWY1ZjU5N2Q1NDgyMjU2OWUxYTk4MGFkNjUwNDM5ZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTIyMTIsNiArMjIxMiw3IEBAIHN0 YXRpYyBib29sIG5lZWRzU2VsZlJldGFpbldoaWxlTG9hZGluZ1F1aXJrKCkKICAgICBzZXR0aW5n cy5zZXRVc2VzRW5jb2RpbmdEZXRlY3RvcihbcHJlZmVyZW5jZXMgdXNlc0VuY29kaW5nRGV0ZWN0 b3JdKTsKICAgICBzZXR0aW5ncy5zZXRGYW50YXN5Rm9udEZhbWlseShbcHJlZmVyZW5jZXMgZmFu dGFzeUZvbnRGYW1pbHldKTsKICAgICBzZXR0aW5ncy5zZXRGaXhlZEZvbnRGYW1pbHkoW3ByZWZl cmVuY2VzIGZpeGVkRm9udEZhbWlseV0pOworICAgIHNldHRpbmdzLnNldEFudGlhbGlhc2VkRm9u dERpbGF0aW9uRW5hYmxlZChbcHJlZmVyZW5jZXMgYW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFi bGVkXSk7CiAgICAgc2V0dGluZ3Muc2V0Rm9yY2VGVFBEaXJlY3RvcnlMaXN0aW5ncyhbcHJlZmVy ZW5jZXMgX2ZvcmNlRlRQRGlyZWN0b3J5TGlzdGluZ3NdKTsKICAgICBzZXR0aW5ncy5zZXRGVFBE aXJlY3RvcnlUZW1wbGF0ZVBhdGgoW3ByZWZlcmVuY2VzIF9mdHBEaXJlY3RvcnlUZW1wbGF0ZVBh dGhdKTsKICAgICBzZXR0aW5ncy5zZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoW3ByZWZlcmVu Y2VzIF9sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGhdKTsKQEAgLTIyNTksOCArMjI2MCw2IEBAIHN0 YXRpYyBib29sIG5lZWRzU2VsZlJldGFpbldoaWxlTG9hZGluZ1F1aXJrKCkKICAgICBzZXR0aW5n cy5zZXRYU1NBdWRpdG9yRW5hYmxlZChbcHJlZmVyZW5jZXMgaXNYU1NBdWRpdG9yRW5hYmxlZF0p OwogICAgIHNldHRpbmdzLnNldEROU1ByZWZldGNoaW5nRW5hYmxlZChbcHJlZmVyZW5jZXMgaXNE TlNQcmVmZXRjaGluZ0VuYWJsZWRdKTsKICAgICAKLSAgICAvLyBGSVhNRTogRW5hYmxpbmcgYWNj ZWxlcmF0ZWQgY29tcG9zaXRpbmcgd2hlbiBXZWJHTCBpcyBlbmFibGVkIGNhdXNlcyB0ZXN0cyB0 byBmYWlsIG9uIExlb3BhcmQgd2hpY2ggZXhwZWN0IEhXIGNvbXBvc2l0aW5nIHRvIGJlIGRpc2Fi bGVkLgotICAgIC8vIFVudGlsIHdlIGZpeCB0aGF0LCBJIHdpbGwgY29tbWVudCBvdXQgdGhlIHRl c3QgKENGTSkKICAgICBzZXR0aW5ncy5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChb cHJlZmVyZW5jZXMgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRdKTsKICAgICBzZXR0aW5n cy5zZXRBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKFtwcmVmZXJlbmNlcyBhY2NlbGVyYXRlZERy YXdpbmdFbmFibGVkXSk7CiAgICAgc2V0dGluZ3Muc2V0Q2FudmFzVXNlc0FjY2VsZXJhdGVkRHJh d2luZyhbcHJlZmVyZW5jZXMgY2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZ10pOyAgICAKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmZDNkOTkw ZGVjMzFkYTU5NTljMDNlYzhjNmZkODg3MzhjMzA5MTdhLi5iOGIxMDk2NGEwYjU1NmY5MTRhOTc5 YTdiZDM4NjdmOTM2MzVkYjE1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTUtMDQtMTQgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmUtZW5hYmxlIGN1c3RvbSBkaWxh dGlvbiBmb3IgYW50aWFsaWFzZWQgZm9udHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzczOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorICAgICAgICAKKyAgICAgICAgRW5hYmxpbmcgY3VzdG9tIGRpbGF0aW9uIGZvciBh bnRpYWxpc2VkIGZvbnRzIGJyb2tlIGxheW91dCB0ZXN0cywgc28gcmUtbGFuZCBpdCwKKyAgICAg ICAgYnV0IGRpc2FibGUgaW4gV2ViS2l0VGVzdFJ1bm5lciBhbmQgRHVtcFJlbmRlclRyZWUuIFRo ZSBsYXR0ZXIgcmVxdWlyZXMgYWRkaW5nCisgICAgICAgIGEgcHJpdmF0ZSBXZWJLaXQgcHJlZi4g VGhpcyBwcmVmIGRlZmF1bHRzIHRvIFlFUywgZW5hYmxpbmcgdGhlIGZlYXR1cmUgYnkgZGVmYXVs dAorICAgICAgICBpbiBXSzEgYXMgd2UgZG8gZm9yIFdLMi4KKworICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAgKHJlc2V0V2ViUHJlZmVyZW5j ZXNUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cmVzZXRQcmVmZXJl bmNlc1RvQ29uc2lzdGVudFZhbHVlcyk6CisKIDIwMTUtMDQtMTQgIERhbmllbCBCYXRlcyAgPGRh YmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFNraXAgZmFpbGluZyB0ZXN0IFRlc3RzL1dlYktp dDJDb2NvYS9GaXhlZExheW91dFNpemUubW0gb24gaU9TCmRpZmYgLS1naXQgYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9t YWMvRHVtcFJlbmRlclRyZWUubW0KaW5kZXggNjg2MGIzN2Q5MzQwZDQ2ZDgyMTdmNmU5NWY2NTQ3 N2I2NDk3ZTc2Yy4uMTNlZWU1NjA2ZjU3NGQ1MjNiOGM1ODNmN2QyZmQ4Mzk1ZDJkYzc4NiAxMDA2 NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtODU2LDYgKzg1 Niw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0V2ViUHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMo KQogICAgIFtwcmVmZXJlbmNlcyBzZXRQaWN0b2dyYXBoRm9udEZhbWlseTpAIkFwcGxlIENvbG9y IEVtb2ppIl07CiAgICAgW3ByZWZlcmVuY2VzIHNldERlZmF1bHRGb250U2l6ZToxNl07CiAgICAg W3ByZWZlcmVuY2VzIHNldERlZmF1bHRGaXhlZEZvbnRTaXplOjEzXTsKKyAgICBbcHJlZmVyZW5j ZXMgc2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkOk5PXTsKICAgICBbcHJlZmVyZW5j ZXMgc2V0TWluaW11bUZvbnRTaXplOjBdOwogICAgIFtwcmVmZXJlbmNlcyBzZXREZWZhdWx0VGV4 dEVuY29kaW5nTmFtZTpAIklTTy04ODU5LTEiXTsKICAgICBbcHJlZmVyZW5jZXMgc2V0SmF2YUVu YWJsZWQ6Tk9dOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJv bGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAppbmRl eCAzYmFkYjc0YjQyMjRkYmM0YjhjZDVmZGM3ZmUzMDcxZDRhOTNmZTA2Li43Nzk5NDdjZjI5MGEw NzliM2I0NjkxYTA5ODAzNWZkODRhODU4NjlmIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rl c3RDb250cm9sbGVyLmNwcApAQCAtNTYwLDYgKzU2MCw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6 OnJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIFdLUHJlZmVyZW5jZXNS ZXNldFRlc3RSdW5uZXJPdmVycmlkZXMocHJlZmVyZW5jZXMpOwogICAgIFdLUHJlZmVyZW5jZXNT ZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwog ICAgIFdLUHJlZmVyZW5jZXNTZXRGb250U21vb3RoaW5nTGV2ZWwocHJlZmVyZW5jZXMsIGtXS0Zv bnRTbW9vdGhpbmdMZXZlbE5vU3VicGl4ZWxBbnRpQWxpYXNpbmcpOworICAgIFdLUHJlZmVyZW5j ZXNTZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQocHJlZmVyZW5jZXMsIGZhbHNlKTsK ICAgICBXS1ByZWZlcmVuY2VzU2V0WFNTQXVkaXRvckVuYWJsZWQocHJlZmVyZW5jZXMsIGZhbHNl KTsKICAgICBXS1ByZWZlcmVuY2VzU2V0V2ViQXVkaW9FbmFibGVkKHByZWZlcmVuY2VzLCB0cnVl KTsKICAgICBXS1ByZWZlcmVuY2VzU2V0TWVkaWFTdHJlYW1FbmFibGVkKHByZWZlcmVuY2VzLCB0 cnVlKTsK