147864 2015-08-10 20:28:40 -0700 [Cocoa] Address post-commit review 2015-08-17 21:55:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield darin dino jonlee simon.fraser thorton oldest_to_newest 1116462 0 mmaxfield 2015-08-10 20:28:40 -0700 [Cocoa] Address post-commit review 1116465 1 258694 mmaxfield 2015-08-10 20:30:44 -0700 Created attachment 258694 Patch 1118431 2 mmaxfield 2015-08-17 21:55:28 -0700 Committed r188575: <http://trac.webkit.org/changeset/188575> 258694 2015-08-10 20:30:44 -0700 2015-08-10 22:36:28 -0700 Patch bug-147864-20150810203029.patch text/plain 9712 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQwYWYyZjM0NTc3NTg1 ZTIxYmUzZDYzNWZiNmU0Nzc3YzRjYmZlOS4uNDc4NDEzMDhiNWMzZmIxZmM5OGZiZDAwNWZlODJm Y2YzOWI3YzNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACisyMDE1LTA4LTEwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBB ZGRyZXNzIHBvc3QtY29tbWl0IHJldmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3ODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ3JlYXRlIGhlbHBlciBmdW5jdGlvbnMgdG8gY2FzdCBiZXR3ZWVu IE5TRm9udCpzIGFuZCBDVEZvbnRSZWZzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNl IHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0ZvbnRQbGF0Zm9ybURhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OnRvQ1RGb250KToKKyAg ICAgICAgKFdlYkNvcmU6OnRvTlNGb250KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y29jb2EvRm9udENvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6cGxhdGZvcm1DcmVh dGVTY2FsZWRGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmNvbXBvc2l0ZUZvbnRSZWZl cmVuY2VGb250KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFj Lm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpwbGF0Zm9ybVB1cmdlSW5hY3RpdmVG b250RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpsb29rdXBDVEZvbnQpOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMpOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBw bGF0Zm9ybS9tYWMvRHJhZ0ltYWdlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6Zm9udEZyb21O U0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6d2lkdGhXaXRoRm9udCk6CisgICAgICAgIChXZWJD b3JlOjpkcmF3QXRQb2ludCk6CisgICAgICAgICogcGxhdGZvcm0vc3BpL21hYy9OU0ZvbnRTUEku aDoKKwogMjAxNS0wOC0xMCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgogCiAgICAgICAgIFBvc3QtcmV2aWV3IGZpeHVwIGFmdGVyIHIxODgxOTUKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzgwNgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRhLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRhLmgKaW5kZXgg NTg1Mzg4MzUxODUwMmFhMjBmOTUxMDA0YzNlZTkwN2JlZjljYjBiOS4uMTYwNDVjMmYwN2YwMDhi OTM2ODcwMzNkN2U3NjBiYzBmNjUyZWQxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtMjQ2LDYgKzI0NiwxOSBAQCBw cml2YXRlOgogI2VuZGlmCiB9OwogCisjaWYgVVNFKEFQUEtJVCkKKy8vIE5TRm9udHMgYW5kIENU Rm9udFJlZnMgYXJlIHRvbGwtZnJlZS1icmlkZ2VkLgoraW5saW5lIENURm9udFJlZiB0b0NURm9u dChOU0ZvbnQgKmZvbnQpCit7CisgICAgcmV0dXJuIChDVEZvbnRSZWYpZm9udDsKK30KKworaW5s aW5lIE5TRm9udCAqdG9OU0ZvbnQoQ1RGb250UmVmIGZvbnQpCit7CisgICAgcmV0dXJuIChOU0Zv bnQgKilmb250OworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlm IC8vIEZvbnRQbGF0Zm9ybURhdGFfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvRm9udENvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvRm9udENvY29hLm1tCmluZGV4IDRhM2E1ZWY4YzA1YWUwYTE2YzRkYmRm YTExNDUxOTExNDk5MGQzOWQuLmI0MmQ2YmJiNjcwYWRhN2JkNTdjOWZmMTM5MGFlMjZhNGM4YmIy OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0Zv bnRDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G b250Q29jb2EubW0KQEAgLTMyNCw3ICszMjQsNyBAQCBQYXNzUmVmUHRyPEZvbnQ+IEZvbnQ6OnBs YXRmb3JtQ3JlYXRlU2NhbGVkRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mLCBmbG9hdCBzYwog I2lmIFVTRShBUFBLSVQpCiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogCi0gICAg Rm9udFBsYXRmb3JtRGF0YSBzY2FsZWRGb250RGF0YShyZWludGVycHJldF9jYXN0PENURm9udFJl Zj4oW1tOU0ZvbnRNYW5hZ2VyIHNoYXJlZEZvbnRNYW5hZ2VyXSBjb252ZXJ0Rm9udDptX3BsYXRm b3JtRGF0YS5uc0ZvbnQoKSB0b1NpemU6c2l6ZV0pLCBzaXplLCBmYWxzZSwgZmFsc2UsIG1fcGxh dGZvcm1EYXRhLm9yaWVudGF0aW9uKCkpOworICAgIEZvbnRQbGF0Zm9ybURhdGEgc2NhbGVkRm9u dERhdGEodG9DVEZvbnQoW1tOU0ZvbnRNYW5hZ2VyIHNoYXJlZEZvbnRNYW5hZ2VyXSBjb252ZXJ0 Rm9udDptX3BsYXRmb3JtRGF0YS5uc0ZvbnQoKSB0b1NpemU6c2l6ZV0pLCBzaXplLCBmYWxzZSwg ZmFsc2UsIG1fcGxhdGZvcm1EYXRhLm9yaWVudGF0aW9uKCkpOwogCiAgICAgaWYgKHNjYWxlZEZv bnREYXRhLmZvbnQoKSkgewogICAgICAgICBOU0ZvbnRNYW5hZ2VyICpmb250TWFuYWdlciA9IFtO U0ZvbnRNYW5hZ2VyIHNoYXJlZEZvbnRNYW5hZ2VyXTsKQEAgLTU1Niw3ICs1NTYsNyBAQCBjb25z dCBGb250KiBGb250Ojpjb21wb3NpdGVGb250UmVmZXJlbmNlRm9udChOU0ZvbnQgKmtleSkgY29u c3QKICAgICAgICAgYm9vbCBzeW50aGV0aWNCb2xkID0gcGxhdGZvcm1EYXRhKCkuc3ludGhldGlj Qm9sZCgpICYmICEodHJhaXRzICYga0NURm9udEJvbGRUcmFpdCk7CiAgICAgICAgIGJvb2wgc3lu dGhldGljT2JsaXF1ZSA9IHBsYXRmb3JtRGF0YSgpLnN5bnRoZXRpY09ibGlxdWUoKSAmJiAhKHRy YWl0cyAmIGtDVEZvbnRJdGFsaWNUcmFpdCk7CiAKLSAgICAgICAgRm9udFBsYXRmb3JtRGF0YSBz dWJzdGl0dXRlUGxhdGZvcm0ocmVpbnRlcnByZXRfY2FzdDxDVEZvbnRSZWY+KHN1YnN0aXR1dGVG b250KSwgcGxhdGZvcm1EYXRhKCkuc2l6ZSgpLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNPYmxp cXVlLCBwbGF0Zm9ybURhdGEoKS5vcmllbnRhdGlvbigpLCBwbGF0Zm9ybURhdGEoKS53aWR0aFZh cmlhbnQoKSk7CisgICAgICAgIEZvbnRQbGF0Zm9ybURhdGEgc3Vic3RpdHV0ZVBsYXRmb3JtKHRv Q1RGb250KHN1YnN0aXR1dGVGb250KSwgcGxhdGZvcm1EYXRhKCkuc2l6ZSgpLCBzeW50aGV0aWNC b2xkLCBzeW50aGV0aWNPYmxpcXVlLCBwbGF0Zm9ybURhdGEoKS5vcmllbnRhdGlvbigpLCBwbGF0 Zm9ybURhdGEoKS53aWR0aFZhcmlhbnQoKSk7CiAgICAgICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+ dmFsdWUgPSBGb250OjpjcmVhdGUoc3Vic3RpdHV0ZVBsYXRmb3JtLCBpc0N1c3RvbUZvbnQoKSk7 CiAgICAgfQogICAgIHJldHVybiBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmdldCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1h Yy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMu bW0KaW5kZXggMTU4ZmJiMGRiNWYxYmUxODY3NGYwMDQ2NDVhYzM4NzgzMjE5N2JiYS4uZjI3ZmQy YWNhZjNkNDAzNWVjODE2Y2ViZGNiNzQzYmJhOTkyYzZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCkBAIC00NzQsMTAg KzQ3NCwxMCBAQCBzdGF0aWMgRmFsbGJhY2tEZWR1cFNldCYgZmFsbGJhY2tEZWR1cFNldCgpCiAK IHZvaWQgRm9udENhY2hlOjpwbGF0Zm9ybVB1cmdlSW5hY3RpdmVGb250RGF0YSgpCiB7Ci0gICAg VmVjdG9yPFJldGFpblB0cjxDVEZvbnRSZWY+PiB0b1JlbW92ZTsKKyAgICBWZWN0b3I8Q1RGb250 UmVmPiB0b1JlbW92ZTsKICAgICBmb3IgKGF1dG8mIGZvbnQgOiBmYWxsYmFja0RlZHVwU2V0KCkp IHsKICAgICAgICAgaWYgKENGR2V0UmV0YWluQ291bnQoZm9udC5nZXQoKSkgPT0gMSkKLSAgICAg ICAgICAgIHRvUmVtb3ZlLmFwcGVuZChmb250KTsKKyAgICAgICAgICAgIHRvUmVtb3ZlLmFwcGVu ZChmb250LmdldCgpKTsKICAgICB9CiAgICAgZm9yIChhdXRvJiBmb250IDogdG9SZW1vdmUpCiAg ICAgICAgIGZhbGxiYWNrRGVkdXBTZXQoKS5yZW1vdmUoZm9udCk7CkBAIC00ODksNyArNDg5LDcg QEAgc3RhdGljIGlubGluZSBSZXRhaW5QdHI8Q1RGb250UmVmPiBsb29rdXBDVEZvbnQoQ1RGb250 UmVmIGZvbnQsIGZsb2F0IGZvbnRTaXplLAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR VUlSRUQgPT0gMTA5MAogICAgIFVOVVNFRF9QQVJBTShsb2NhbGUpOwogICAgIGlmICghZm9udCkg ewotICAgICAgICBmb250ID0gcmVpbnRlcnByZXRfY2FzdDxDVEZvbnRSZWY+KFtOU0ZvbnQgdXNl ckZvbnRPZlNpemU6Zm9udFNpemVdKTsKKyAgICAgICAgZm9udCA9IHRvQ1RGb250KFtOU0ZvbnQg dXNlckZvbnRPZlNpemU6Zm9udFNpemVdKTsKICAgICAgICAgYm9vbCBhY2NlcHRhYmxlID0gdHJ1 ZTsKICAgICAgICAgCiAgICAgICAgIFJldGFpblB0cjxDRkNoYXJhY3RlclNldFJlZj4gY2hhcmFj dGVyU2V0ID0gYWRvcHRDRihDVEZvbnRDb3B5Q2hhcmFjdGVyU2V0KGZvbnQpKTsKQEAgLTUyNyw3 ICs1MjcsNyBAQCBSZWZQdHI8Rm9udD4gRm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJh Y3RlcnMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcgogICAgIC8vIEZvbnRDYXNjYWRlOjpk cmF3R2x5cGhCdWZmZXIoKSByZXF1aXJlcyB0aGF0IHRoZXJlIGFyZSBubyBkdXBsaWNhdGUgRm9u dCBvYmplY3RzIHdoaWNoIHJlZmVyIHRvIHRoZSBzYW1lIHRoaW5nLiBUaGlzIGlzIGVuZm9yY2Vk IGluCiAgICAgLy8gRm9udENhY2hlOjpmb250Rm9yUGxhdGZvcm1EYXRhKCksIHdoZXJlIG91ciBl cXVhbGl0eSBjaGVjayBpcyBiYXNlZCBvbiBoYXNoaW5nIHRoZSBGb250UGxhdGZvcm1EYXRhLCB3 aG9zZSBoYXNoIGluY2x1ZGVzIHRoZSByYXcgQ29yZVRleHQKICAgICAvLyBmb250IHBvaW50ZXIu Ci0gICAgTlNGb250ICpzdWJzdGl0dXRlRm9udCA9IHJlaW50ZXJwcmV0X2Nhc3Q8TlNGb250ICo+ KGNvbnN0X2Nhc3Q8X19DVEZvbnQqPihmYWxsYmFja0RlZHVwU2V0KCkuYWRkKHJlc3VsdCkuaXRl cmF0b3ItPmdldCgpKSk7CisgICAgTlNGb250ICpzdWJzdGl0dXRlRm9udCA9IHRvTlNGb250KGZh bGxiYWNrRGVkdXBTZXQoKS5hZGQocmVzdWx0KS5pdGVyYXRvci0+Z2V0KCkpOwogCiAgICAgLy8g VXNlIHRoZSBmYW1pbHkgbmFtZSBmcm9tIHRoZSBBcHBLaXQtc3VwcGxpZWQgc3Vic3RpdHV0ZSBm b250LCByZXF1ZXN0aW5nIHRoZQogICAgIC8vIHRyYWl0cywgd2VpZ2h0LCBhbmQgc2l6ZSB3ZSB3 YW50LiBPbmUgd2F5IHRoaXMgZG9lcyBiZXR0ZXIgdGhhbiB0aGUgb3JpZ2luYWwKQEAgLTU3NSw3 ICs1NzUsNyBAQCBSZWZQdHI8Rm9udD4gRm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJh Y3RlcnMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcgogICAgIHN1YnN0aXR1dGVGb250VHJh aXRzID0gW2ZvbnRNYW5hZ2VyIHRyYWl0c09mRm9udDpzdWJzdGl0dXRlRm9udF07CiAgICAgc3Vi c3RpdHV0ZUZvbnRXZWlnaHQgPSBbZm9udE1hbmFnZXIgd2VpZ2h0T2ZGb250OnN1YnN0aXR1dGVG b250XTsKIAotICAgIEZvbnRQbGF0Zm9ybURhdGEgYWx0ZXJuYXRlRm9udChyZWludGVycHJldF9j YXN0PENURm9udFJlZj4oc3Vic3RpdHV0ZUZvbnQpLCBwbGF0Zm9ybURhdGEuc2l6ZSgpLAorICAg IEZvbnRQbGF0Zm9ybURhdGEgYWx0ZXJuYXRlRm9udCh0b0NURm9udChzdWJzdGl0dXRlRm9udCks IHBsYXRmb3JtRGF0YS5zaXplKCksCiAgICAgICAgICFpc1BsYXRmb3JtRm9udCAmJiBpc0FwcEtp dEZvbnRXZWlnaHRCb2xkKHdlaWdodCkgJiYgIWlzQXBwS2l0Rm9udFdlaWdodEJvbGQoc3Vic3Rp dHV0ZUZvbnRXZWlnaHQpLAogICAgICAgICAhaXNQbGF0Zm9ybUZvbnQgJiYgKHRyYWl0cyAmIE5T Rm9udEl0YWxpY1RyYWl0KSAmJiAhKHN1YnN0aXR1dGVGb250VHJhaXRzICYgTlNGb250SXRhbGlj VHJhaXQpLAogICAgICAgICBwbGF0Zm9ybURhdGEubV9vcmllbnRhdGlvbik7CkBAIC03MDMsNyAr NzAzLDcgQEAgc3RkOjp1bmlxdWVfcHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3Jl YXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGUKICAgICBib29sIHN5bnRoZXRpY0JvbGQg PSAoZm9udERlc2NyaXB0aW9uLmZvbnRTeW50aGVzaXMoKSAmIEZvbnRTeW50aGVzaXNXZWlnaHQp ICYmIGlzQXBwS2l0Rm9udFdlaWdodEJvbGQodG9BcHBLaXRGb250V2VpZ2h0KGZvbnREZXNjcmlw dGlvbi53ZWlnaHQoKSkpICYmICFpc0FwcEtpdEZvbnRXZWlnaHRCb2xkKGFjdHVhbFdlaWdodCk7 CiAgICAgYm9vbCBzeW50aGV0aWNPYmxpcXVlID0gKGZvbnREZXNjcmlwdGlvbi5mb250U3ludGhl c2lzKCkgJiBGb250U3ludGhlc2lzU3R5bGUpICYmICh0cmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFp dCkgJiYgIShhY3R1YWxUcmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFpdCk7CiAKLSAgICByZXR1cm4g c3RkOjptYWtlX3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihyZWludGVycHJldF9jYXN0PENURm9u dFJlZj4ocGxhdGZvcm1Gb250KSwgc2l6ZSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1 ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0aFZh cmlhbnQoKSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8Rm9udFBsYXRmb3JtRGF0YT4o dG9DVEZvbnQocGxhdGZvcm1Gb250KSwgc2l6ZSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2Js aXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0 aFZhcmlhbnQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFnSW1hZ2VNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvRHJhZ0ltYWdlTWFjLm1tCmluZGV4IDY2YjFlYjg2NzYzY2M5MGYxN2E0 NTIwZmNiZjUwYjczNjVmYzBjZjkuLmI1MDVmYzEzOGQ1ODFhN2E0MWYxYmVhNjNmY2U1MjZlODU0 NjFmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFnSW1hZ2VN YWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0RyYWdJbWFnZU1hYy5tbQpA QCAtMTY4LDcgKzE2OCw3IEBAIHN0YXRpYyBGb250Q2FzY2FkZSYgZm9udEZyb21OU0ZvbnQoTlNG b250ICpmb250KQogICAgICAgICBDRlJlbGVhc2UoY3VycmVudEZvbnQpOwogICAgIGN1cnJlbnRG b250ID0gZm9udDsKICAgICBDRlJldGFpbihjdXJyZW50Rm9udCk7Ci0gICAgY3VycmVudFJlbmRl cmVyID0gRm9udENhc2NhZGUoRm9udFBsYXRmb3JtRGF0YShyZWludGVycHJldF9jYXN0PENURm9u dFJlZj4oZm9udCksIFtmb250IHBvaW50U2l6ZV0pKTsKKyAgICBjdXJyZW50UmVuZGVyZXIgPSBG b250Q2FzY2FkZShGb250UGxhdGZvcm1EYXRhKHRvQ1RGb250KGZvbnQpLCBbZm9udCBwb2ludFNp emVdKSk7CiAgICAgcmV0dXJuIGN1cnJlbnRSZW5kZXJlcjsKIH0KIApAQCAtMTkxLDcgKzE5MSw3 IEBAIHN0YXRpYyBmbG9hdCB3aWR0aFdpdGhGb250KE5TU3RyaW5nICpzdHJpbmcsIE5TRm9udCAq Zm9udCkKICAgICBbc3RyaW5nIGdldENoYXJhY3RlcnM6YnVmZmVyLmRhdGEoKV07CiAgICAgCiAg ICAgaWYgKGNhblVzZUZhc3RSZW5kZXJlcihidWZmZXIuZGF0YSgpLCBsZW5ndGgpKSB7Ci0gICAg ICAgIEZvbnRDYXNjYWRlIHdlYkNvcmVGb250KEZvbnRQbGF0Zm9ybURhdGEocmVpbnRlcnByZXRf Y2FzdDxDVEZvbnRSZWY+KGZvbnQpLCBbZm9udCBwb2ludFNpemVdKSk7CisgICAgICAgIEZvbnRD YXNjYWRlIHdlYkNvcmVGb250KEZvbnRQbGF0Zm9ybURhdGEodG9DVEZvbnQoZm9udCksIFtmb250 IHBvaW50U2l6ZV0pKTsKICAgICAgICAgVGV4dFJ1biBydW4oU3RyaW5nVmlldyhidWZmZXIuZGF0 YSgpLCBsZW5ndGgpKTsKICAgICAgICAgcnVuLmRpc2FibGVSb3VuZGluZ0hhY2tzKCk7CiAgICAg ICAgIHJldHVybiB3ZWJDb3JlRm9udC53aWR0aChydW4pOwpAQCAtMjIzLDcgKzIyMyw3IEBAIHN0 YXRpYyB2b2lkIGRyYXdBdFBvaW50KE5TU3RyaW5nICpzdHJpbmcsIE5TUG9pbnQgcG9pbnQsIE5T Rm9udCAqZm9udCwgTlNDb2xvciAqCiAgICAgICAgIGlmICghZmxpcHBlZCkKICAgICAgICAgICAg IENHQ29udGV4dFNjYWxlQ1RNKGNnQ29udGV4dCwgMSwgLTEpOwogICAgICAgICAgICAgCi0gICAg ICAgIEZvbnRDYXNjYWRlIHdlYkNvcmVGb250KEZvbnRQbGF0Zm9ybURhdGEocmVpbnRlcnByZXRf Y2FzdDxDVEZvbnRSZWY+KGZvbnQpLCBbZm9udCBwb2ludFNpemVdKSwgQW50aWFsaWFzZWQpOwor ICAgICAgICBGb250Q2FzY2FkZSB3ZWJDb3JlRm9udChGb250UGxhdGZvcm1EYXRhKHRvQ1RGb250 KGZvbnQpLCBbZm9udCBwb2ludFNpemVdKSwgQW50aWFsaWFzZWQpOwogICAgICAgICBUZXh0UnVu IHJ1bihTdHJpbmdWaWV3KGJ1ZmZlci5kYXRhKCksIGxlbmd0aCkpOwogICAgICAgICBydW4uZGlz YWJsZVJvdW5kaW5nSGFja3MoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vc3BpL21hYy9OU0ZvbnRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9tYWMv TlNGb250U1BJLmgKaW5kZXggZjJiOTM0MTU0YTU4MmI1ZmQ1NzRjYTFmM2Y4YTYzYTFjOTEwYTQ3 MS4uMDBmYTk4NjkxN2RjOTU4MjE0ZDhjZjRhZDM3MWFhYTk1MGIxM2M1NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL21hYy9OU0ZvbnRTUEkuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9zcGkvbWFjL05TRm9udFNQSS5oCkBAIC0zNCw3ICszNCw3IEBACiAK ICNlbHNlCiAKLUBpbnRlcmZhY2UgTlNGb250IChQcml2YXRlKQorQGludGVyZmFjZSBOU0ZvbnQg KCkKICsgKE5TRm9udCAqKXN5c3RlbUZvbnRPZlNpemU6KENHRmxvYXQpc2l6ZSB3ZWlnaHQ6KENH RmxvYXQpd2VpZ2h0OwogQGVuZAogCg==