89014 2012-06-13 10:04:00 -0700 [Chromium] Add setAutoHint() and setUseBitmaps() in WebFontRendering 2012-06-14 17:13:02 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89133 1 wangxianzhu wangxianzhu abarth derat dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 648178 0 wangxianzhu 2012-06-13 10:04:00 -0700 Add WebFontRendering::setAutoHint() so that we can move out hard-coded autohint settings out of WebCore. 648198 1 wangxianzhu 2012-06-13 10:17:21 -0700 setUseBitmaps() may be also useful. 649381 2 147632 wangxianzhu 2012-06-14 12:35:13 -0700 Created attachment 147632 patch 649382 3 webkit.review.bot 2012-06-14 12:36:58 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 649385 4 147633 wangxianzhu 2012-06-14 12:39:53 -0700 Created attachment 147633 patch v2 (a small naming change over v1) 649528 5 147633 jamesr 2012-06-14 15:08:09 -0700 Comment on attachment 147633 patch v2 (a small naming change over v1) R=me 649653 6 147633 webkit.review.bot 2012-06-14 17:12:57 -0700 Comment on attachment 147633 patch v2 (a small naming change over v1) Clearing flags on attachment: 147633 Committed r120379: <http://trac.webkit.org/changeset/120379> 649654 7 webkit.review.bot 2012-06-14 17:13:02 -0700 All reviewed patches have been landed. Closing bug. 147632 2012-06-14 12:35:13 -0700 2012-06-14 12:39:53 -0700 patch 89014 text/plain 7273 wangxianzhu SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDM0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTE0ICBYaWFuemh1 IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgc2V0QXV0b0hpbnQoKSBhbmQgc2V0VXNlQml0bWFwcygpIGluIFdlYkZvbnRSZW5kZXJpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MDE0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIGJlY2F1c2Ugb2Ygbm8gY2hhbmdlIG9mIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpz ZXRBdXRvSGludCk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpzZXRVc2VC aXRtYXBzKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OnNldEFudGlBbGlh cyk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpzZXR1cFBhaW50KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1 enouaDoKKyAgICAgICAgKEZvbnRQbGF0Zm9ybURhdGEpOgorCiAyMDEyLTA2LTE0ICBBbmRyZXkg QWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFJlbW92ZSBkZXZ0b29sc0luamVjdGVkU2NyaXB0IGhpZGRlbiBwcm9wZXJ0eQpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhh cmZCdXp6LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwCShyZXZpc2lvbiAxMjAzNDYp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZv cm1EYXRhSGFyZkJ1enouY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0NSw5IEBACiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBTa1BhaW50OjpIaW50aW5nIHNraWFIaW50aW5nID0g U2tQYWludDo6a05vcm1hbF9IaW50aW5nOwotc3RhdGljIGJvb2wgaXNTa2lhQW50aUFsaWFzID0g dHJ1ZTsKK3N0YXRpYyBib29sIHVzZVNraWFBdXRvSGludCA9IHRydWU7CitzdGF0aWMgYm9vbCB1 c2VTa2lhQml0bWFwcyA9IHRydWU7CitzdGF0aWMgYm9vbCB1c2VTa2lhQW50aUFsaWFzID0gdHJ1 ZTsKIHN0YXRpYyBib29sIHVzZVNraWFTdWJwaXhlbFJlbmRlcmluZyA9IGZhbHNlOwogc3RhdGlj IGJvb2wgdXNlU2tpYVN1YnBpeGVsUG9zaXRpb25pbmcgPSBmYWxzZTsKIApAQCAtNTQsOSArNTYs MTkgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXRIaW50aW5nKFNrUGFpbgogICAgIHNraWFI aW50aW5nID0gaGludGluZzsKIH0KIAotdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXRBbnRpQWxp YXMoYm9vbCBpc0FudGlBbGlhcykKK3ZvaWQgRm9udFBsYXRmb3JtRGF0YTo6c2V0QXV0b0hpbnQo Ym9vbCB1c2VBdXRvSGludCkKIHsKLSAgICBpc1NraWFBbnRpQWxpYXMgPSBpc0FudGlBbGlhczsK KyAgICB1c2VTa2lhQXV0b0hpbnQgPSB1c2VBdXRvSGludDsKK30KKwordm9pZCBGb250UGxhdGZv cm1EYXRhOjpzZXRVc2VCaXRtYXBzKGJvb2wgdXNlQml0bWFwcykKK3sKKyAgICB1c2VTa2lhQml0 bWFwcyA9IHVzZUJpdG1hcHM7Cit9CisKK3ZvaWQgRm9udFBsYXRmb3JtRGF0YTo6c2V0QW50aUFs aWFzKGJvb2wgdXNlQW50aUFsaWFzKQoreworICAgIHVzZVNraWFBbnRpQWxpYXMgPSB1c2VBbnRp QWxpYXM7CiB9CiAKIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6c2V0U3VicGl4ZWxSZW5kZXJpbmco Ym9vbCB1c2VTdWJwaXhlbFJlbmRlcmluZykKQEAgLTE2NSw3ICsxNzcsNyBAQCB2b2lkIEZvbnRQ bGF0Zm9ybURhdGE6OnNldHVwUGFpbnQoU2tQYWluCiB7CiAgICAgY29uc3QgZmxvYXQgdHMgPSBt X3RleHRTaXplID49IDAgPyBtX3RleHRTaXplIDogMTI7CiAKLSAgICBwYWludC0+c2V0QW50aUFs aWFzKG1fc3R5bGUudXNlQW50aUFsaWFzID09IEZvbnRSZW5kZXJTdHlsZTo6Tm9QcmVmZXJlbmNl ID8gaXNTa2lhQW50aUFsaWFzIDogbV9zdHlsZS51c2VBbnRpQWxpYXMpOworICAgIHBhaW50LT5z ZXRBbnRpQWxpYXMobV9zdHlsZS51c2VBbnRpQWxpYXMgPT0gRm9udFJlbmRlclN0eWxlOjpOb1By ZWZlcmVuY2UgPyB1c2VTa2lhQW50aUFsaWFzIDogbV9zdHlsZS51c2VBbnRpQWxpYXMpOwogICAg IHN3aXRjaCAobV9zdHlsZS51c2VIaW50aW5nKSB7CiAgICAgY2FzZSBGb250UmVuZGVyU3R5bGU6 Ok5vUHJlZmVyZW5jZToKICAgICAgICAgcGFpbnQtPnNldEhpbnRpbmcoc2tpYUhpbnRpbmcpOwpA QCAtMTc4LDE1ICsxOTAsMTUgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXR1cFBhaW50KFNr UGFpbgogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBwYWludC0+c2V0RW1iZWRkZWRCaXRt YXBUZXh0KG1fc3R5bGUudXNlQml0bWFwcyk7CisgICAgcGFpbnQtPnNldEVtYmVkZGVkQml0bWFw VGV4dChtX3N0eWxlLnVzZUJpdG1hcHMgPT0gRm9udFJlbmRlclN0eWxlOjpOb1ByZWZlcmVuY2Ug PyB1c2VTa2lhQml0bWFwcyA6IG1fc3R5bGUudXNlQml0bWFwcyk7CiAgICAgcGFpbnQtPnNldFRl eHRTaXplKFNrRmxvYXRUb1NjYWxhcih0cykpOwogICAgIHBhaW50LT5zZXRUeXBlZmFjZShtX3R5 cGVmYWNlKTsKICAgICBwYWludC0+c2V0RmFrZUJvbGRUZXh0KG1fZmFrZUJvbGQpOwogICAgIHBh aW50LT5zZXRUZXh0U2tld1gobV9mYWtlSXRhbGljID8gLVNLX1NjYWxhcjEgLyA0IDogMCk7Ci0g ICAgcGFpbnQtPnNldEF1dG9oaW50ZWQobV9zdHlsZS51c2VBdXRvSGludCk7CisgICAgcGFpbnQt PnNldEF1dG9oaW50ZWQobV9zdHlsZS51c2VBdXRvSGludCA9PSBGb250UmVuZGVyU3R5bGU6Ok5v UHJlZmVyZW5jZSA/IHVzZVNraWFBdXRvSGludCA6IG1fc3R5bGUudXNlQXV0b0hpbnQpOwogICAg IHBhaW50LT5zZXRTdWJwaXhlbFRleHQobV9zdHlsZS51c2VTdWJwaXhlbFBvc2l0aW9uaW5nID09 IEZvbnRSZW5kZXJTdHlsZTo6Tm9QcmVmZXJlbmNlID8gdXNlU2tpYVN1YnBpeGVsUG9zaXRpb25p bmcgOiBtX3N0eWxlLnVzZVN1YnBpeGVsUG9zaXRpb25pbmcpOwogCi0gICAgaWYgKG1fc3R5bGUu dXNlQW50aUFsaWFzID09IDEgfHwgKG1fc3R5bGUudXNlQW50aUFsaWFzID09IEZvbnRSZW5kZXJT dHlsZTo6Tm9QcmVmZXJlbmNlICYmIGlzU2tpYUFudGlBbGlhcykpCisgICAgaWYgKG1fc3R5bGUu dXNlQW50aUFsaWFzID09IDEgfHwgKG1fc3R5bGUudXNlQW50aUFsaWFzID09IEZvbnRSZW5kZXJT dHlsZTo6Tm9QcmVmZXJlbmNlICYmIHVzZVNraWFBbnRpQWxpYXMpKQogICAgICAgICBwYWludC0+ c2V0TENEUmVuZGVyVGV4dChtX3N0eWxlLnVzZVN1YnBpeGVsUmVuZGVyaW5nID09IEZvbnRSZW5k ZXJTdHlsZTo6Tm9QcmVmZXJlbmNlID8gdXNlU2tpYVN1YnBpeGVsUmVuZGVyaW5nIDogbV9zdHls ZS51c2VTdWJwaXhlbFJlbmRlcmluZyk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRQbGF0Zm9ybURhdGFIYXJmQnV6ei5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRQbGF0 Zm9ybURhdGFIYXJmQnV6ei5oCShyZXZpc2lvbiAxMjAzNDYpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouaAkod29y a2luZyBjb3B5KQpAQCAtMTM0LDYgKzEzNCw4IEBAIHB1YmxpYzoKICAgICAvLyBHbG9iYWwgZm9u dCBwcmVmZXJlbmNlcy4uLgogCiAgICAgc3RhdGljIHZvaWQgc2V0SGludGluZyhTa1BhaW50OjpI aW50aW5nKTsKKyAgICBzdGF0aWMgdm9pZCBzZXRBdXRvSGludChib29sKTsKKyAgICBzdGF0aWMg dm9pZCBzZXRVc2VCaXRtYXBzKGJvb2wpOwogICAgIHN0YXRpYyB2b2lkIHNldEFudGlBbGlhcyhi b29sKTsKICAgICBzdGF0aWMgdm9pZCBzZXRTdWJwaXhlbFJlbmRlcmluZyhib29sKTsKICAgICBz dGF0aWMgdm9pZCBzZXRTdWJwaXhlbFBvc2l0aW9uaW5nKGJvb2wpOwpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDM0NykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMTQg IFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hy b21pdW1dIEFkZCBzZXRBdXRvSGludCgpIGFuZCBzZXRVc2VCaXRtYXBzKCkgaW4gV2ViRm9udFJl bmRlcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODkwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHB1YmxpYy9saW51eGlzaC9XZWJGb250UmVuZGVyaW5nLmg6CisgICAgICAgIChXZWJGb250UmVu ZGVyaW5nKToKKyAgICAgICAgKiBzcmMvbGludXhpc2gvV2ViRm9udFJlbmRlcmluZy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZvbnRSZW5kZXJpbmc6OnNldEF1dG9IaW50KToKKyAgICAgICAg KFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZvbnRSZW5kZXJpbmc6OnNldFVzZUJpdG1h cHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGb250UmVuZGVyaW5nOjpzZXRBbnRpQWxpYXMpOgor CiAyMDEyLTA2LTE0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW2Nocm9taXVtXSBNb3ZlIG9wYXF1ZSByZWN0YW5nbGUgdHJhY2tpbmcgbG9naWMgb3V0 IG9mIGNvbXBvc2l0b3IgY29yZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv bGludXhpc2gvV2ViRm9udFJlbmRlcmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL2xpbnV4aXNoL1dlYkZvbnRSZW5kZXJpbmcuaAkocmV2aXNpb24gMTIw MzQ2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXhpc2gvV2ViRm9udFJl bmRlcmluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw4ICs0Miw5IEBAIHB1YmxpYzoKICAgICAv LyBTZXQgZ2xvYmFsIGZvbnQgcmVuZGVyZXJpbmcgcHJlZmVyZW5jZXMuCiAKICAgICBXRUJLSVRf RVhQT1JUIHN0YXRpYyB2b2lkIHNldEhpbnRpbmcoU2tQYWludDo6SGludGluZyk7CisgICAgV0VC S0lUX0VYUE9SVCBzdGF0aWMgdm9pZCBzZXRBdXRvSGludChib29sKTsKKyAgICBXRUJLSVRfRVhQ T1JUIHN0YXRpYyB2b2lkIHNldFVzZUJpdG1hcHMoYm9vbCk7CiAgICAgV0VCS0lUX0VYUE9SVCBz dGF0aWMgdm9pZCBzZXRBbnRpQWxpYXMoYm9vbCk7Ci0gICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMg dm9pZCBzZXRTdWJwaXhlbEdseXBocyhib29sKTsgLy8gREVQUkVDQVRFRDogdXNlIHNldFN1YnBp eGVsUmVuZGVyaW5nIGluc3RlYWQKICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHNldFN1 YnBpeGVsUmVuZGVyaW5nKGJvb2wpOwogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgc2V0 U3VicGl4ZWxQb3NpdGlvbmluZyhib29sKTsKICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lk IHNldExDRE9yZGVyKFNrRm9udEhvc3Q6OkxDRE9yZGVyKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL2xpbnV4aXNoL1dlYkZvbnRSZW5kZXJpbmcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2xpbnV4aXNoL1dlYkZvbnRSZW5kZXJpbmcuY3Bw CShyZXZpc2lvbiAxMjAzNDYpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9saW51eGlz aC9XZWJGb250UmVuZGVyaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsMTUgKzQ0LDIxIEBA IHZvaWQgV2ViRm9udFJlbmRlcmluZzo6c2V0SGludGluZyhTa1BhaW4KIH0KIAogLy8gc3RhdGlj Ci12b2lkIFdlYkZvbnRSZW5kZXJpbmc6OnNldEFudGlBbGlhcyhib29sIGlzQW50aUFsaWFzKQor dm9pZCBXZWJGb250UmVuZGVyaW5nOjpzZXRBdXRvSGludChib29sIHVzZUF1dG9IaW50KQogewot ICAgIEZvbnRQbGF0Zm9ybURhdGE6OnNldEFudGlBbGlhcyhpc0FudGlBbGlhcyk7CisgICAgRm9u dFBsYXRmb3JtRGF0YTo6c2V0QXV0b0hpbnQodXNlQXV0b0hpbnQpOworfQorCisvLyBzdGF0aWMK K3ZvaWQgV2ViRm9udFJlbmRlcmluZzo6c2V0VXNlQml0bWFwcyhib29sIHVzZUJpdG1hcHMpCit7 CisgICAgRm9udFBsYXRmb3JtRGF0YTo6c2V0VXNlQml0bWFwcyh1c2VCaXRtYXBzKTsKIH0KIAog Ly8gc3RhdGljCi12b2lkIFdlYkZvbnRSZW5kZXJpbmc6OnNldFN1YnBpeGVsR2x5cGhzKGJvb2wg aXNTdWJwaXhlbEdseXBocykKK3ZvaWQgV2ViRm9udFJlbmRlcmluZzo6c2V0QW50aUFsaWFzKGJv b2wgaXNBbnRpQWxpYXMpCiB7Ci0gICAgRm9udFBsYXRmb3JtRGF0YTo6c2V0U3VicGl4ZWxSZW5k ZXJpbmcoaXNTdWJwaXhlbEdseXBocyk7CisgICAgRm9udFBsYXRmb3JtRGF0YTo6c2V0QW50aUFs aWFzKGlzQW50aUFsaWFzKTsKIH0KIAogLy8gc3RhdGljCg== 147633 2012-06-14 12:39:53 -0700 2012-06-14 17:12:57 -0700 patch v2 (a small naming change over v1) 89014 text/plain 7275 wangxianzhu SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDM0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTE0ICBYaWFuemh1 IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgc2V0QXV0b0hpbnQoKSBhbmQgc2V0VXNlQml0bWFwcygpIGluIFdlYkZvbnRSZW5kZXJpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MDE0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIGJlY2F1c2Ugb2Ygbm8gY2hhbmdlIG9mIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpz ZXRBdXRvSGludCk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpzZXRVc2VC aXRtYXBzKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OnNldEFudGlBbGlh cyk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpzZXR1cFBhaW50KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1 enouaDoKKyAgICAgICAgKEZvbnRQbGF0Zm9ybURhdGEpOgorCiAyMDEyLTA2LTE0ICBBbmRyZXkg QWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFJlbW92ZSBkZXZ0b29sc0luamVjdGVkU2NyaXB0IGhpZGRlbiBwcm9wZXJ0eQpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhh cmZCdXp6LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwCShyZXZpc2lvbiAxMjAzNDYp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZv cm1EYXRhSGFyZkJ1enouY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0NSw5IEBACiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBTa1BhaW50OjpIaW50aW5nIHNraWFIaW50aW5nID0g U2tQYWludDo6a05vcm1hbF9IaW50aW5nOwotc3RhdGljIGJvb2wgaXNTa2lhQW50aUFsaWFzID0g dHJ1ZTsKK3N0YXRpYyBib29sIHVzZVNraWFBdXRvSGludCA9IHRydWU7CitzdGF0aWMgYm9vbCB1 c2VTa2lhQml0bWFwcyA9IHRydWU7CitzdGF0aWMgYm9vbCB1c2VTa2lhQW50aUFsaWFzID0gdHJ1 ZTsKIHN0YXRpYyBib29sIHVzZVNraWFTdWJwaXhlbFJlbmRlcmluZyA9IGZhbHNlOwogc3RhdGlj IGJvb2wgdXNlU2tpYVN1YnBpeGVsUG9zaXRpb25pbmcgPSBmYWxzZTsKIApAQCAtNTQsOSArNTYs MTkgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXRIaW50aW5nKFNrUGFpbgogICAgIHNraWFI aW50aW5nID0gaGludGluZzsKIH0KIAotdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXRBbnRpQWxp YXMoYm9vbCBpc0FudGlBbGlhcykKK3ZvaWQgRm9udFBsYXRmb3JtRGF0YTo6c2V0QXV0b0hpbnQo Ym9vbCB1c2VBdXRvSGludCkKIHsKLSAgICBpc1NraWFBbnRpQWxpYXMgPSBpc0FudGlBbGlhczsK KyAgICB1c2VTa2lhQXV0b0hpbnQgPSB1c2VBdXRvSGludDsKK30KKwordm9pZCBGb250UGxhdGZv cm1EYXRhOjpzZXRVc2VCaXRtYXBzKGJvb2wgdXNlQml0bWFwcykKK3sKKyAgICB1c2VTa2lhQml0 bWFwcyA9IHVzZUJpdG1hcHM7Cit9CisKK3ZvaWQgRm9udFBsYXRmb3JtRGF0YTo6c2V0QW50aUFs aWFzKGJvb2wgdXNlQW50aUFsaWFzKQoreworICAgIHVzZVNraWFBbnRpQWxpYXMgPSB1c2VBbnRp QWxpYXM7CiB9CiAKIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6c2V0U3VicGl4ZWxSZW5kZXJpbmco Ym9vbCB1c2VTdWJwaXhlbFJlbmRlcmluZykKQEAgLTE2NSw3ICsxNzcsNyBAQCB2b2lkIEZvbnRQ bGF0Zm9ybURhdGE6OnNldHVwUGFpbnQoU2tQYWluCiB7CiAgICAgY29uc3QgZmxvYXQgdHMgPSBt X3RleHRTaXplID49IDAgPyBtX3RleHRTaXplIDogMTI7CiAKLSAgICBwYWludC0+c2V0QW50aUFs aWFzKG1fc3R5bGUudXNlQW50aUFsaWFzID09IEZvbnRSZW5kZXJTdHlsZTo6Tm9QcmVmZXJlbmNl ID8gaXNTa2lhQW50aUFsaWFzIDogbV9zdHlsZS51c2VBbnRpQWxpYXMpOworICAgIHBhaW50LT5z ZXRBbnRpQWxpYXMobV9zdHlsZS51c2VBbnRpQWxpYXMgPT0gRm9udFJlbmRlclN0eWxlOjpOb1By ZWZlcmVuY2UgPyB1c2VTa2lhQW50aUFsaWFzIDogbV9zdHlsZS51c2VBbnRpQWxpYXMpOwogICAg IHN3aXRjaCAobV9zdHlsZS51c2VIaW50aW5nKSB7CiAgICAgY2FzZSBGb250UmVuZGVyU3R5bGU6 Ok5vUHJlZmVyZW5jZToKICAgICAgICAgcGFpbnQtPnNldEhpbnRpbmcoc2tpYUhpbnRpbmcpOwpA QCAtMTc4LDE1ICsxOTAsMTUgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXR1cFBhaW50KFNr UGFpbgogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBwYWludC0+c2V0RW1iZWRkZWRCaXRt YXBUZXh0KG1fc3R5bGUudXNlQml0bWFwcyk7CisgICAgcGFpbnQtPnNldEVtYmVkZGVkQml0bWFw VGV4dChtX3N0eWxlLnVzZUJpdG1hcHMgPT0gRm9udFJlbmRlclN0eWxlOjpOb1ByZWZlcmVuY2Ug PyB1c2VTa2lhQml0bWFwcyA6IG1fc3R5bGUudXNlQml0bWFwcyk7CiAgICAgcGFpbnQtPnNldFRl eHRTaXplKFNrRmxvYXRUb1NjYWxhcih0cykpOwogICAgIHBhaW50LT5zZXRUeXBlZmFjZShtX3R5 cGVmYWNlKTsKICAgICBwYWludC0+c2V0RmFrZUJvbGRUZXh0KG1fZmFrZUJvbGQpOwogICAgIHBh aW50LT5zZXRUZXh0U2tld1gobV9mYWtlSXRhbGljID8gLVNLX1NjYWxhcjEgLyA0IDogMCk7Ci0g ICAgcGFpbnQtPnNldEF1dG9oaW50ZWQobV9zdHlsZS51c2VBdXRvSGludCk7CisgICAgcGFpbnQt PnNldEF1dG9oaW50ZWQobV9zdHlsZS51c2VBdXRvSGludCA9PSBGb250UmVuZGVyU3R5bGU6Ok5v UHJlZmVyZW5jZSA/IHVzZVNraWFBdXRvSGludCA6IG1fc3R5bGUudXNlQXV0b0hpbnQpOwogICAg IHBhaW50LT5zZXRTdWJwaXhlbFRleHQobV9zdHlsZS51c2VTdWJwaXhlbFBvc2l0aW9uaW5nID09 IEZvbnRSZW5kZXJTdHlsZTo6Tm9QcmVmZXJlbmNlID8gdXNlU2tpYVN1YnBpeGVsUG9zaXRpb25p bmcgOiBtX3N0eWxlLnVzZVN1YnBpeGVsUG9zaXRpb25pbmcpOwogCi0gICAgaWYgKG1fc3R5bGUu dXNlQW50aUFsaWFzID09IDEgfHwgKG1fc3R5bGUudXNlQW50aUFsaWFzID09IEZvbnRSZW5kZXJT dHlsZTo6Tm9QcmVmZXJlbmNlICYmIGlzU2tpYUFudGlBbGlhcykpCisgICAgaWYgKG1fc3R5bGUu dXNlQW50aUFsaWFzID09IDEgfHwgKG1fc3R5bGUudXNlQW50aUFsaWFzID09IEZvbnRSZW5kZXJT dHlsZTo6Tm9QcmVmZXJlbmNlICYmIHVzZVNraWFBbnRpQWxpYXMpKQogICAgICAgICBwYWludC0+ c2V0TENEUmVuZGVyVGV4dChtX3N0eWxlLnVzZVN1YnBpeGVsUmVuZGVyaW5nID09IEZvbnRSZW5k ZXJTdHlsZTo6Tm9QcmVmZXJlbmNlID8gdXNlU2tpYVN1YnBpeGVsUmVuZGVyaW5nIDogbV9zdHls ZS51c2VTdWJwaXhlbFJlbmRlcmluZyk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRQbGF0Zm9ybURhdGFIYXJmQnV6ei5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRQbGF0 Zm9ybURhdGFIYXJmQnV6ei5oCShyZXZpc2lvbiAxMjAzNDYpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouaAkod29y a2luZyBjb3B5KQpAQCAtMTM0LDYgKzEzNCw4IEBAIHB1YmxpYzoKICAgICAvLyBHbG9iYWwgZm9u dCBwcmVmZXJlbmNlcy4uLgogCiAgICAgc3RhdGljIHZvaWQgc2V0SGludGluZyhTa1BhaW50OjpI aW50aW5nKTsKKyAgICBzdGF0aWMgdm9pZCBzZXRBdXRvSGludChib29sKTsKKyAgICBzdGF0aWMg dm9pZCBzZXRVc2VCaXRtYXBzKGJvb2wpOwogICAgIHN0YXRpYyB2b2lkIHNldEFudGlBbGlhcyhi b29sKTsKICAgICBzdGF0aWMgdm9pZCBzZXRTdWJwaXhlbFJlbmRlcmluZyhib29sKTsKICAgICBz dGF0aWMgdm9pZCBzZXRTdWJwaXhlbFBvc2l0aW9uaW5nKGJvb2wpOwpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDM0NykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDYtMTQg IFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hy b21pdW1dIEFkZCBzZXRBdXRvSGludCgpIGFuZCBzZXRVc2VCaXRtYXBzKCkgaW4gV2ViRm9udFJl bmRlcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODkwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHB1YmxpYy9saW51eGlzaC9XZWJGb250UmVuZGVyaW5nLmg6CisgICAgICAgIChXZWJGb250UmVu ZGVyaW5nKToKKyAgICAgICAgKiBzcmMvbGludXhpc2gvV2ViRm9udFJlbmRlcmluZy5jcHA6Cisg ICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGb250UmVuZGVyaW5nOjpzZXRB dXRvSGludCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZvbnRSZW5kZXJpbmc6OnNldFVzZUJpdG1h cHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGb250UmVuZGVyaW5nOjpzZXRBbnRpQWxpYXMpOgor CiAyMDEyLTA2LTE0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW2Nocm9taXVtXSBNb3ZlIG9wYXF1ZSByZWN0YW5nbGUgdHJhY2tpbmcgbG9naWMgb3V0 IG9mIGNvbXBvc2l0b3IgY29yZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv bGludXhpc2gvV2ViRm9udFJlbmRlcmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL2xpbnV4aXNoL1dlYkZvbnRSZW5kZXJpbmcuaAkocmV2aXNpb24gMTIw MzQ2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXhpc2gvV2ViRm9udFJl bmRlcmluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw4ICs0Miw5IEBAIHB1YmxpYzoKICAgICAv LyBTZXQgZ2xvYmFsIGZvbnQgcmVuZGVyZXJpbmcgcHJlZmVyZW5jZXMuCiAKICAgICBXRUJLSVRf RVhQT1JUIHN0YXRpYyB2b2lkIHNldEhpbnRpbmcoU2tQYWludDo6SGludGluZyk7CisgICAgV0VC S0lUX0VYUE9SVCBzdGF0aWMgdm9pZCBzZXRBdXRvSGludChib29sKTsKKyAgICBXRUJLSVRfRVhQ T1JUIHN0YXRpYyB2b2lkIHNldFVzZUJpdG1hcHMoYm9vbCk7CiAgICAgV0VCS0lUX0VYUE9SVCBz dGF0aWMgdm9pZCBzZXRBbnRpQWxpYXMoYm9vbCk7Ci0gICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMg dm9pZCBzZXRTdWJwaXhlbEdseXBocyhib29sKTsgLy8gREVQUkVDQVRFRDogdXNlIHNldFN1YnBp eGVsUmVuZGVyaW5nIGluc3RlYWQKICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lkIHNldFN1 YnBpeGVsUmVuZGVyaW5nKGJvb2wpOwogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIHZvaWQgc2V0 U3VicGl4ZWxQb3NpdGlvbmluZyhib29sKTsKICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyB2b2lk IHNldExDRE9yZGVyKFNrRm9udEhvc3Q6OkxDRE9yZGVyKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL2xpbnV4aXNoL1dlYkZvbnRSZW5kZXJpbmcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2xpbnV4aXNoL1dlYkZvbnRSZW5kZXJpbmcuY3Bw CShyZXZpc2lvbiAxMjAzNDYpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9saW51eGlz aC9XZWJGb250UmVuZGVyaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsMTUgKzQ0LDIxIEBA IHZvaWQgV2ViRm9udFJlbmRlcmluZzo6c2V0SGludGluZyhTa1BhaW4KIH0KIAogLy8gc3RhdGlj Ci12b2lkIFdlYkZvbnRSZW5kZXJpbmc6OnNldEFudGlBbGlhcyhib29sIGlzQW50aUFsaWFzKQor dm9pZCBXZWJGb250UmVuZGVyaW5nOjpzZXRBdXRvSGludChib29sIHVzZUF1dG9IaW50KQogewot ICAgIEZvbnRQbGF0Zm9ybURhdGE6OnNldEFudGlBbGlhcyhpc0FudGlBbGlhcyk7CisgICAgRm9u dFBsYXRmb3JtRGF0YTo6c2V0QXV0b0hpbnQodXNlQXV0b0hpbnQpOwogfQogCiAvLyBzdGF0aWMK LXZvaWQgV2ViRm9udFJlbmRlcmluZzo6c2V0U3VicGl4ZWxHbHlwaHMoYm9vbCBpc1N1YnBpeGVs R2x5cGhzKQordm9pZCBXZWJGb250UmVuZGVyaW5nOjpzZXRVc2VCaXRtYXBzKGJvb2wgdXNlQml0 bWFwcykKIHsKLSAgICBGb250UGxhdGZvcm1EYXRhOjpzZXRTdWJwaXhlbFJlbmRlcmluZyhpc1N1 YnBpeGVsR2x5cGhzKTsKKyAgICBGb250UGxhdGZvcm1EYXRhOjpzZXRVc2VCaXRtYXBzKHVzZUJp dG1hcHMpOworfQorCisvLyBzdGF0aWMKK3ZvaWQgV2ViRm9udFJlbmRlcmluZzo6c2V0QW50aUFs aWFzKGJvb2wgdXNlQW50aUFsaWFzKQoreworICAgIEZvbnRQbGF0Zm9ybURhdGE6OnNldEFudGlB bGlhcyh1c2VBbnRpQWxpYXMpOwogfQogCiAvLyBzdGF0aWMK