15536 2007-10-16 16:56:39 -0700 need to cache missing glyph so we're not slow on pages that show missing glyphs 2007-10-16 22:02:29 -0700 1 1 1 Unclassified WebKit Platform 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 58690 0 darin 2007-10-16 16:56:39 -0700 Right now the cache can't handle caching the missing glyph. 58691 1 16689 darin 2007-10-16 16:59:54 -0700 Created attachment 16689 patch to cache missing glyphs too 58692 2 16689 mitz 2007-10-16 17:32:27 -0700 Comment on attachment 16689 patch to cache missing glyphs too + glyphRecord = (ATSLayoutRecord *)((char *)glyphRecord + wkGetGlyphVectorRecordSize(glyphVector)); Looks like this was copied from Mac by mistake. 58693 3 16690 darin 2007-10-16 18:01:02 -0700 Created attachment 16690 patch to cache missing glyphs too (Windows fixed now) 58694 4 16690 mitz 2007-10-16 18:11:34 -0700 Comment on attachment 16690 patch to cache missing glyphs too (Windows fixed now) r=me 58700 5 darin 2007-10-16 22:02:29 -0700 Committed revision 26696. 16689 2007-10-16 16:59:54 -0700 2007-10-16 18:01:02 -0700 patch to cache missing glyphs too ZeroGlyphPatch.txt text/plain 7448 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjY5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDctMTAtMTYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTM2CisgICAgICAgICAg bmVlZCB0byBjYWNoZSBtaXNzaW5nIGdseXBoIHNvIHdlJ3JlIG5vdCBzbG93IG9uIHBhZ2VzIHRo YXQgc2hvdyBtaXNzaW5nIGdseXBocworCisgICAgICAgIC0gPHJkYXI6Ly9wcm9ibGVtLzU0MDQz NTk+IFVJIHRocmVhZCBzdGFsbCAoPjYwc2VjKSBpbiBNTEFORyBydW5uaW5nIHN0cmVzcyB0ZXN0 CisgICAgICAgICAgKHJlbGF0ZWQgdG8gZm9udCBkYXRhIGNhY2hpbmcpCisKKyAgICAgICAgKiBw bGF0Zm9ybS9Gb250LmNwcDogKFdlYkNvcmU6OkZvbnQ6OmdseXBoRGF0YUZvckNoYXJhY3Rlcik6 IENoZWNrIGZvciBhIG51bGwgdmFsdWUKKyAgICAgICAgZm9yIGZvbnREYXRhIHJhdGhlciB0aGFu IGZvciBnbHlwaCB0byBkZXRlY3Qgbm9uLWNhY2hlZCBlbnRyaWVzIGluIHRoZSBnbHlwaCBkYXRh LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0dseXBoUGFnZVRyZWVOb2RlR3RrLmNwcDogKFdl YkNvcmU6OkdseXBoUGFnZTo6ZmlsbCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL0dseXBoUGFn ZVRyZWVOb2RlTWFjLmNwcDogKFdlYkNvcmU6OkdseXBoUGFnZTo6ZmlsbCk6CisgICAgICAgICog cGxhdGZvcm0vd2luL0dseXBoUGFnZVRyZWVOb2RlV2luLmNwcDogKFdlYkNvcmU6OkdseXBoUGFn ZTo6ZmlsbCk6CisgICAgICAgIFNldCBmb250RGF0YSB0byAwIGZvciBtaXNzaW5nIGdseXBoIGVu dHJpZXMuIEFsc28gZml4ZWQgdGhlIFdpbmRvd3MgYW5kIEdUSyB2ZXJzaW9ucworICAgICAgICB0 byByZXR1cm4gdGhlIHByb3BlciB2YWx1ZSBmb3IgaGF2ZUdseXBocy4KKwogMjAwNy0xMC0xNiAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgLSB0cnkgdG8gZml4IHRo ZSBRdCBidWlsZApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9Gb250LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL0ZvbnQuY3BwCShyZXZpc2lvbiAyNjY4MikKKysrIFdlYkNvcmUv cGxhdGZvcm0vRm9udC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4NSw3ICszODUsNyBAQCBjb25z dCBHbHlwaERhdGEmIEZvbnQ6OmdseXBoRGF0YUZvckNoYXJhCiAgICAgICAgICAgICBwYWdlID0g bm9kZS0+cGFnZSgpOwogICAgICAgICAgICAgaWYgKHBhZ2UpIHsKICAgICAgICAgICAgICAgICBj b25zdCBHbHlwaERhdGEmIGRhdGEgPSBwYWdlLT5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoYyk7Ci0g ICAgICAgICAgICAgICAgaWYgKGRhdGEuZ2x5cGgpCisgICAgICAgICAgICAgICAgaWYgKGRhdGEu Zm9udERhdGEpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBkYXRhOwogICAgICAgICAgICAg ICAgIGlmIChub2RlLT5pc1N5c3RlbUZhbGxiYWNrKCkpCiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwpAQCAtNDAzLDcgKzQwMyw3IEBAIGNvbnN0IEdseXBoRGF0YSYgRm9udDo6Z2x5cGhEYXRh Rm9yQ2hhcmEKICAgICAgICAgICAgIHBhZ2UgPSBub2RlLT5wYWdlKCk7CiAgICAgICAgICAgICBp ZiAocGFnZSkgewogICAgICAgICAgICAgICAgIGNvbnN0IEdseXBoRGF0YSYgZGF0YSA9IHBhZ2Ut PmdseXBoRGF0YUZvckNoYXJhY3RlcihjKTsKLSAgICAgICAgICAgICAgICBpZiAoZGF0YS5nbHlw aCkgeworICAgICAgICAgICAgICAgIGlmIChkYXRhLmZvbnREYXRhKSB7CiAgICAgICAgICAgICAg ICAgICAgIC8vIFRoZSBzbWFsbENhcHNGb250RGF0YSBmdW5jdGlvbiBzaG91bGQgbm90IG5vcm1h bGx5IHJldHVybiAwLgogICAgICAgICAgICAgICAgICAgICAvLyBCdXQgaWYgaXQgZG9lcywgd2Ug d2lsbCBqdXN0IHJlbmRlciB0aGUgY2FwaXRhbCBsZXR0ZXIgYmlnLgogICAgICAgICAgICAgICAg ICAgICBjb25zdCBGb250RGF0YSogc21hbGxDYXBzRm9udERhdGEgPSBkYXRhLmZvbnREYXRhLT5z bWFsbENhcHNGb250RGF0YShtX2ZvbnREZXNjcmlwdGlvbik7CkBAIC00MTIsNyArNDEyLDcgQEAg Y29uc3QgR2x5cGhEYXRhJiBGb250OjpnbHlwaERhdGFGb3JDaGFyYQogCiAgICAgICAgICAgICAg ICAgICAgIEdseXBoUGFnZVRyZWVOb2RlKiBzbWFsbENhcHNOb2RlID0gR2x5cGhQYWdlVHJlZU5v ZGU6OmdldFJvb3RDaGlsZChzbWFsbENhcHNGb250RGF0YSwgcGFnZU51bWJlcik7CiAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IEdseXBoRGF0YSYgZGF0YSA9IHNtYWxsQ2Fwc05vZGUtPnBhZ2Uo KS0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGMpOwotICAgICAgICAgICAgICAgICAgICBpZiAoZGF0 YS5nbHlwaCkKKyAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGEuZm9udERhdGEpCiAgICAgICAg ICAgICAgICAgICAgICAgICByZXR1cm4gZGF0YTsKIAogICAgICAgICAgICAgICAgICAgICAvLyBE byBub3QgYXR0ZW1wdCBzeXN0ZW0gZmFsbGJhY2sgb2ZmIHRoZSBzbWFsbENhcHNGb250RGF0YS4g VGhpcyBpcyB0aGUgdmVyeSB1bmxpa2VseSBjYXNlIHRoYXQKSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vZ3RrL0dseXBoUGFnZVRyZWVOb2RlR3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs YXRmb3JtL2d0ay9HbHlwaFBhZ2VUcmVlTm9kZUd0ay5jcHAJKHJldmlzaW9uIDI2NjgyKQorKysg V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2x5cGhQYWdlVHJlZU5vZGVHdGsuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xLDggKzEsNyBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBDb21w dXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwg MjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MDYgTWljaGFlbCBFbW1lbCBtaWtlLmVtbWVsQGdtYWlsLmNvbSAKICAqIENvcHlyaWdodCAoQykg MjAwNyBBbHAgVG9rZXIgPGFscC50b2tlckBjb2xsYWJvcmEuY28udWs+Ci0gKiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zOSwxNiArMzgs MjMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogYm9vbCBHbHlwaFBhZ2U6OmZpbGwoVUNoYXIqIGJ1 ZmZlciwgdW5zaWduZWQgYnVmZmVyTGVuZ3RoLCBjb25zdCBGb250RGF0YSogZm9udERhdGEpCiB7 CiAgICAgRlRfRmFjZSBmYWNlID0gY2Fpcm9fZnRfc2NhbGVkX2ZvbnRfbG9ja19mYWNlKGZvbnRE YXRhLT5tX2ZvbnQubV9zY2FsZWRGb250KTsKLQogICAgIGlmICghZmFjZSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGJ1ZmZlckxlbmd0aDsg aSsrKQotICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChpLCBGY0ZyZWVUeXBlQ2hhckluZGV4 KGZhY2UsIGJ1ZmZlcltpXSksIGZvbnREYXRhKTsKKyAgICBib29sIGhhdmVHbHlwaHMgPSBmYWxz ZTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgYnVmZmVyTGVuZ3RoOyBpKyspIHsKKyAg ICAgICAgR2x5cGggZ2x5cGggPSBGY0ZyZWVUeXBlQ2hhckluZGV4KGZhY2UsIGJ1ZmZlcltpXSk7 CisgICAgICAgIGlmICghZ2x5cGgpCisgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChp LCAwLCAwKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRl eChpLCBnbHlwaCwgZm9udERhdGEpOworICAgICAgICAgICAgaGF2ZUdseXBocyA9IHRydWU7Cisg ICAgICAgIH0KKyAgICB9CiAKICAgICBjYWlyb19mdF9zY2FsZWRfZm9udF91bmxvY2tfZmFjZShm b250RGF0YS0+bV9mb250Lm1fc2NhbGVkRm9udCk7CiAKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICBy ZXR1cm4gaGF2ZUdseXBoczsKIH0KIAogfQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9tYWMvR2x5 cGhQYWdlVHJlZU5vZGVNYWMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFj L0dseXBoUGFnZVRyZWVOb2RlTWFjLmNwcAkocmV2aXNpb24gMjY2ODIpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL21hYy9HbHlwaFBhZ2VUcmVlTm9kZU1hYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEs NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtNjAsOSArNjAsMTIgQEAgYm9vbCBHbHlwaFBhZ2U6OmZpbGwoVUNoYXIqIGJ1ZmZlciwg dW5zaQogICAgIEFUU0xheW91dFJlY29yZCogZ2x5cGhSZWNvcmQgPSAoQVRTTGF5b3V0UmVjb3Jk Kil3a0dldEdseXBoVmVjdG9yRmlyc3RSZWNvcmQoZ2x5cGhWZWN0b3IpOwogICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBHbHlwaFBhZ2U6OnNpemU7IGkrKykgewogICAgICAgICBHbHlwaCBn bHlwaCA9IGdseXBoUmVjb3JkLT5nbHlwaElEOwotICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRl eChpLCBnbHlwaCwgZm9udERhdGEpOwotICAgICAgICBpZiAoIWhhdmVHbHlwaHMgJiYgZ2x5cGgp CisgICAgICAgIGlmICghZ2x5cGgpCisgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChp LCAwLCAwKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRl eChpLCBnbHlwaCwgZm9udERhdGEpOwogICAgICAgICAgICAgaGF2ZUdseXBocyA9IHRydWU7Cisg ICAgICAgIH0KICAgICAgICAgZ2x5cGhSZWNvcmQgPSAoQVRTTGF5b3V0UmVjb3JkICopKChjaGFy ICopZ2x5cGhSZWNvcmQgKyB3a0dldEdseXBoVmVjdG9yUmVjb3JkU2l6ZShnbHlwaFZlY3Rvcikp OwogICAgIH0KICAgICB3a0NsZWFyR2x5cGhWZWN0b3IoJmdseXBoVmVjdG9yKTsKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vd2luL0dseXBoUGFnZVRyZWVOb2RlV2luLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL3dpbi9HbHlwaFBhZ2VUcmVlTm9kZVdpbi5jcHAJKHJldmlzaW9u IDI2NjgyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS93aW4vR2x5cGhQYWdlVHJlZU5vZGVXaW4uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw NiwgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChD KSAyMDA2LCAyMDA3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjgsMjQgKzI4LDMyIEBACiAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJGb250RGF0YS5oIgorCiAjaW5jbHVkZSA8V2ViS2l0U3lzdGVtSW50 ZXJmYWNlL1dlYktpdFN5c3RlbUludGVyZmFjZS5oPgogCi1uYW1lc3BhY2UgV2ViQ29yZQotewor bmFtZXNwYWNlIFdlYkNvcmUgewogCiBib29sIEdseXBoUGFnZTo6ZmlsbChVQ2hhciogYnVmZmVy LCB1bnNpZ25lZCBidWZmZXJMZW5ndGgsIGNvbnN0IEZvbnREYXRhKiBmb250RGF0YSkKIHsKLSAg ICAvLyBidWZmZXJMZW5ndGggd2lsbCBiZSBncmVhdGVyIHRoYW4gdGhlIGdseXBoIHBhZ2Ugc2l6 ZSBpZiB0aGUgYnVmZmVyIGhhcyBVbmljb2RlIHN1cHBsZW1lbnRhcnkgY2hhcmFjdGVycy4KKyAg ICAvLyBUaGUgYnVmZmVyTGVuZ3RoIHdpbGwgYmUgZ3JlYXRlciB0aGFuIHRoZSBnbHlwaCBwYWdl IHNpemUgaWYgdGhlIGJ1ZmZlciBoYXMgVW5pY29kZSBzdXBwbGVtZW50YXJ5IGNoYXJhY3RlcnMu CiAgICAgLy8gV2Ugd29uJ3Qgc3VwcG9ydCB0aGlzIGZvciBub3cuCiAgICAgaWYgKGJ1ZmZlckxl bmd0aCA+IEdseXBoUGFnZTo6c2l6ZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgYm9v bCBoYXZlR2x5cGhzID0gZmFsc2U7CiAgICAgQ0dHbHlwaCBsb2NhbEdseXBoQnVmZmVyW0dseXBo UGFnZTo6c2l6ZV07CiAgICAgd2tHZXRHbHlwaHMoZm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLmNn Rm9udCgpLCBidWZmZXIsIGxvY2FsR2x5cGhCdWZmZXIsIGJ1ZmZlckxlbmd0aCk7Ci0gICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IEdseXBoUGFnZTo6c2l6ZTsgaSsrKQotICAgICAgICBzZXRH bHlwaERhdGFGb3JJbmRleChpLCBsb2NhbEdseXBoQnVmZmVyW2ldLCBmb250RGF0YSk7Ci0gICAg cmV0dXJuIHRydWU7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IEdseXBoUGFnZTo6c2l6 ZTsgaSsrKXsKKyAgICAgICAgR2x5cGggZ2x5cGggPSBsb2NhbEdseXBoQnVmZmVyW2ldOworICAg ICAgICBpZiAoIWdseXBoKQorICAgICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgMCwg MCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwg Z2x5cGgsIGZvbnREYXRhKTsKKyAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOworICAgICAg ICB9CisgICAgICAgIGdseXBoUmVjb3JkID0gKEFUU0xheW91dFJlY29yZCAqKSgoY2hhciAqKWds eXBoUmVjb3JkICsgd2tHZXRHbHlwaFZlY3RvclJlY29yZFNpemUoZ2x5cGhWZWN0b3IpKTsKKyAg ICB9CisgICAgcmV0dXJuIGhhdmVHbHlwaHM7CiB9CiAKIH0KLQo= 16690 2007-10-16 18:01:02 -0700 2007-10-16 18:11:34 -0700 patch to cache missing glyphs too (Windows fixed now) ZeroGlyphPatch.txt text/plain 7334 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjY5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDctMTAtMTYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTM2CisgICAgICAgICAg bmVlZCB0byBjYWNoZSBtaXNzaW5nIGdseXBoIHNvIHdlJ3JlIG5vdCBzbG93IG9uIHBhZ2VzIHRo YXQgc2hvdyBtaXNzaW5nIGdseXBocworCisgICAgICAgIC0gPHJkYXI6Ly9wcm9ibGVtLzU0MDQz NTk+IFVJIHRocmVhZCBzdGFsbCAoPjYwc2VjKSBpbiBNTEFORyBydW5uaW5nIHN0cmVzcyB0ZXN0 CisgICAgICAgICAgKHJlbGF0ZWQgdG8gZm9udCBkYXRhIGNhY2hpbmcpCisKKyAgICAgICAgKiBw bGF0Zm9ybS9Gb250LmNwcDogKFdlYkNvcmU6OkZvbnQ6OmdseXBoRGF0YUZvckNoYXJhY3Rlcik6 IENoZWNrIGZvciBhIG51bGwgdmFsdWUKKyAgICAgICAgZm9yIGZvbnREYXRhIHJhdGhlciB0aGFu IGZvciBnbHlwaCB0byBkZXRlY3Qgbm9uLWNhY2hlZCBlbnRyaWVzIGluIHRoZSBnbHlwaCBkYXRh LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0dseXBoUGFnZVRyZWVOb2RlR3RrLmNwcDogKFdl YkNvcmU6OkdseXBoUGFnZTo6ZmlsbCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL0dseXBoUGFn ZVRyZWVOb2RlTWFjLmNwcDogKFdlYkNvcmU6OkdseXBoUGFnZTo6ZmlsbCk6CisgICAgICAgICog cGxhdGZvcm0vd2luL0dseXBoUGFnZVRyZWVOb2RlV2luLmNwcDogKFdlYkNvcmU6OkdseXBoUGFn ZTo6ZmlsbCk6CisgICAgICAgIFNldCBmb250RGF0YSB0byAwIGZvciBtaXNzaW5nIGdseXBoIGVu dHJpZXMuIEFsc28gZml4ZWQgdGhlIFdpbmRvd3MgYW5kIEdUSyB2ZXJzaW9ucworICAgICAgICB0 byByZXR1cm4gdGhlIHByb3BlciB2YWx1ZSBmb3IgaGF2ZUdseXBocy4KKwogMjAwNy0xMC0xNiAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRh bS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vRm9udC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9Gb250LmNwcAkocmV2aXNpb24gMjY2ODIpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L0ZvbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODUsNyArMzg1LDcgQEAgY29uc3QgR2x5cGhE YXRhJiBGb250OjpnbHlwaERhdGFGb3JDaGFyYQogICAgICAgICAgICAgcGFnZSA9IG5vZGUtPnBh Z2UoKTsKICAgICAgICAgICAgIGlmIChwYWdlKSB7CiAgICAgICAgICAgICAgICAgY29uc3QgR2x5 cGhEYXRhJiBkYXRhID0gcGFnZS0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGMpOwotICAgICAgICAg ICAgICAgIGlmIChkYXRhLmdseXBoKQorICAgICAgICAgICAgICAgIGlmIChkYXRhLmZvbnREYXRh KQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZGF0YTsKICAgICAgICAgICAgICAgICBpZiAo bm9kZS0+aXNTeXN0ZW1GYWxsYmFjaygpKQogICAgICAgICAgICAgICAgICAgICBicmVhazsKQEAg LTQwMyw3ICs0MDMsNyBAQCBjb25zdCBHbHlwaERhdGEmIEZvbnQ6OmdseXBoRGF0YUZvckNoYXJh CiAgICAgICAgICAgICBwYWdlID0gbm9kZS0+cGFnZSgpOwogICAgICAgICAgICAgaWYgKHBhZ2Up IHsKICAgICAgICAgICAgICAgICBjb25zdCBHbHlwaERhdGEmIGRhdGEgPSBwYWdlLT5nbHlwaERh dGFGb3JDaGFyYWN0ZXIoYyk7Ci0gICAgICAgICAgICAgICAgaWYgKGRhdGEuZ2x5cGgpIHsKKyAg ICAgICAgICAgICAgICBpZiAoZGF0YS5mb250RGF0YSkgewogICAgICAgICAgICAgICAgICAgICAv LyBUaGUgc21hbGxDYXBzRm9udERhdGEgZnVuY3Rpb24gc2hvdWxkIG5vdCBub3JtYWxseSByZXR1 cm4gMC4KICAgICAgICAgICAgICAgICAgICAgLy8gQnV0IGlmIGl0IGRvZXMsIHdlIHdpbGwganVz dCByZW5kZXIgdGhlIGNhcGl0YWwgbGV0dGVyIGJpZy4KICAgICAgICAgICAgICAgICAgICAgY29u c3QgRm9udERhdGEqIHNtYWxsQ2Fwc0ZvbnREYXRhID0gZGF0YS5mb250RGF0YS0+c21hbGxDYXBz Rm9udERhdGEobV9mb250RGVzY3JpcHRpb24pOwpAQCAtNDEyLDcgKzQxMiw3IEBAIGNvbnN0IEds eXBoRGF0YSYgRm9udDo6Z2x5cGhEYXRhRm9yQ2hhcmEKIAogICAgICAgICAgICAgICAgICAgICBH bHlwaFBhZ2VUcmVlTm9kZSogc21hbGxDYXBzTm9kZSA9IEdseXBoUGFnZVRyZWVOb2RlOjpnZXRS b290Q2hpbGQoc21hbGxDYXBzRm9udERhdGEsIHBhZ2VOdW1iZXIpOwogICAgICAgICAgICAgICAg ICAgICBjb25zdCBHbHlwaERhdGEmIGRhdGEgPSBzbWFsbENhcHNOb2RlLT5wYWdlKCktPmdseXBo RGF0YUZvckNoYXJhY3RlcihjKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGEuZ2x5cGgp CisgICAgICAgICAgICAgICAgICAgIGlmIChkYXRhLmZvbnREYXRhKQogICAgICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGRhdGE7CiAKICAgICAgICAgICAgICAgICAgICAgLy8gRG8gbm90IGF0 dGVtcHQgc3lzdGVtIGZhbGxiYWNrIG9mZiB0aGUgc21hbGxDYXBzRm9udERhdGEuIFRoaXMgaXMg dGhlIHZlcnkgdW5saWtlbHkgY2FzZSB0aGF0CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9H bHlwaFBhZ2VUcmVlTm9kZUd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR2x5cGhQYWdlVHJlZU5vZGVHdGsuY3BwCShyZXZpc2lvbiAyNjY4MikKKysrIFdlYkNvcmUv cGxhdGZvcm0vZ3RrL0dseXBoUGFnZVRyZWVOb2RlR3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MSw4ICsxLDcgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYgQXBwbGUgQ29tcHV0ZXIsIElu Yy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA2IE1pY2hh ZWwgRW1tZWwgbWlrZS5lbW1lbEBnbWFpbC5jb20gCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQWxw IFRva2VyIDxhbHAudG9rZXJAY29sbGFib3JhLmNvLnVrPgotICogQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzksMTYgKzM4LDIzIEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIGJvb2wgR2x5cGhQYWdlOjpmaWxsKFVDaGFyKiBidWZmZXIsIHVu c2lnbmVkIGJ1ZmZlckxlbmd0aCwgY29uc3QgRm9udERhdGEqIGZvbnREYXRhKQogewogICAgIEZU X0ZhY2UgZmFjZSA9IGNhaXJvX2Z0X3NjYWxlZF9mb250X2xvY2tfZmFjZShmb250RGF0YS0+bV9m b250Lm1fc2NhbGVkRm9udCk7Ci0KICAgICBpZiAoIWZhY2UpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBidWZmZXJMZW5ndGg7IGkrKykKLSAg ICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgRmNGcmVlVHlwZUNoYXJJbmRleChmYWNlLCBi dWZmZXJbaV0pLCBmb250RGF0YSk7CisgICAgYm9vbCBoYXZlR2x5cGhzID0gZmFsc2U7CisgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGJ1ZmZlckxlbmd0aDsgaSsrKSB7CisgICAgICAgIEds eXBoIGdseXBoID0gRmNGcmVlVHlwZUNoYXJJbmRleChmYWNlLCBidWZmZXJbaV0pOworICAgICAg ICBpZiAoIWdseXBoKQorICAgICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgMCwgMCk7 CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgZ2x5 cGgsIGZvbnREYXRhKTsKKyAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOworICAgICAgICB9 CisgICAgfQogCiAgICAgY2Fpcm9fZnRfc2NhbGVkX2ZvbnRfdW5sb2NrX2ZhY2UoZm9udERhdGEt Pm1fZm9udC5tX3NjYWxlZEZvbnQpOwogCi0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGhh dmVHbHlwaHM7CiB9CiAKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbWFjL0dseXBoUGFnZVRy ZWVOb2RlTWFjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL21hYy9HbHlwaFBh Z2VUcmVlTm9kZU1hYy5jcHAJKHJldmlzaW9uIDI2NjgyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9t YWMvR2x5cGhQYWdlVHJlZU5vZGVNYWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBA QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLiAgQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTYw LDkgKzYwLDEyIEBAIGJvb2wgR2x5cGhQYWdlOjpmaWxsKFVDaGFyKiBidWZmZXIsIHVuc2kKICAg ICBBVFNMYXlvdXRSZWNvcmQqIGdseXBoUmVjb3JkID0gKEFUU0xheW91dFJlY29yZCopd2tHZXRH bHlwaFZlY3RvckZpcnN0UmVjb3JkKGdseXBoVmVjdG9yKTsKICAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgR2x5cGhQYWdlOjpzaXplOyBpKyspIHsKICAgICAgICAgR2x5cGggZ2x5cGggPSBn bHlwaFJlY29yZC0+Z2x5cGhJRDsKLSAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgZ2x5 cGgsIGZvbnREYXRhKTsKLSAgICAgICAgaWYgKCFoYXZlR2x5cGhzICYmIGdseXBoKQorICAgICAg ICBpZiAoIWdseXBoKQorICAgICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgMCwgMCk7 CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgoaSwgZ2x5 cGgsIGZvbnREYXRhKTsKICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOworICAgICAgICB9 CiAgICAgICAgIGdseXBoUmVjb3JkID0gKEFUU0xheW91dFJlY29yZCAqKSgoY2hhciAqKWdseXBo UmVjb3JkICsgd2tHZXRHbHlwaFZlY3RvclJlY29yZFNpemUoZ2x5cGhWZWN0b3IpKTsKICAgICB9 CiAgICAgd2tDbGVhckdseXBoVmVjdG9yKCZnbHlwaFZlY3Rvcik7CkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL3dpbi9HbHlwaFBhZ2VUcmVlTm9kZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS93aW4vR2x5cGhQYWdlVHJlZU5vZGVXaW4uY3BwCShyZXZpc2lvbiAyNjY4MikK KysrIFdlYkNvcmUvcGxhdGZvcm0vd2luL0dseXBoUGFnZVRyZWVOb2RlV2luLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcg QXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwg MjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKQEAgLTI4LDI0ICsyOCwzMSBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiRm9udERhdGEuaCIKKwogI2luY2x1ZGUgPFdlYktpdFN5c3RlbUludGVyZmFjZS9X ZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KIAotbmFtZXNwYWNlIFdlYkNvcmUKLXsKK25hbWVzcGFj ZSBXZWJDb3JlIHsKIAogYm9vbCBHbHlwaFBhZ2U6OmZpbGwoVUNoYXIqIGJ1ZmZlciwgdW5zaWdu ZWQgYnVmZmVyTGVuZ3RoLCBjb25zdCBGb250RGF0YSogZm9udERhdGEpCiB7Ci0gICAgLy8gYnVm ZmVyTGVuZ3RoIHdpbGwgYmUgZ3JlYXRlciB0aGFuIHRoZSBnbHlwaCBwYWdlIHNpemUgaWYgdGhl IGJ1ZmZlciBoYXMgVW5pY29kZSBzdXBwbGVtZW50YXJ5IGNoYXJhY3RlcnMuCisgICAgLy8gVGhl IGJ1ZmZlckxlbmd0aCB3aWxsIGJlIGdyZWF0ZXIgdGhhbiB0aGUgZ2x5cGggcGFnZSBzaXplIGlm IHRoZSBidWZmZXIgaGFzIFVuaWNvZGUgc3VwcGxlbWVudGFyeSBjaGFyYWN0ZXJzLgogICAgIC8v IFdlIHdvbid0IHN1cHBvcnQgdGhpcyBmb3Igbm93LgogICAgIGlmIChidWZmZXJMZW5ndGggPiBH bHlwaFBhZ2U6OnNpemUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGJvb2wgaGF2ZUds eXBocyA9IGZhbHNlOwogICAgIENHR2x5cGggbG9jYWxHbHlwaEJ1ZmZlcltHbHlwaFBhZ2U6OnNp emVdOwogICAgIHdrR2V0R2x5cGhzKGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5jZ0ZvbnQoKSwg YnVmZmVyLCBsb2NhbEdseXBoQnVmZmVyLCBidWZmZXJMZW5ndGgpOwotICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBHbHlwaFBhZ2U6OnNpemU7IGkrKykKLSAgICAgICAgc2V0R2x5cGhEYXRh Rm9ySW5kZXgoaSwgbG9jYWxHbHlwaEJ1ZmZlcltpXSwgZm9udERhdGEpOwotICAgIHJldHVybiB0 cnVlOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBHbHlwaFBhZ2U6OnNpemU7IGkrKykg eworICAgICAgICBHbHlwaCBnbHlwaCA9IGxvY2FsR2x5cGhCdWZmZXJbaV07CisgICAgICAgIGlm ICghZ2x5cGgpCisgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChpLCAwLCAwKTsKKyAg ICAgICAgZWxzZSB7CisgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChpLCBnbHlwaCwg Zm9udERhdGEpOworICAgICAgICAgICAgaGF2ZUdseXBocyA9IHRydWU7CisgICAgICAgIH0KKyAg ICB9CisgICAgcmV0dXJuIGhhdmVHbHlwaHM7CiB9CiAKIH0KLQo=