26853 2009-06-30 12:17:17 -0700 [Chromium] use different fonts for each script run. 2009-06-30 16:21:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 agl webkit-unassigned oldest_to_newest 129132 0 agl 2009-06-30 12:17:17 -0700 Previously, when rendering complex text, we picked a single font which could render all the glyphs needed for the run. However, this meant that sometimes lines were rendered with, for example, [LATIN, THAI, LATIN] and we could end up with a different font for the Latin parts than for lines without Thai in them. With this patch, we pick a font for each script run. This change is covered by existing layout tests. 129135 1 32083 agl 2009-06-30 12:20:53 -0700 Created attachment 32083 patch 129140 2 32083 eric 2009-06-30 12:34:47 -0700 Comment on attachment 32083 patch Looks OK. 129208 3 eric 2009-06-30 16:20:01 -0700 I think this already landed, right? btw, you can use: bugzilla-tool land-patches 26853 or bugzilla-tool land-diff 26853 to have it automatically update/close the bug for you in the future. see bugzilla-tool -h for more information. 32083 2009-06-30 12:20:53 -0700 2009-06-30 12:34:47 -0700 patch patch text/plain 10303 agl ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmFhNmY3Zi4uYjY5MDcwNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAwOS0wNi0zMCAgQWRhbSBMYW5nbGV5 ICA8YWdsQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ2hyb21pdW0gTGludXg6IHVzZSBkaWZmZXJlbnQgZm9udHMgZm9yIGVhY2gg c2NyaXB0IHJ1bi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjY4NTMKKworICAgICAgICBQcmV2aW91c2x5LCB3aGVuIHJlbmRlcmluZyBjb21wbGV4 IHRleHQsIHdlIHBpY2tlZCBhIHNpbmdsZSBmb250IHdoaWNoCisgICAgICAgIGNvdWxkIHJlbmRl ciBhbGwgdGhlIGdseXBocyBuZWVkZWQgZm9yIHRoZSBydW4uIEhvd2V2ZXIsIHRoaXMgbWVhbnQK KyAgICAgICAgdGhhdCBzb21ldGltZXMgbGluZXMgd2VyZSByZW5kZXJlZCB3aXRoLCBmb3IgZXhh bXBsZSwgW0xBVElOLCBUSEFJLAorICAgICAgICBMQVRJTl0gYW5kIHdlIGNvdWxkIGVuZCB1cCB3 aXRoIGEgZGlmZmVyZW50IGZvbnQgZm9yIHRoZSBMYXRpbiBwYXJ0cworICAgICAgICB0aGFuIGZv ciBsaW5lcyB3aXRob3V0IFRoYWkgaW4gdGhlbS4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2gs IHdlIHBpY2sgYSBmb250IGZvciBlYWNoIHNjcmlwdCBydW4uCisKKyAgICAgICAgVGhpcyBjaGFu Z2UgaXMgY292ZXJlZCBieSBleGlzdGluZyBsYXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250TGludXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udDo6ZHJhd0dseXBocyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UnVuV2Fsa2VyOjpUZXh0 UnVuV2Fsa2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSdW5XYWxrZXI6On5UZXh0UnVuV2Fs a2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSdW5XYWxrZXI6Om5leHRTY3JpcHRSdW4pOgor ICAgICAgICAoV2ViQ29yZTo6VGV4dFJ1bldhbGtlcjo6Zm9udFBsYXRmb3JtRGF0YUZvclNjcmlw dFJ1bik6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UnVuV2Fsa2VyOjpzZXR1cEZvbnRGb3JTY3Jp cHRSdW4pOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFJ1bldhbGtlcjo6YWxsb2NIYXJmYnV6ekZv bnQpOgorICAgICAgICAoV2ViQ29yZTo6c2V0dXBGb3JUZXh0UGFpbnRpbmcpOgorICAgICAgICAo V2ViQ29yZTo6Rm9udDo6ZHJhd0NvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6 OmZsb2F0V2lkdGhGb3JDb21wbGV4VGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpvZmZz ZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnNl bGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRQbGF0Zm9ybURhdGE6OnNldHVwUGFpbnQpOgorCiAyMDA5LTA2LTMwICBBbGV4ZXkgUHJvc2t1 cnlha292ICA8YXBAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0 ZWluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 TGludXguY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250TGludXgu Y3BwCmluZGV4IGU5YzE1NDEuLjJmYzE3NTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vRm9udExpbnV4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHAKQEAgLTEwMSw3ICsxMDEsNiBAQCB2b2lkIEZv bnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBnYywgY29uc3QgU2ltcGxlRm9udERhdGEq IGZvbnQsCiAgICAgICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgICAgIGdjLT5wbGF0Zm9ybUNvbnRl eHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwgMCwgMCk7CiAgICAgICAgIGZvbnQt PnBsYXRmb3JtRGF0YSgpLnNldHVwUGFpbnQoJnBhaW50KTsKLSAgICAgICAgcGFpbnQuc2V0Rmxh Z3MoU2tQYWludDo6a0FudGlBbGlhc19GbGFnKTsKICAgICAgICAgcGFpbnQuc2V0VGV4dEVuY29k aW5nKFNrUGFpbnQ6OmtHbHlwaElEX1RleHRFbmNvZGluZyk7CiAgICAgICAgIHBhaW50LnNldENv bG9yKGdjLT5zdHJva2VDb2xvcigpLnJnYigpKTsKIApAQCAtMTQyLDggKzE0MSw5IEBAIHN0YXRp YyBpbnQgdHJ1bmNhdGVGaXhlZFBvaW50VG9JbnRlZ2VyKEhCX0ZpeGVkIHZhbHVlKQogLy8gY2Fu IGNhbGwgfHJlc2V0fCB0byBzdGFydCBvdmVyIGFnYWluLgogY2xhc3MgVGV4dFJ1bldhbGtlciB7 CiBwdWJsaWM6Ci0gICAgVGV4dFJ1bldhbGtlcihjb25zdCBUZXh0UnVuJiBydW4sIFNrUGFpbnQq IHBhaW50LCB1bnNpZ25lZCBzdGFydGluZ1gsIGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEqIGZvbnQp Ci0gICAgICAgIDogbV9ydW4ocnVuKQorICAgIFRleHRSdW5XYWxrZXIoY29uc3QgVGV4dFJ1biYg cnVuLCB1bnNpZ25lZCBzdGFydGluZ1gsIGNvbnN0IEZvbnQqIGZvbnQpCisgICAgICAgIDogbV9m b250KGZvbnQpCisgICAgICAgICwgbV9ydW4ocnVuKQogICAgICAgICAsIG1fc3RhcnRpbmdYKHN0 YXJ0aW5nWCkKICAgICAgICAgLCBtX29mZnNldFgobV9zdGFydGluZ1gpCiAgICAgICAgICwgbV9p dGVyYXRlQmFja3dhcmRzKHJ1bi5ydGwoKSkKQEAgLTE1OCwxMSArMTU4LDggQEAgcHVibGljOgog CiAgICAgICAgIG1faXRlbS5sb2dfY2x1c3RlcnMgPSBuZXcgdW5zaWduZWQgc2hvcnRbcnVuLmxl bmd0aCgpXTsKIAotICAgICAgICBtX2l0ZW0uZmFjZSA9IEhCX05ld0ZhY2UoY29uc3RfY2FzdDxG b250UGxhdGZvcm1EYXRhKj4oZm9udCksIGhhcmZidXp6U2tpYUdldFRhYmxlKTsKLSAgICAgICAg bV9pdGVtLmZvbnQgPSBhbGxvY0hhcmZidXp6Rm9udChjb25zdF9jYXN0PEZvbnRQbGF0Zm9ybURh dGEqPihmb250KSk7Ci0gICAgICAgIC8vIFRoaXMgc2V0cyB1cCB0aGUgU2tQYWludCBncmFwaGlj cyBjb250ZXh0IHN1Y2ggdGhhdCB0aGUgdGV4dCByZWxhdGVkCi0gICAgICAgIC8vIGlucHV0IHdp bGwgYWx3YXlzIGJ5IGFzc3VtZWQgdG8gYmUgZm9udCBzcGVjaWZpYyBnbHlwaCBpZHMuCi0gICAg ICAgIHBhaW50LT5zZXRUZXh0RW5jb2RpbmcoU2tQYWludDo6a0dseXBoSURfVGV4dEVuY29kaW5n KTsKKyAgICAgICAgbV9pdGVtLmZhY2UgPSAwOworICAgICAgICBtX2l0ZW0uZm9udCA9IGFsbG9j SGFyZmJ1enpGb250KCk7CiAKICAgICAgICAgbV9pdGVtLnN0cmluZyA9IHJ1bi5jaGFyYWN0ZXJz KCk7CiAgICAgICAgIG1faXRlbS5zdHJpbmdMZW5ndGggPSBydW4ubGVuZ3RoKCk7CkBAIC0xNzYs NyArMTczLDggQEAgcHVibGljOgogICAgICAgICBmYXN0RnJlZShtX2l0ZW0uZm9udCk7CiAgICAg ICAgIGRlbGV0ZUdseXBoQXJyYXlzKCk7CiAgICAgICAgIGRlbGV0ZVtdIG1faXRlbS5sb2dfY2x1 c3RlcnM7Ci0gICAgICAgIEhCX0ZyZWVGYWNlKG1faXRlbS5mYWNlKTsKKyAgICAgICAgaWYgKG1f aXRlbS5mYWNlKQorICAgICAgICAgICAgSEJfRnJlZUZhY2UobV9pdGVtLmZhY2UpOwogICAgIH0K IAogICAgIHZvaWQgcmVzZXQoKQpAQCAtMjI0LDYgKzIyMiw4IEBAIHB1YmxpYzoKICAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAorICAgICAgICBzZXR1cEZvbnRGb3JT Y3JpcHRSdW4oKTsKKwogICAgICAgICBpZiAoIXNoYXBlR2x5cGhzKCkpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIHNldEdseXBoWFBvc2l0aW9ucyhydGwoKSk7CkBAIC0yNzcs NiArMjc3LDEwIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1fbnVtQ29kZVBvaW50czsKICAg ICB9CiAKKyAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhKiBmb250UGxhdGZvcm1EYXRhRm9yU2Ny aXB0UnVuKCkKKyAgICB7CisgICAgICAgIHJldHVybiByZWludGVycHJldF9jYXN0PEZvbnRQbGF0 Zm9ybURhdGEqPihtX2l0ZW0uZm9udC0+dXNlckRhdGEpOworICAgIH0KIAogICAgIGZsb2F0IHdp ZHRoT2ZGdWxsUnVuKCkKICAgICB7CkBAIC0yODgsMTIgKzI5MiwyNSBAQCBwdWJsaWM6CiAgICAg fQogCiBwcml2YXRlOgotICAgIEhCX0ZvbnRSZWMqIGFsbG9jSGFyZmJ1enpGb250KHZvaWQqIHVz ZXJEYXRhKQorICAgIHZvaWQgc2V0dXBGb250Rm9yU2NyaXB0UnVuKCkKKyAgICB7CisgICAgICAg IGNvbnN0IEZvbnREYXRhKiBmb250RGF0YSA9IG1fZm9udC0+Zm9udERhdGFBdCgwKTsKKyAgICAg ICAgaWYgKCFmb250RGF0YS0+Y29udGFpbnNDaGFyYWN0ZXJzKG1faXRlbS5zdHJpbmcgKyBtX2l0 ZW0uaXRlbS5wb3MsIG1faXRlbS5pdGVtLmxlbmd0aCkpCisgICAgICAgICAgICBmb250RGF0YSA9 IG1fZm9udC0+Zm9udERhdGFGb3JDaGFyYWN0ZXJzKG1faXRlbS5zdHJpbmcgKyBtX2l0ZW0uaXRl bS5wb3MsIG1faXRlbS5pdGVtLmxlbmd0aCk7CisgICAgICAgIGNvbnN0IEZvbnRQbGF0Zm9ybURh dGEmIHBsYXRmb3JtRGF0YSA9IGZvbnREYXRhLT5mb250RGF0YUZvckNoYXJhY3RlcignICcpLT5w bGF0Zm9ybURhdGEoKTsKKyAgICAgICAgdm9pZCogb3BhcXVlUGxhdGZvcm1EYXRhID0gY29uc3Rf Y2FzdDxGb250UGxhdGZvcm1EYXRhKj4oJnBsYXRmb3JtRGF0YSk7CisgICAgICAgIG1faXRlbS5m b250LT51c2VyRGF0YSA9IG9wYXF1ZVBsYXRmb3JtRGF0YTsKKyAgICAgICAgaWYgKG1faXRlbS5m YWNlKQorICAgICAgICAgICAgSEJfRnJlZUZhY2UobV9pdGVtLmZhY2UpOworICAgICAgICBtX2l0 ZW0uZmFjZSA9IEhCX05ld0ZhY2Uob3BhcXVlUGxhdGZvcm1EYXRhLCBoYXJmYnV6elNraWFHZXRU YWJsZSk7CisgICAgfQorCisgICAgSEJfRm9udFJlYyogYWxsb2NIYXJmYnV6ekZvbnQoKQogICAg IHsKICAgICAgICAgSEJfRm9udFJlYyogZm9udCA9IHJlaW50ZXJwcmV0X2Nhc3Q8SEJfRm9udFJl Yyo+KGZhc3RNYWxsb2Moc2l6ZW9mKEhCX0ZvbnRSZWMpKSk7CiAgICAgICAgIG1lbXNldChmb250 LCAwLCBzaXplb2YoSEJfRm9udFJlYykpOwogICAgICAgICBmb250LT5rbGFzcyA9ICZoYXJmYnV6 elNraWFDbGFzczsKLSAgICAgICAgZm9udC0+dXNlckRhdGEgPSB1c2VyRGF0YTsKKyAgICAgICAg Zm9udC0+dXNlckRhdGEgPSAwOwogICAgICAgICAvLyBUaGUgdmFsdWVzIHdoaWNoIGhhcmZidXp6 U2tpYUNsYXNzIHJldHVybnMgYXJlIGFscmVhZHkgc2NhbGVkIHRvCiAgICAgICAgIC8vIHBpeGVs IHVuaXRzLCBzbyB3ZSBqdXN0IHNldCBhbGwgdGhlc2UgdG8gb25lIHRvIGRpc2FibGUgZnVydGhl cgogICAgICAgICAvLyBzY2FsaW5nLgpAQCAtMzcyLDYgKzM4OSw3IEBAIHByaXZhdGU6CiAgICAg ICAgIG1fb2Zmc2V0WCArPSBtX3BpeGVsV2lkdGg7CiAgICAgfQogCisgICAgY29uc3QgRm9udCog Y29uc3QgbV9mb250OwogICAgIGNvbnN0IFRleHRSdW4mIG1fcnVuOwogICAgIEhCX1NoYXBlckl0 ZW0gbV9pdGVtOwogICAgIHVpbnQxNl90KiBtX2dseXBoczE2OyAvLyBBIHZlY3RvciBvZiAxNi1i aXQgZ2x5cGggaWRzLgpAQCAtMzg1LDI3ICs0MDMsMTggQEAgcHJpdmF0ZToKICAgICBib29sIG1f aXRlcmF0ZUJhY2t3YXJkczsKIH07CiAKLXN0YXRpYyB2b2lkIHNldHVwRm9yVGV4dFBhaW50aW5n KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnQsIFNrUGFpbnQqIHBhaW50LCBTa0NvbG9yIGNv bG9yKQorc3RhdGljIHZvaWQgc2V0dXBGb3JUZXh0UGFpbnRpbmcoU2tQYWludCogcGFpbnQsIFNr Q29sb3IgY29sb3IpCiB7Ci0gICAgZm9udC5zZXR1cFBhaW50KHBhaW50KTsKLSAgICBwYWludC0+ c2V0RmxhZ3MoU2tQYWludDo6a0FudGlBbGlhc19GbGFnKTsKICAgICBwYWludC0+c2V0VGV4dEVu Y29kaW5nKFNrUGFpbnQ6OmtHbHlwaElEX1RleHRFbmNvZGluZyk7CiAgICAgcGFpbnQtPnNldENv bG9yKGNvbG9yKTsKIH0KIAotc3RhdGljIEZvbnRQbGF0Zm9ybURhdGEgZm9udFBsYXRmb3JtRGF0 YUZvclRleHRSdW4oY29uc3QgRm9udCogZm9udCwgY29uc3QgVGV4dFJ1biYgcnVuKQotewotICAg IHJldHVybiBmb250LT5mb250RGF0YUZvckNoYXJhY3RlcnMocnVuLmNoYXJhY3RlcnMoKSwgcnVu Lmxlbmd0aCgpKS0+Zm9udERhdGFGb3JDaGFyYWN0ZXIoJyAnKS0+cGxhdGZvcm1EYXRhKCk7Ci19 Ci0KIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdyYXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0 IFRleHRSdW4mIHJ1biwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZsb2F0UG9p bnQmIHBvaW50LCBpbnQgZnJvbSwgaW50IHRvKSBjb25zdAogewogICAgIGlmICghcnVuLmxlbmd0 aCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBmb250 ID0gZm9udFBsYXRmb3JtRGF0YUZvclRleHRSdW4odGhpcywgcnVuKTsKLQogICAgIFNrQ2FudmFz KiBjYW52YXMgPSBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygpOwogICAgIGludCB0ZXh0 TW9kZSA9IGdjLT5wbGF0Zm9ybUNvbnRleHQoKS0+Z2V0VGV4dERyYXdpbmdNb2RlKCk7CiAgICAg Ym9vbCBmaWxsID0gdGV4dE1vZGUgJiBjVGV4dEZpbGw7CkBAIC00MTksMzAgKzQyOCwzMSBAQCB2 b2lkIEZvbnQ6OmRyYXdDb21wbGV4VGV4dChHcmFwaGljc0NvbnRleHQqIGdjLCBjb25zdCBUZXh0 UnVuJiBydW4sCiAgICAgU2tQYWludCBzdHJva2VQYWludCwgZmlsbFBhaW50OwogICAgIGlmIChm aWxsKSB7CiAgICAgICAgIGdjLT5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvckZpbGxp bmcoJmZpbGxQYWludCk7Ci0gICAgICAgIHNldHVwRm9yVGV4dFBhaW50aW5nKGZvbnQsICZmaWxs UGFpbnQsIGdjLT5maWxsQ29sb3IoKS5yZ2IoKSk7CisgICAgICAgIHNldHVwRm9yVGV4dFBhaW50 aW5nKCZmaWxsUGFpbnQsIGdjLT5maWxsQ29sb3IoKS5yZ2IoKSk7CiAgICAgfQogICAgIGlmIChz dHJva2UpIHsKICAgICAgICAgZ2MtPnBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yU3Ry b2tpbmcoJnN0cm9rZVBhaW50LCAwLCAwKTsKLSAgICAgICAgc2V0dXBGb3JUZXh0UGFpbnRpbmco Zm9udCwgJnN0cm9rZVBhaW50LCBnYy0+c3Ryb2tlQ29sb3IoKS5yZ2IoKSk7CisgICAgICAgIHNl dHVwRm9yVGV4dFBhaW50aW5nKCZzdHJva2VQYWludCwgZ2MtPnN0cm9rZUNvbG9yKCkucmdiKCkp OwogICAgIH0KIAotICAgIFRleHRSdW5XYWxrZXIgd2Fsa2VyKHJ1biwgc3Ryb2tlID8gJnN0cm9r ZVBhaW50IDogJmZpbGxQYWludCwgcG9pbnQueCgpLCAmZm9udCk7CisgICAgVGV4dFJ1bldhbGtl ciB3YWxrZXIocnVuLCBwb2ludC54KCksIHRoaXMpOwogCiAgICAgd2hpbGUgKHdhbGtlci5uZXh0 U2NyaXB0UnVuKCkpIHsKLSAgICAgICAgaWYgKGZpbGwpCisgICAgICAgIGlmIChmaWxsKSB7Cisg ICAgICAgICAgICB3YWxrZXIuZm9udFBsYXRmb3JtRGF0YUZvclNjcmlwdFJ1bigpLT5zZXR1cFBh aW50KCZmaWxsUGFpbnQpOwogICAgICAgICAgICAgY2FudmFzLT5kcmF3UG9zVGV4dEgod2Fsa2Vy LmdseXBocygpLCB3YWxrZXIubGVuZ3RoKCkgPDwgMSwgd2Fsa2VyLnhQb3NpdGlvbnMoKSwgcG9p bnQueSgpLCBmaWxsUGFpbnQpOwotICAgICAgICBpZiAoc3Ryb2tlKQorICAgICAgICB9CisKKyAg ICAgICAgaWYgKHN0cm9rZSkgeworICAgICAgICAgICAgd2Fsa2VyLmZvbnRQbGF0Zm9ybURhdGFG b3JTY3JpcHRSdW4oKS0+c2V0dXBQYWludCgmc3Ryb2tlUGFpbnQpOwogICAgICAgICAgICAgY2Fu dmFzLT5kcmF3UG9zVGV4dEgod2Fsa2VyLmdseXBocygpLCB3YWxrZXIubGVuZ3RoKCkgPDwgMSwg d2Fsa2VyLnhQb3NpdGlvbnMoKSwgcG9pbnQueSgpLCBzdHJva2VQYWludCk7CisgICAgICAgIH0K ICAgICB9CiB9CiAKIGZsb2F0IEZvbnQ6OmZsb2F0V2lkdGhGb3JDb21wbGV4VGV4dChjb25zdCBU ZXh0UnVuJiBydW4sIEhhc2hTZXQ8Y29uc3QgU2ltcGxlRm9udERhdGEqPiogLyogZmFsbGJhY2tG b250cyAqLykgY29uc3QKIHsKLSAgICBTa1BhaW50IHBhaW50OwotICAgIGNvbnN0IEZvbnRQbGF0 Zm9ybURhdGEmIGZvbnQgPSBmb250UGxhdGZvcm1EYXRhRm9yVGV4dFJ1bih0aGlzLCBydW4pOwot ICAgIGZvbnQuc2V0dXBQYWludCgmcGFpbnQpOwotCi0gICAgVGV4dFJ1bldhbGtlciB3YWxrZXIo cnVuLCAmcGFpbnQsIDAsICZmb250KTsKKyAgICBUZXh0UnVuV2Fsa2VyIHdhbGtlcihydW4sIDAs IHRoaXMpOwogICAgIHJldHVybiB3YWxrZXIud2lkdGhPZkZ1bGxSdW4oKTsKIH0KIApAQCAtNDcz LDExICs0ODMsNyBAQCBpbnQgRm9udDo6b2Zmc2V0Rm9yUG9zaXRpb25Gb3JDb21wbGV4VGV4dChj b25zdCBUZXh0UnVuJiBydW4sIGludCB4LAogewogICAgIC8vIChNYWMgY29kZSBpZ25vcmVzIGlu Y2x1ZGVQYXJ0aWFsR2x5cGhzLCBhbmQgdGhleSBkb24ndCBrbm93IHdoYXQgaXQncwogICAgIC8v IHN1cHBvc2VkIHRvIGRvLCBzbyB3ZSBqdXN0IGlnbm9yZSBpdCBhcyB3ZWxsLikKLSAgICBTa1Bh aW50IHBhaW50OwotICAgIGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnQgPSBmb250UGxhdGZv cm1EYXRhRm9yVGV4dFJ1bih0aGlzLCBydW4pOwotICAgIGZvbnQuc2V0dXBQYWludCgmcGFpbnQp OwotCi0gICAgVGV4dFJ1bldhbGtlciB3YWxrZXIocnVuLCAmcGFpbnQsIDAsICZmb250KTsKKyAg ICBUZXh0UnVuV2Fsa2VyIHdhbGtlcihydW4sIDAsIHRoaXMpOwogCiAgICAgLy8gSWYgdGhpcyBp cyBSVEwgdGV4dCwgdGhlIGZpcnN0IGdseXBoIGZyb20gdGhlIGxlZnQgaXMgYWN0dWFsbHkgdGhl IGxhc3QKICAgICAvLyBjb2RlIHBvaW50LiBTbyB3ZSBuZWVkIHRvIGtub3cgaG93IG1hbnkgY29k ZSBwb2ludHMgdGhlcmUgYXJlIHRvdGFsIGluCkBAIC01NDYsMTMgKzU1Miw4IEBAIEZsb2F0UmVj dCBGb250OjpzZWxlY3Rpb25SZWN0Rm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYgcnVuLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRQb2lu dCYgcG9pbnQsIGludCBoZWlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGludCBmcm9tLCBpbnQgdG8pIGNvbnN0CiB7Ci0gICAgU2tQYWludCBwYWludDsK LSAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBmb250ID0gZm9udFBsYXRmb3JtRGF0YUZvclRl eHRSdW4odGhpcywgcnVuKTsKLSAgICBmb250LnNldHVwUGFpbnQoJnBhaW50KTsKLQogICAgIGlu dCBmcm9tWCA9IC0xLCB0b1ggPSAtMSwgZnJvbUFkdmFuY2UgPSAtMSwgdG9BZHZhbmNlID0gLTE7 Ci0KLSAgICBUZXh0UnVuV2Fsa2VyIHdhbGtlcihydW4sICZwYWludCwgMCwgJmZvbnQpOworICAg IFRleHRSdW5XYWxrZXIgd2Fsa2VyKHJ1biwgMCwgdGhpcyk7CiAKICAgICAvLyBCYXNlIHdpbGwg cG9pbnQgdG8gdGhlIHggb2Zmc2V0IGZvciB0aGUgY3VycmVudCBzY3JpcHQgcnVuLiBOb3RlIHRo YXQsIGluCiAgICAgLy8gdGhlIExUUiBjYXNlLCB3aWR0aCB3aWxsIGJlIDAuCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51 eC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURh dGFMaW51eC5jcHAKaW5kZXggZTZhNjFmNi4uZmNiMjUyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4 LmNwcApAQCAtOTIsNyArOTIsNiBAQCB2b2lkIEZvbnRQbGF0Zm9ybURhdGE6OnNldHVwUGFpbnQo U2tQYWludCogcGFpbnQpIGNvbnN0CiAgICAgcGFpbnQtPnNldFR5cGVmYWNlKG1fdHlwZWZhY2Up OwogICAgIHBhaW50LT5zZXRGYWtlQm9sZFRleHQobV9mYWtlQm9sZCk7CiAgICAgcGFpbnQtPnNl dFRleHRTa2V3WChtX2Zha2VJdGFsaWMgPyAtU0tfU2NhbGFyMSAvIDQgOiAwKTsKLSAgICBwYWlu dC0+c2V0VGV4dEVuY29kaW5nKFNrUGFpbnQ6OmtVVEYxNl9UZXh0RW5jb2RpbmcpOwogfQogCiBT a0ZvbnRJRCBGb250UGxhdGZvcm1EYXRhOjp1bmlxdWVJRCgpIGNvbnN0Cg==