97620 2012-09-25 17:59:44 -0700 [mac] Stop using screen fonts 2012-09-25 23:00:05 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz mitz rniwa simon.fraser oldest_to_newest 728105 0 mitz 2012-09-25 17:59:44 -0700 <rdar://problem/11455228> 728112 1 165710 mitz 2012-09-25 18:10:59 -0700 Created attachment 165710 Change the default value of the screenFontSubstitutionEnabled preference and respect NSFontDefaultScreenFontSubstitutionEnabled 728196 2 mitz 2012-09-25 22:13:20 -0700 Committed <http://trac.webkit.org/r129593>. 728213 3 rniwa 2012-09-25 22:58:48 -0700 It seems like this patch broke Qt? http://build.webkit.org/builders/Qt%20Linux%2064-bit%20Release%20%28Perf%29/builds/5136/steps/compile-webkit/logs/stdio 728215 4 mitz 2012-09-25 23:00:05 -0700 (In reply to comment #3) > It seems like this patch broke Qt? > http://build.webkit.org/builders/Qt%20Linux%2064-bit%20Release%20%28Perf%29/builds/5136/steps/compile-webkit/logs/stdio Thanks, I am going to fix that. 165710 2012-09-25 18:10:59 -0700 2012-09-25 20:31:57 -0700 Change the default value of the screenFontSubstitutionEnabled preference and respect NSFontDefaultScreenFontSubstitutionEnabled bug-97620-20120925181018.patch text/plain 14230 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTU3OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA5LTI1ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0MiBwYXJ0IG9mIDxyZGFy Oi8vcHJvYmxlbS8xMTQ1NTIyOD4gW21hY10gU3RvcCB1c2luZyBzY3JlZW4gZm9udHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3NjIwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJl ZmVyZW5jZXNTdG9yZS5oOgorICAgICAgICAoV2ViS2l0KTogQ2hhbmdlZCB0aGUgZGVmYXVsdCB2 YWx1ZSBvZiB0aGUgc2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQgcHJlZmVyZW5jZSB0byBm YWxzZS4KKyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OldlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMpOiBBZGRlZCBhbiBpbml0aWFsaXplciBmb3IKKyAgICAgICAg dGhlIG5ldyBzaG91bGRGb3JjZVNjcmVlbkZvbnRTdWJzdGl0dXRpb24gZGF0YSBtZW1iZXIuCisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6IEFk ZGVkIGVuY29kaW5nIG9mIHNob3VsZEZvcmNlU2NyZWVuRm9udFN1YnN0aXR1dGlvbi4KKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKTogQWRkZWQg ZGVjb2Rpbmcgb2Ygc2hvdWxkRm9yY2VTY3JlZW5Gb250U3Vic3RpdHV0aW9uLgorICAgICAgICAq IFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgIChXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzKTogQWRkZWQgc2hvdWxkRm9yY2VTY3JlZW5Gb250U3Vic3Rp dHV0aW9uIGJvb2xlYW4gZGF0YSBtZW1iZXIuCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJD b250ZXh0TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKTogQWRkZWQgY29kZSB0byBzZXQgc2hvdWxkRm9yY2VTY3JlZW5Gb250 U3Vic3RpdHV0aW9uCisgICAgICAgIGluIHRoZSBwcm9jZXNzIGNyZWF0aW9uIHBhcmFtZXRlcnMg dG8gdGhlIHZhbHVlIG9mIHRoZSBOU0ZvbnREZWZhdWx0U2NyZWVuRm9udFN1YnN0aXR1dGlvbkVu YWJsZWQgdXNlcgorICAgICAgICBkZWZhdWx0cyBrZXkuCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVm ZXJlbmNlcyk6IENoYW5nZWQgdG8gZW5hYmxlIHNjcmVlbiBmb250IHN1YnN0aXR1dGlvbiBhbHNv IGlmCisgICAgICAgIHNob3VsZEZvcmNlU2NyZWVuRm9udFN1YnN0aXR1dGlvbigpIGlzIHRydWUu CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3M6OnNob3VsZEZvcmNlU2NyZWVuRm9udFN1YnN0aXR1dGlvbik6IEFkZGVkIHRoaXMg Z2V0dGVyLgorICAgICAgICAoV2ViUHJvY2Vzcyk6IEFkZGVkIG1fc2hvdWxkRm9yY2VTY3JlZW5G b250U3Vic3RpdHV0aW9uIGJvb2xlYW4gZGF0YSBtZW1iZXIuCisgICAgICAgICogV2ViUHJvY2Vz cy9tYWMvV2ViUHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxh dGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IEFkZGVkIGluaXRpYWxpemF0aW9uIG9mCisgICAg ICAgIG1fc2hvdWxkRm9yY2VTY3JlZW5Gb250U3Vic3RpdHV0aW9uIGZyb20gdGhlIGNyZWF0aW9u IHBhcmFtZXRlcnMuCisKIDIwMTItMDktMjUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBXZWJDb250ZXh0OjptX3BlbmRpbmdNZXNzYWdl c1RvUG9zdFRvSW5qZWN0ZWRCdW5kbGUKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YlByZWZlcmVuY2VzU3RvcmUuaAkocmV2aXNpb24gMTI5NTIwKQorKysgU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtNTQsNiArNTQs MTIgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAjZGVmaW5lIERFRkFVTFRfV0VCS0lUX1NDUk9MTF9B TklNQVRPUl9FTkFCTEVEIGZhbHNlCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisjZGVmaW5lIERFRkFVTFRfU0NS RUVOX0ZPTlRfU1VCU1RJVFVUSU9JTl9FTkFCTEVEIGZhbHNlCisjZWxzZQorI2RlZmluZSBERUZB VUxUX1NDUkVFTl9GT05UX1NVQlNUSVRVVElPSU5fRU5BQkxFRCB0cnVlCisjZW5kaWYKKwogI2Rl ZmluZSBGT1JfRUFDSF9XRUJLSVRfQk9PTF9QUkVGRVJFTkNFKG1hY3JvKSBcCiAgICAgbWFjcm8o SmF2YVNjcmlwdEVuYWJsZWQsIGphdmFTY3JpcHRFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBc CiAgICAgbWFjcm8oTG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5LCBsb2Fkc0ltYWdlc0F1dG9tYXRp Y2FsbHksIEJvb2wsIGJvb2wsIHRydWUpIFwKQEAgLTEyOCw3ICsxMzQsNyBAQCBuYW1lc3BhY2Ug V2ViS2l0IHsKICAgICBtYWNybyhTY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkLCBz Y3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAog ICAgIG1hY3JvKFN0b3JhZ2VCbG9ja2luZ1BvbGljeSwgc3RvcmFnZUJsb2NraW5nUG9saWN5LCBV SW50MzIsIHVpbnQzMl90LCAwKSBcCiAgICAgbWFjcm8oU2Nyb2xsQW5pbWF0b3JFbmFibGVkLCBz Y3JvbGxBbmltYXRvckVuYWJsZWQsIEJvb2wsIGJvb2wsIERFRkFVTFRfV0VCS0lUX1NDUk9MTF9B TklNQVRPUl9FTkFCTEVEKSBcCi0gICAgbWFjcm8oU2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJs ZWQsIHNjcmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCisg ICAgbWFjcm8oU2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQsIHNjcmVlbkZvbnRTdWJzdGl0 dXRpb25FbmFibGVkLCBCb29sLCBib29sLCBERUZBVUxUX1NDUkVFTl9GT05UX1NVQlNUSVRVVElP SU5fRU5BQkxFRCkgXAogICAgIFwKIAogI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfRE9VQkxFX1BS RUZFUkVOQ0UobWFjcm8pIFwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDEyOTUyMCkKKysr IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzOjpXZWJQcm9jZXNzCiAjaWYgUExBVEZPUk0oTUFDKQogICAgICwgbnNVUkxDYWNoZU1lbW9y eUNhcGFjaXR5KDApCiAgICAgLCBuc1VSTENhY2hlRGlza0NhcGFjaXR5KDApCisgICAgLCBzaG91 bGRGb3JjZVNjcmVlbkZvbnRTdWJzdGl0dXRpb24oZmFsc2UpCiAjZWxpZiBQTEFURk9STShXSU4p CiAgICAgLCBzaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzKGZhbHNlKQogI2VuZGlmCkBAIC05MSw2 ICs5Miw3IEBAIHZvaWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2QKICAgICBl bmNvZGVyLT5lbmNvZGUoYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1BvcnQpOwogICAgIGVuY29kZXIt PmVuY29kZSh1aVByb2Nlc3NCdW5kbGVSZXNvdXJjZVBhdGgpOwogICAgIGVuY29kZXItPmVuY29k ZSh1aVByb2Nlc3NCdW5kbGVSZXNvdXJjZVBhdGhFeHRlbnNpb25IYW5kbGUpOworICAgIGVuY29k ZXItPmVuY29kZShzaG91bGRGb3JjZVNjcmVlbkZvbnRTdWJzdGl0dXRpb24pOwogI2VsaWYgUExB VEZPUk0oV0lOKQogICAgIGVuY29kZXItPmVuY29kZShzaG91bGRQYWludE5hdGl2ZUNvbnRyb2xz KTsKICAgICBlbmNvZGVyLT5lbmNvZGUoY2ZVUkxDYWNoZVBhdGgpOwpAQCAtMTk2LDYgKzE5OCw4 IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2QKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMudWlQcm9jZXNz QnVuZGxlUmVzb3VyY2VQYXRoRXh0ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMuc2hvdWxkRm9yY2VTY3JlZW5G b250U3Vic3RpdHV0aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VsaWYgUExBVEZPUk0o V0lOKQogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMuc2hvdWxkUGFpbnROYXRp dmVDb250cm9scykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkocmV2aXNp b24gMTI5NTIwKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYgKzExNSw3IEBAIHN0cnVjdCBXZWJQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBTdHJpbmcgdWlQcm9jZXNzQnVuZGxlUmVz b3VyY2VQYXRoOwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSB1aVByb2Nlc3NCdW5kbGVS ZXNvdXJjZVBhdGhFeHRlbnNpb25IYW5kbGU7CiAKKyAgICBib29sIHNob3VsZEZvcmNlU2NyZWVu Rm9udFN1YnN0aXR1dGlvbjsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBTdHJpbmcgY2ZVUkxD YWNoZVBhdGg7CiAgICAgdWludDY0X3QgY2ZVUkxDYWNoZURpc2tDYXBhY2l0eTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0JKHJldmlzaW9u IDEyOTUyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcsOSBAQCB2b2lkIFdlYkNvbnRleHQ6OnBsYXRm b3JtSW5pdGlhbGl6ZVdlYlByCiAgICAgcGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5Q2FwYWNp dHkgPSBbdXJsQ2FjaGUgbWVtb3J5Q2FwYWNpdHldOwogICAgIHBhcmFtZXRlcnMubnNVUkxDYWNo ZURpc2tDYXBhY2l0eSA9IFt1cmxDYWNoZSBkaXNrQ2FwYWNpdHldOwogCisjaWYgX19NQUNfT1Nf WF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisgICAgcGFyYW1ldGVycy5zaG91bGRGb3Jj ZVNjcmVlbkZvbnRTdWJzdGl0dXRpb24gPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRl ZmF1bHRzXSBib29sRm9yS2V5OkAiTlNGb250RGVmYXVsdFNjcmVlbkZvbnRTdWJzdGl0dXRpb25F bmFibGVkIl07CisjZW5kaWYKIAogI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKICAgICBwYXJh bWV0ZXJzLmRpc2FibGVQbHVnaW5Qcm9jZXNzTWVzc2FnZVRpbWVvdXQgPSBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OkAiV2ViS2l0RGlzYWJsZVBsdWdp blByb2Nlc3NNZXNzYWdlVGltZW91dCJdOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmgJKHJldmlzaW9uIDEyOTUyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDksNiArMTQ5LDcgQEAgcHVibGlj OgogICAgIFdlYlBhZ2VHcm91cFByb3h5KiB3ZWJQYWdlR3JvdXAoY29uc3QgV2ViUGFnZUdyb3Vw RGF0YSYpOwogI2lmIFBMQVRGT1JNKE1BQykKICAgICBwaWRfdCBwcmVzZW50ZXJBcHBsaWNhdGlv blBpZCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJlc2VudGVyQXBwbGljYXRpb25QaWQ7IH0KKyAgICBi b29sIHNob3VsZEZvcmNlU2NyZWVuRm9udFN1YnN0aXR1dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1f c2hvdWxkRm9yY2VTY3JlZW5Gb250U3Vic3RpdHV0aW9uOyB9CiAjZW5kaWYgCiAgICAgCiAjaWYg UExBVEZPUk0oUVQpCkBAIC0zMDQsNiArMzA1LDcgQEAgcHJpdmF0ZToKICNpZiBQTEFURk9STShN QUMpCiAgICAgcGlkX3QgbV9wcmVzZW50ZXJBcHBsaWNhdGlvblBpZDsKICAgICBkaXNwYXRjaF9n cm91cF90IG1fY2xlYXJSZXNvdXJjZUNhY2hlc0Rpc3BhdGNoR3JvdXA7CisgICAgYm9vbCBtX3No b3VsZEZvcmNlU2NyZWVuRm9udFN1YnN0aXR1dGlvbjsKICNlbmRpZgogCiAgICAgYm9vbCBtX2Z1 bGxLZXlib2FyZEFjY2Vzc0VuYWJsZWQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxMjk1MjApCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIw NTYsNyArMjA1Niw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2UK ICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZShzdG9yZS5nZXRVSW50MzJW YWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6bWluaW11bUxvZ2ljYWxGb250U2l6ZUtleSgp KSk7CiAgICAgc2V0dGluZ3MtPnNldERlZmF1bHRGb250U2l6ZShzdG9yZS5nZXRVSW50MzJWYWx1 ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6ZGVmYXVsdEZvbnRTaXplS2V5KCkpKTsKICAgICBz ZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUoc3RvcmUuZ2V0VUludDMyVmFsdWVGb3JL ZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmRlZmF1bHRGaXhlZEZvbnRTaXplS2V5KCkpKTsKLSAgICBz ZXR0aW5ncy0+c2V0U2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzY3JlZW5Gb250U3Vic3RpdHV0aW9uRW5hYmxl ZEtleSgpKSk7CisgICAgc2V0dGluZ3MtPnNldFNjcmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVk KHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2NyZWVuRm9udFN1 YnN0aXR1dGlvbkVuYWJsZWRLZXkoKSkgfHwgV2ViUHJvY2Vzczo6c2hhcmVkKCkuc2hvdWxkRm9y Y2VTY3JlZW5Gb250U3Vic3RpdHV0aW9uKCkpOwogICAgIHNldHRpbmdzLT5zZXRMYXlvdXRGYWxs YmFja1dpZHRoKHN0b3JlLmdldFVJbnQzMlZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojps YXlvdXRGYWxsYmFja1dpZHRoS2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0RGV2aWNlV2lkdGgo c3RvcmUuZ2V0VUludDMyVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmRldmljZVdpZHRo S2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0RGV2aWNlSGVpZ2h0KHN0b3JlLmdldFVJbnQzMlZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpkZXZpY2VIZWlnaHRLZXkoKSkpOwpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tCShyZXZp c2lvbiAxMjk1MjApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNz TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNzEsNiArMjcxLDggQEAgdm9pZCBXZWJQcm9jZXNz OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAgICBbTlNVUkxDYWNoZSBzZXRTaGFyZWRV UkxDYWNoZTpwYXJlbnRQcm9jZXNzVVJMQ2FjaGUuZ2V0KCldOwogICAgIH0KIAorICAgIG1fc2hv dWxkRm9yY2VTY3JlZW5Gb250U3Vic3RpdHV0aW9uID0gcGFyYW1ldGVycy5zaG91bGRGb3JjZVNj cmVlbkZvbnRTdWJzdGl0dXRpb247CisKICAgICBtX2NvbXBvc2l0aW5nUmVuZGVyU2VydmVyUG9y dCA9IHBhcmFtZXRlcnMuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1BvcnQucG9ydCgpOwogCiAjaWYg RU5BQkxFKE5PVElGSUNBVElPTlMpIHx8IEVOQUJMRShMRUdBQ1lfTk9USUZJQ0FUSU9OUykKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTU3OCkKKysrIFNvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTI1ICBE YW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L21hYyBwYXJ0 IG9mIDxyZGFyOi8vcHJvYmxlbS8xMTQ1NTIyOD4gW21hY10gU3RvcCB1c2luZyBzY3JlZW4gZm9u dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3NjIw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlByZWZlcmVuY2VzLm1tOgorICAgICAgICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFs aXplXSk6IENoYW5nZWQgdGhlIGRlZmF1bHQgdmFsdWUgb2YgdGhlIHNjcmVlbkZvbnRTdWJzdGl0 dXRpb25FbmFibGVkCisgICAgICAgIHByZWZlcmVuY2UgdG8gTk8uCisgICAgICAgICogV2ViVmll dy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6 ICBDaGFuZ2VkIHRvIGVuYWJsZSBzY3JlZW4gZm9udCBzdWJzdGl0dXRpb24gYWxzbyBpZgorICAg ICAgICB0aGUgdmFsdWUgb2YgdGhlIE5TRm9udERlZmF1bHRTY3JlZW5Gb250U3Vic3RpdHV0aW9u RW5hYmxlZCB1c2VyIGRlZmF1bHRzIGtleSBpcyBZRVMuCisKIDIwMTItMDktMjEgIEplZmZyZXkg UGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV2ViS2l0MSBTUEkgZm9yIHN0 b3JhZ2UgYmxvY2tpbmcgcHJlZmVyZW5jZQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJQcmVmZXJlbmNlcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlByZWZlcmVuY2VzLm1tCShyZXZpc2lvbiAxMjk1MjApCisrKyBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zOTksNyAr Mzk5LDEyIEBAICsgKHZvaWQpaW5pdGlhbGl6ZQogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0 aEJvb2w6WUVTXSwgIFdlYktpdFJlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJsZWRQcmVmZXJlbmNl S2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdFdhbnRz QmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3JLZXksCiAgICAgICAgIFtOU051bWJlciBu dW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0RGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkS2V5LAot ICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdFNjcmVlbkZvbnRT dWJzdGl0dXRpb25FbmFibGVkS2V5LAorI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTA5MAorICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLAorI2Vsc2UK KyAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sCisjZW5kaWYKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXRTY3JlZW5Gb250U3Vic3RpdHV0 aW9uRW5hYmxlZEtleSwKIAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aExvbmdMb25nOkFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpub1F1b3RhKCldLCBXZWJLaXRBcHBsaWNhdGlvbkNhY2hl VG90YWxRdW90YSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhMb25nTG9uZzpBcHBsaWNh dGlvbkNhY2hlU3RvcmFnZTo6bm9RdW90YSgpXSwgV2ViS2l0QXBwbGljYXRpb25DYWNoZURlZmF1 bHRPcmlnaW5RdW90YSwKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJl dmlzaW9uIDEyOTUyMCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQko d29ya2luZyBjb3B5KQpAQCAtMTQzMCw3ICsxNDMwLDEyIEBAIC0gKHZvaWQpX3ByZWZlcmVuY2Vz Q2hhbmdlZDooV2ViUHJlZmVyZW4KICAgICBzZXR0aW5ncy0+c2V0VXNlc0VuY29kaW5nRGV0ZWN0 b3IoW3ByZWZlcmVuY2VzIHVzZXNFbmNvZGluZ0RldGVjdG9yXSk7CiAgICAgc2V0dGluZ3MtPnNl dEZhbnRhc3lGb250RmFtaWx5KFtwcmVmZXJlbmNlcyBmYW50YXN5Rm9udEZhbWlseV0pOwogICAg IHNldHRpbmdzLT5zZXRGaXhlZEZvbnRGYW1pbHkoW3ByZWZlcmVuY2VzIGZpeGVkRm9udEZhbWls eV0pOwotICAgIHNldHRpbmdzLT5zZXRTY3JlZW5Gb250U3Vic3RpdHV0aW9uRW5hYmxlZChbcHJl ZmVyZW5jZXMgc2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWRdKTsKKyAgICBzZXR0aW5ncy0+ c2V0U2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQoCisjaWYgX19NQUNfT1NfWF9WRVJTSU9O X01JTl9SRVFVSVJFRCA+PSAxMDkwCisgICAgICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRV c2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6QCJOU0ZvbnREZWZhdWx0U2NyZWVuRm9udFN1YnN0aXR1 dGlvbkVuYWJsZWQiXSB8fAorI2VuZGlmCisgICAgICAgIFtwcmVmZXJlbmNlcyBzY3JlZW5Gb250 U3Vic3RpdHV0aW9uRW5hYmxlZF0KKyAgICApOwogICAgIHNldHRpbmdzLT5zZXRGb3JjZUZUUERp cmVjdG9yeUxpc3RpbmdzKFtwcmVmZXJlbmNlcyBfZm9yY2VGVFBEaXJlY3RvcnlMaXN0aW5nc10p OwogICAgIHNldHRpbmdzLT5zZXRGVFBEaXJlY3RvcnlUZW1wbGF0ZVBhdGgoW3ByZWZlcmVuY2Vz IF9mdHBEaXJlY3RvcnlUZW1wbGF0ZVBhdGhdKTsKICAgICBzZXR0aW5ncy0+c2V0TG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoKFtwcmVmZXJlbmNlcyBfbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoXSk7 CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxMjk1NzgpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxNiBAQAorMjAxMi0wOS0yNSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgor CisgICAgICAgIFRvb2xzIHBhcnQgb2YgPHJkYXI6Ly9wcm9ibGVtLzExNDU1MjI4PiBbbWFjXSBT dG9wIHVzaW5nIHNjcmVlbiBmb250cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTc2MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAg ICAgICAgKHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMpOiBFbmFibGUgc2NyZWVuIGZv bnQgc3Vic3RpdHV0aW9uIHdoZW4KKyAgICAgICAgcnVubmluZyB0aGUgdGVzdHMuCisgICAgICAg ICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRl c3RDb250cm9sbGVyOjpyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKTogRGl0dG8uCisKIDIw MTItMDktMjUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAg ICAgRml4IFNub3dMZW9wYXJkIGJ1aWxkIGJ5IGFkZGluZyAjaWZkZWZzLgpJbmRleDogVG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQkocmV2aXNpb24gMTI5NTIwKQor KysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCSh3b3JraW5nIGNv cHkpCkBAIC02NzQsNiArNjc0LDggQEAgc3RhdGljIHZvaWQgcmVzZXREZWZhdWx0c1RvQ29uc2lz dGVudFZhbAogICAgIFtwcmVmZXJlbmNlcyBzZXRXZWJBdWRpb0VuYWJsZWQ6WUVTXTsKICNlbmRp ZgogCisgICAgW3ByZWZlcmVuY2VzIHNldFNjcmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVkOllF U107CisKICAgICBbV2ViUHJlZmVyZW5jZXMgX3NldEN1cnJlbnROZXR3b3JrTG9hZGVyU2Vzc2lv bkNvb2tpZUFjY2VwdFBvbGljeTpOU0hUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5E b2N1bWVudERvbWFpbl07CiAgICAgCiAgICAgVGVzdFJ1bm5lcjo6c2V0U2VyaWFsaXplSFRUUExv YWRzKGZhbHNlKTsKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCShyZXZpc2lvbiAxMjk1MjApCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250 cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE2LDYgKzUxNiw3IEBAIGJvb2wgVGVzdENv bnRyb2xsZXI6OnJlc2V0U3RhdGVUb0NvbnNpc3QKICAgICBXS1ByZWZlcmVuY2VzU2V0U2Fuc1Nl cmlmRm9udEZhbWlseShwcmVmZXJlbmNlcywgc2Fuc1NlcmlmRm9udEZhbWlseSk7CiAgICAgV0tQ cmVmZXJlbmNlc1NldFNlcmlmRm9udEZhbWlseShwcmVmZXJlbmNlcywgc2VyaWZGb250RmFtaWx5 KTsKICNlbmRpZgorICAgIFdLUHJlZmVyZW5jZXNTZXRTY3JlZW5Gb250U3Vic3RpdHV0aW9uRW5h YmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldEluc3BlY3RvclVz ZXNXZWJLaXRVc2VySW50ZXJmYWNlKHByZWZlcmVuY2VzLCB0cnVlKTsKIAogICAgIC8vIGluIHRo ZSBjYXNlIHRoYXQgYSB0ZXN0IHVzaW5nIHRoZSBjaHJvbWUgaW5wdXQgZmllbGQgZmFpbGVkLCBi ZSBzdXJlIHRvIGNsZWFuIHVwIGZvciB0aGUgbmV4dCB0ZXN0Cg==