63498 2011-06-27 17:30:08 -0700 [Freetype] Many tests report ERROR: Failed to get glyph page zero. 2011-06-29 14:03:31 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson mrobinson webkit.review.bot xan.lopez oldest_to_newest 428481 0 mrobinson 2011-06-27 17:30:08 -0700 Many tests report this error to the console: ERROR: Failed to get glyph page zero. 429324 1 99015 mrobinson 2011-06-28 18:01:55 -0700 Created attachment 99015 Patch 429340 2 mrobinson 2011-06-28 18:16:04 -0700 CCing Xan as I hope this can make it into 1.4.2. 429847 3 99015 xan.lopez 2011-06-29 13:49:29 -0700 Comment on attachment 99015 Patch OK, seems sane. 429861 4 99015 webkit.review.bot 2011-06-29 14:03:26 -0700 Comment on attachment 99015 Patch Clearing flags on attachment: 99015 Committed r90041: <http://trac.webkit.org/changeset/90041> 429862 5 webkit.review.bot 2011-06-29 14:03:31 -0700 All reviewed patches have been landed. Closing bug. 99015 2011-06-28 18:01:55 -0700 2011-06-29 14:03:26 -0700 Patch bug-63498-20110628180149.patch text/plain 11427 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODk2MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MzkzYzFlYWE1NTNhYmVk NmMwNDU4MmZkMjI0YzQyMzg2ZTJkOTY2Li43ZTJiNjFhNDA4M2FhNzBiMjAwMWU4N2UyMjg0MGJk ZmUwOWI5MWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDYtMjggIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtGcmVldHlwZV0gTWFueSB0ZXN0cyByZXBvcnQg RVJST1I6IEZhaWxlZCB0byBnZXQgZ2x5cGggcGFnZSB6ZXJvLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM0OTgKKworICAgICAgICBJbnN0ZWFkIG9m IGNvbmRpdGlvbmFsbHkgaW5zdGFudGlhdGluZyB0aGUgbV9zY2FsZWRGb250IG1lbWJlciBvZiBG b250UGxhdGZvcm1EYXRhLAorICAgICAgICBhbHdheXMgaW5zdGFudGlhdGUgaXQuIEZvciB0aW1l cyB3aGVuIHRoZSBzaXplIGlzIDAgYW5kIHRoZSBpbnN0YW50aWF0aW9uIHdvdWxkIGxlYWQKKyAg ICAgICAgdG8gYSBDYWlybyBlcnJvciwgd2UgdXNlIHNpemUgMSBhbmQganVzdCBtYWtlIG9wZXJh dGlvbnMgd2hpY2ggd291bGQgZmFpbCBjb25kaXRpb25hbAorICAgICAgICBvbiB0aGUgbV9zaXpl ID4gMC4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgY2hhbmdlIGlzIGNvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuIFdlIHNob3VsZAorICAgICAgICBvYnNlcnZlIG5vIGVycm9ycyBvbiB0 aGUgYm90cyBhZnRlciBsYW5kaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vRm9udENhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdHbHlwaHMpOiBJ bnN0ZWFkIG9mIGxvb2tpbmcgYXQgd2hldGhlciBvciBub3QgdGhlcmUgaXMKKyAgICAgICAgYSBz Y2FsZWQgZm9udCB0byBkZXRlcm1pbmUgd2hldGhlciB0byBkcmF3LCBqdXN0IGxvb2sgYXQgdGhl IHNpemUuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3Jt RGF0YS5oOiBSZW1vdmUgdGhlIG1fZm9udCBtZW1iZXIuCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcDogQWx3YXlzIGluc3Rh bnRpYXRlCisgICAgICAgIGEgc2NhbGVkIGZvbnQgbWVtYmVyIGFuZCByZW1vdmUgcmVmZXJlbmNl cyB0byBtX2ZvbnQuIElmIHdlIGFyZSBpbnN0YW50aWF0aW5nCisgICAgICAgIGEgc2NhbGVkIGZv bnQgZm9yIGEgMCBzaXplIGZvbnQsIGluc3RhbnRpYXRlIGEgc2l6ZSAxIGZvbnQsIHNvIHRoYXQg d2UgY2FuCisgICAgICAgIHN0aWxsIHVzZSBDYWlybyB0byBxdWVyeSBmb250IHByb3BlcnRpZXMu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvR2x5cGhQYWdlVHJlZU5vZGVG cmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaFBhZ2U6OmZpbGwpOiBXZSBjYW4g YXNzdW1lIHRoZXJlIGlzIGFsd2F5cyBhIHNjYWxlZCBmb250IG5vdy4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQpOiBEaXR0by4KKyAgICAg ICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRGb250RGF0YSk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmNvbnRhaW5zQ2hhcmFjdGVycyk6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtV2lkdGhG b3JHbHlwaCk6IERpdHRvLgorCiAyMDExLTA2LTIzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcAppbmRleCAx YWZmYzViMDdiZDkxNzZkZDNjNTdhMDdlNGZhNjM4ZGZjZjcyYTk0Li5mMjcwN2UyY2I5NmU5Njc2 MjFmODI1MjM0OTgxYTMzZmQ2MWRiYWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAKQEAgLTEwNiw3ICsxMDYsNyBAQCBz dGF0aWMgdm9pZCBkcmF3R2x5cGhzU2hhZG93KEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250 ZXh0LCBjb25zdCBGbG9hdFBvaW50Jgogdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29u dGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnQsIGNvbnN0IEdseXBoQnVm ZmVyJiBnbHlwaEJ1ZmZlciwKICAgICAgICAgICAgICAgICAgICAgICBpbnQgZnJvbSwgaW50IG51 bUdseXBocywgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7Ci0gICAgaWYgKCFmb250 LT5wbGF0Zm9ybURhdGEoKS5zY2FsZWRGb250KCkpCisgICAgaWYgKCFmb250LT5wbGF0Zm9ybURh dGEoKS5zaXplKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdseXBoQnVmZmVyR2x5cGgqIGds eXBocyA9IGNvbnN0X2Nhc3Q8R2x5cGhCdWZmZXJHbHlwaCo+KGdseXBoQnVmZmVyLmdseXBocyhm cm9tKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVl dHlwZS9Gb250UGxhdGZvcm1EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhLmgKaW5kZXggMDE4OTViZjJhNDFlZTQ2ZmUzNGI3 YjgwMTIxNGQxMWMxMGU5MWY3OS4uZDFjYjYwNTMwYjY1OTMyNGI4MzAzYzZlNWNlN2NhNDM5M2Zl ZjQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5 cGUvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtOTcsNyArOTcsNiBAQCBwdWJsaWM6 CiAgICAgYm9vbCBtX3N5bnRoZXRpY0JvbGQ7CiAgICAgYm9vbCBtX3N5bnRoZXRpY09ibGlxdWU7 CiAgICAgYm9vbCBtX2ZpeGVkV2lkdGg7Ci0gICAgUmVmUHRyPGNhaXJvX2ZvbnRfZmFjZV90PiBt X2ZvbnQ7CiAgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfdCogbV9zY2FsZWRGb250OwogCiBwcml2YXRl OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUv Rm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKaW5kZXggZGU1ODg0 NDU5Zjc5NTQ4NDhiNDE2OWEzY2JjNWJkOWI3MTEwNzM1Yy4uMWNhNWM5ZWE5Mzc3MzdkYmI3OWVl ZTYzN2VmYWRjZjg1ODBmNmRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJl ZVR5cGUuY3BwCkBAIC0xMjEsOCArMTIxLDggQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRm b3JtRGF0YShGY1BhdHRlcm4qIHBhdHRlcm4sIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm8KICAg ICAsIG1fZml4ZWRXaWR0aChmYWxzZSkKICAgICAsIG1fc2NhbGVkRm9udCgwKQogewotICAgIG1f Zm9udCA9IGFkb3B0UmVmKGNhaXJvX2Z0X2ZvbnRfZmFjZV9jcmVhdGVfZm9yX3BhdHRlcm4obV9w YXR0ZXJuLmdldCgpKSk7Ci0gICAgaW5pdGlhbGl6ZVdpdGhGb250RmFjZShtX2ZvbnQuZ2V0KCkp OworICAgIFJlZlB0cjxjYWlyb19mb250X2ZhY2VfdD4gZm9udEZhY2UgPSBhZG9wdFJlZihjYWly b19mdF9mb250X2ZhY2VfY3JlYXRlX2Zvcl9wYXR0ZXJuKG1fcGF0dGVybi5nZXQoKSkpOworICAg IGluaXRpYWxpemVXaXRoRm9udEZhY2UoZm9udEZhY2UuZ2V0KCkpOwogCiAgICAgaW50IHNwYWNp bmc7CiAgICAgaWYgKEZjUGF0dGVybkdldEludGVnZXIocGF0dGVybiwgRkNfU1BBQ0lORywgMCwg JnNwYWNpbmcpID09IEZjUmVzdWx0TWF0Y2ggJiYgc3BhY2luZyA9PSBGQ19NT05PKQpAQCAtMTUz LDE3ICsxNTMsMTQgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjYWlyb19m b250X2ZhY2VfdCogZm9udEZhY2UsIGZsb2F0IHNpemUsIGJvb2wKICAgICAsIG1fc3ludGhldGlj Qm9sZChib2xkKQogICAgICwgbV9zeW50aGV0aWNPYmxpcXVlKGl0YWxpYykKICAgICAsIG1fZml4 ZWRXaWR0aChmYWxzZSkKLSAgICAsIG1fZm9udChmb250RmFjZSkKICAgICAsIG1fc2NhbGVkRm9u dCgwKQogewogICAgIGluaXRpYWxpemVXaXRoRm9udEZhY2UoZm9udEZhY2UpOwogCi0gICAgaWYg KG1fc2NhbGVkRm9udCkgewotICAgICAgICBGVF9GYWNlIGZvbnRDb25maWdGYWNlID0gY2Fpcm9f ZnRfc2NhbGVkX2ZvbnRfbG9ja19mYWNlKG1fc2NhbGVkRm9udCk7Ci0gICAgICAgIGlmIChmb250 Q29uZmlnRmFjZSkgewotICAgICAgICAgICAgbV9maXhlZFdpZHRoID0gZm9udENvbmZpZ0ZhY2Ut PmZhY2VfZmxhZ3MgJiBGVF9GQUNFX0ZMQUdfRklYRURfV0lEVEg7Ci0gICAgICAgICAgICBjYWly b19mdF9zY2FsZWRfZm9udF91bmxvY2tfZmFjZShtX3NjYWxlZEZvbnQpOwotICAgICAgICB9Cisg ICAgRlRfRmFjZSBmb250Q29uZmlnRmFjZSA9IGNhaXJvX2Z0X3NjYWxlZF9mb250X2xvY2tfZmFj ZShtX3NjYWxlZEZvbnQpOworICAgIGlmIChmb250Q29uZmlnRmFjZSkgeworICAgICAgICBtX2Zp eGVkV2lkdGggPSBmb250Q29uZmlnRmFjZS0+ZmFjZV9mbGFncyAmIEZUX0ZBQ0VfRkxBR19GSVhF RF9XSURUSDsKKyAgICAgICAgY2Fpcm9fZnRfc2NhbGVkX2ZvbnRfdW5sb2NrX2ZhY2UobV9zY2Fs ZWRGb250KTsKICAgICB9CiB9CiAKQEAgLTE4OCw3ICsxODUsNiBAQCBGb250UGxhdGZvcm1EYXRh JiBGb250UGxhdGZvcm1EYXRhOjpvcGVyYXRvcj0oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3Ro ZXIpCiAgICAgaWYgKG1fc2NhbGVkRm9udCAmJiBtX3NjYWxlZEZvbnQgIT0gaGFzaFRhYmxlRGVs ZXRlZEZvbnRWYWx1ZSgpKQogICAgICAgICBjYWlyb19zY2FsZWRfZm9udF9kZXN0cm95KG1fc2Nh bGVkRm9udCk7CiAgICAgbV9zY2FsZWRGb250ID0gY2Fpcm9fc2NhbGVkX2ZvbnRfcmVmZXJlbmNl KG90aGVyLm1fc2NhbGVkRm9udCk7Ci0gICAgbV9mb250ID0gb3RoZXIubV9mb250OwogCiAgICAg cmV0dXJuICp0aGlzOwogfQpAQCAtMjMwLDcgKzIyNiw2IEBAIGJvb2wgRm9udFBsYXRmb3JtRGF0 YTo6b3BlcmF0b3I9PShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBvdGhlcikgY29uc3QKIHsKICAg ICByZXR1cm4gbV9wYXR0ZXJuID09IG90aGVyLm1fcGF0dGVybgogICAgICAgICAmJiBtX3NjYWxl ZEZvbnQgPT0gb3RoZXIubV9zY2FsZWRGb250Ci0gICAgICAgICYmIG1fZm9udCA9PSBvdGhlci5t X2ZvbnQKICAgICAgICAgJiYgbV9zaXplID09IG90aGVyLm1fc2l6ZQogICAgICAgICAmJiBtX3N5 bnRoZXRpY09ibGlxdWUgPT0gb3RoZXIubV9zeW50aGV0aWNPYmxpcXVlCiAgICAgICAgICYmIG1f c3ludGhldGljQm9sZCA9PSBvdGhlci5tX3N5bnRoZXRpY0JvbGQ7IApAQCAtMjQ1LDIwICsyNDAs MTggQEAgU3RyaW5nIEZvbnRQbGF0Zm9ybURhdGE6OmRlc2NyaXB0aW9uKCkgY29uc3QKIAogdm9p ZCBGb250UGxhdGZvcm1EYXRhOjppbml0aWFsaXplV2l0aEZvbnRGYWNlKGNhaXJvX2ZvbnRfZmFj ZV90KiBmb250RmFjZSkKIHsKLSAgICAvLyBGb250cyB3aXRoIHplcm8gc2l6ZSBsZWFkIHRvIGZh aWxlZCBjYWlyb19zY2FsZWRfZm9udF90IGluc3RhbnRpYXRpb25zLiBJbnN0ZWFkCi0gICAgLy8g d2UganVzdCBkbyBub3QgaW5zdGFudGlhdGUgdGhlIHNjYWxlZCBmb250IGF0IGFsbC4gVGhpcyB3 aWxsIGNhdXNlIGFsbCByZW5kZXJzCi0gICAgLy8gdG8gYmUgbm8tb3BzIGFuZCBhbGwgbWV0cmlj cyB0byBiZSB6ZXJvLCB3aGljaCBpcyB0aGUgZGVzaXJlZCBiZWhhdmlvciBhbnl3YXkuCi0gICAg aWYgKCFtX3NpemUpCi0gICAgICAgIHJldHVybjsKLQogICAgIGNhaXJvX2ZvbnRfb3B0aW9uc190 KiBvcHRpb25zID0gZ2V0RGVmYXVsdEZvbnRPcHRpb25zKCk7CiAKICAgICBjYWlyb19tYXRyaXhf dCBjdG07CiAgICAgY2Fpcm9fbWF0cml4X2luaXRfaWRlbnRpdHkoJmN0bSk7CiAKKyAgICAvLyBT Y2FsaW5nIGEgZm9udCB3aXRoIHdpZHRoIHplcm8gc2l6ZSBsZWFkcyB0byBhIGZhaWxlZCBjYWly b19zY2FsZWRfZm9udF90IGluc3RhbnRpYXRpb25zLgorICAgIC8vIEluc3RlYWQgd2Ugc2NhbGUg d2Ugc2NhbGUgdGhlIGZvbnQgdG8gYSB2ZXJ5IHRpbnkgc2l6ZSBhbmQganVzdCBhYm9ydCByZW5k ZXJpbmcgbGF0ZXIgb24uCisgICAgZmxvYXQgcmVhbFNpemUgPSBtX3NpemUgPyBtX3NpemUgOiAx OworCiAgICAgY2Fpcm9fbWF0cml4X3QgZm9udE1hdHJpeDsKICAgICBpZiAoIW1fcGF0dGVybikK LSAgICAgICAgY2Fpcm9fbWF0cml4X2luaXRfc2NhbGUoJmZvbnRNYXRyaXgsIG1fc2l6ZSwgbV9z aXplKTsKKyAgICAgICAgY2Fpcm9fbWF0cml4X2luaXRfc2NhbGUoJmZvbnRNYXRyaXgsIHJlYWxT aXplLCByZWFsU2l6ZSk7CiAgICAgZWxzZSB7CiAgICAgICAgIHNldENhaXJvRm9udE9wdGlvbnNG cm9tRm9udENvbmZpZ1BhdHRlcm4ob3B0aW9ucywgbV9wYXR0ZXJuLmdldCgpKTsKIApAQCAtMjcz LDggKzI2Niw4IEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6aW5pdGlhbGl6ZVdpdGhGb250RmFj ZShjYWlyb19mb250X2ZhY2VfdCogZm9udEZhY2UpCiAgICAgICAgIGNhaXJvX21hdHJpeF9pbml0 KCZmb250TWF0cml4LCBmb250Q29uZmlnTWF0cml4Lnh4LCAtZm9udENvbmZpZ01hdHJpeC55eCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgLWZvbnRDb25maWdNYXRyaXgueHksIGZvbnRDb25m aWdNYXRyaXgueXksIDAsIDApOwogCi0gICAgICAgIC8vIFRoZSBtYXRyaXggZnJvbSBGb250Q29u ZmlnIGRvZXMgbm90IGluY2x1ZGUgdGhlIHNjYWxlLgotICAgICAgICBjYWlyb19tYXRyaXhfc2Nh bGUoJmZvbnRNYXRyaXgsIG1fc2l6ZSwgbV9zaXplKTsKKyAgICAgICAgLy8gVGhlIG1hdHJpeCBm cm9tIEZvbnRDb25maWcgZG9lcyBub3QgaW5jbHVkZSB0aGUgc2NhbGUuIAorICAgICAgICBjYWly b19tYXRyaXhfc2NhbGUoJmZvbnRNYXRyaXgsIHJlYWxTaXplLCByZWFsU2l6ZSk7CiAgICAgfQog CiAgICAgbV9zY2FsZWRGb250ID0gY2Fpcm9fc2NhbGVkX2ZvbnRfY3JlYXRlKGZvbnRGYWNlLCAm Zm9udE1hdHJpeCwgJmN0bSwgb3B0aW9ucyk7CkBAIC0yODMsMTEgKzI3Niw3IEBAIHZvaWQgRm9u dFBsYXRmb3JtRGF0YTo6aW5pdGlhbGl6ZVdpdGhGb250RmFjZShjYWlyb19mb250X2ZhY2VfdCog Zm9udEZhY2UpCiAKIGJvb2wgRm9udFBsYXRmb3JtRGF0YTo6aGFzQ29tcGF0aWJsZUNoYXJtYXAo KQogewotICAgIC8vIElmIG1fc2NhbGVkRm9udCBpcyBudWxsLCBpdCBtZWFucyB0aGF0IHRoaXMg aXMgYSBzaXplIHplcm8gZm9udCwgd2hpY2ggYWx3YXlzCi0gICAgLy8gaGFzIGEgY29tcGF0aWJs ZSBjaGFybWFwIHNpbmNlIHdlIG5ldmVyIHJlYWxseSByZWFkIGFueSBmb250IGRhdGEgZnJvbSB0 aGUgZm9udC4KLSAgICBpZiAoIW1fc2NhbGVkRm9udCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0K KyAgICBBU1NFUlQobV9zY2FsZWRGb250KTsKICAgICBGVF9GYWNlIGZyZWVUeXBlRmFjZSA9IGNh aXJvX2Z0X3NjYWxlZF9mb250X2xvY2tfZmFjZShtX3NjYWxlZEZvbnQpOwogICAgIGJvb2wgaGFz Q29tcGF0aWJsZUNoYXJtYXAgPSAhKEZUX1NlbGVjdF9DaGFybWFwKGZyZWVUeXBlRmFjZSwgZnRf ZW5jb2RpbmdfdW5pY29kZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgRlRf U2VsZWN0X0NoYXJtYXAoZnJlZVR5cGVGYWNlLCBmdF9lbmNvZGluZ19zeW1ib2wpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9HbHlwaFBhZ2VU cmVlTm9kZUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL0dseXBoUGFnZVRyZWVOb2RlRnJlZVR5cGUuY3BwCmluZGV4IGEwMjEwNzhiN2Y3Nzgx MTQxMDE1ZjI5ODkwMWZiYTRjZTk5NzY3YmUuLjE3MGU3MGEyMjIxN2Y4NzExMDM3NzQ5YTNiYjE1 OWY5Y2JjNWIyMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2ZyZWV0eXBlL0dseXBoUGFnZVRyZWVOb2RlRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0dseXBoUGFnZVRyZWVOb2RlRnJlZVR5cGUu Y3BwCkBAIC00Niw4ICs0Niw3IEBAIGJvb2wgR2x5cGhQYWdlOjpmaWxsKHVuc2lnbmVkIG9mZnNl dCwgdW5zaWduZWQgbGVuZ3RoLCBVQ2hhciogYnVmZmVyLCB1bnNpZ25lZCBiCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgIGNhaXJvX3NjYWxlZF9mb250X3QqIHNjYWxlZEZvbnQgPSBmb250 RGF0YS0+cGxhdGZvcm1EYXRhKCkuc2NhbGVkRm9udCgpOwotICAgIGlmICghc2NhbGVkRm9udCkK LSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIEFTU0VSVChzY2FsZWRGb250KTsKIAogICAgIEZU X0ZhY2UgZmFjZSA9IGNhaXJvX2Z0X3NjYWxlZF9mb250X2xvY2tfZmFjZShzY2FsZWRGb250KTsK ICAgICBpZiAoIWZhY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCmlu ZGV4IDFkMjcwYzkzOTA3ODNmOTdiMzMyN2EyZjZlNjllNjBiMjI1NTJiNWYuLmZmNWVmMDJkMThl NTU3ODM5YzI5ZWM0MjdiMjFlM2IxZGE3NTI4NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnRE YXRhRnJlZVR5cGUuY3BwCkBAIC00Nyw5ICs0NywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiB7Ci0gICAgaWYgKCFtX3BsYXRm b3JtRGF0YS5zY2FsZWRGb250KCkpCisgICAgaWYgKCFtX3BsYXRmb3JtRGF0YS5tX3NpemUpCiAg ICAgICAgIHJldHVybjsKIAorICAgIEFTU0VSVChtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkp OwogICAgIGNhaXJvX2ZvbnRfZXh0ZW50c190IGZvbnRfZXh0ZW50czsKICAgICBjYWlyb190ZXh0 X2V4dGVudHNfdCB0ZXh0X2V4dGVudHM7CiAgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfZXh0ZW50cyht X3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCksICZmb250X2V4dGVudHMpOwpAQCAtOTEsNyArOTIs OCBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQogCiBQYXNzT3duUHRy PFNpbXBsZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6Y3JlYXRlU2NhbGVkRm9udERhdGEoY29u c3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0IHNjYWxlRmFjdG9yKSBj b25zdAogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgU2ltcGxlRm9udERhdGEoRm9udFBsYXRm b3JtRGF0YShtX3BsYXRmb3JtRGF0YS5tX2ZvbnQuZ2V0KCksCisgICAgQVNTRVJUKG1fcGxhdGZv cm1EYXRhLnNjYWxlZEZvbnQoKSk7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBTaW1wbGVGb250 RGF0YShGb250UGxhdGZvcm1EYXRhKGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X2ZhY2UobV9w bGF0Zm9ybURhdGEuc2NhbGVkRm9udCgpKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NhbGVGYWN0b3IgKiBmb250RGVzY3JpcHRpb24u Y29tcHV0ZWRTaXplKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fcGxhdGZvcm1EYXRhLnN5bnRoZXRpY0JvbGQoKSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9wbGF0Zm9y bURhdGEuc3ludGhldGljT2JsaXF1ZSgpKSwKQEAgLTEyMSwxMSArMTIzLDcgQEAgU2ltcGxlRm9u dERhdGEqIFNpbXBsZUZvbnREYXRhOjplbXBoYXNpc01hcmtGb250RGF0YShjb25zdCBGb250RGVz Y3JpcHRpb24mIGZvbnQKIAogYm9vbCBTaW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJz KGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBpbnQgbGVuZ3RoKSBjb25zdAogewotICAgIC8vIElm IHRoaXMgaXMgYSBuby1vcCBmb250ICh6ZXJvIHNpemUpLCB0aGVuIGl0IHNob3VsZCBhbHdheXMg Y29udGFpbiB0aGUgY2hhcmFjdGVycywKLSAgICAvLyBzaW5jZSB3ZSBuZXZlciByZWFkIGZyb20g b3IgcmVuZGVyIGZyb20gdGhpcyBmb250LgotICAgIGlmICghbV9wbGF0Zm9ybURhdGEuc2NhbGVk Rm9udCgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQorICAgIEFTU0VSVChtX3BsYXRmb3JtRGF0 YS5zY2FsZWRGb250KCkpOwogICAgIEZUX0ZhY2UgZmFjZSA9IGNhaXJvX2Z0X3NjYWxlZF9mb250 X2xvY2tfZmFjZShtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkpOwogICAgIGlmICghZmFjZSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTUzLDcgKzE1MSw3IEBAIEZsb2F0UmVjdCBTaW1w bGVGb250RGF0YTo6cGxhdGZvcm1Cb3VuZHNGb3JHbHlwaChHbHlwaCkgY29uc3QKIAogZmxvYXQg U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtV2lkdGhGb3JHbHlwaChHbHlwaCBnbHlwaCkgY29uc3QK IHsKLSAgICBpZiAoIW1fcGxhdGZvcm1EYXRhLnNjYWxlZEZvbnQoKSkKKyAgICBpZiAoIW1fcGxh dGZvcm1EYXRhLnNpemUoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBjYWlyb19nbHlwaF90 IGNnbHlwaCA9IHsgZ2x5cGgsIDAsIDAgfTsK