177495 2017-09-26 11:14:06 -0700 Make fontToUse() a member function of InlineTextBox 2017-09-27 12:15:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 177493 1 dbates dbates bfulgham hyatt mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1352759 0 dbates 2017-09-26 11:14:06 -0700 Make fontToUse a member function of InlineTextBox towards consolidating duplicate paint code. 1352768 1 321850 dbates 2017-09-26 11:24:59 -0700 Created attachment 321850 Patch 1352879 2 321879 dbates 2017-09-26 15:30:42 -0700 Created attachment 321879 Patch 1352897 3 321879 dbates 2017-09-26 16:05:33 -0700 Comment on attachment 321879 Patch Clearing flags on attachment: 321879 Committed r222532: <http://trac.webkit.org/changeset/222532> 1352898 4 dbates 2017-09-26 16:05:35 -0700 All reviewed patches have been landed. Closing bug. 1353235 5 webkit-bug-importer 2017-09-27 12:15:22 -0700 <rdar://problem/34692874> 321850 2017-09-26 11:24:59 -0700 2017-09-26 15:30:41 -0700 Patch bug-177495-20170926112459.patch text/plain 7084 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI0YzZlOGQzZmM5ZGY4 NGNjYjc1OGUzZjcwOWExMTFhZjE5MmI4NS4uYmUxMWVjOTAwM2Y2N2E1MzY1MzdjMjdjNzIwZTE0 MGEwMTM3NTg5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTA5LTI2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBNYWtlIGZvbnRUb1VzZSgp IGEgbWVtYmVyIGZ1bmN0aW9uIG9mIElubGluZVRleHRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvbGxvd2luZyBidWcgIzE3NzQ5MyB3ZSBjYW4g d3JpdGUgZm9udFRvVXNlKCkgaW4gdGVybXMgb2YgSW5saW5lVGV4dEJveDo6Y29tYmluZWRUZXh0 KCkuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRlc3Rz LgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lVGV4dEJveDo6bGluZUZvbnQgY29uc3QpOiBBZGRlZDsgZXh0cmFjdGVkIGZy b20gZm9udFRvVXNlKCkuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpjb21iaW5l ZFRleHQgY29uc3QpOiBNYXJrIGlubGluZSB0byBnaXZlIGEgaGludCB0byB0aGUgY29tcGlsZXIK KyAgICAgICAgdGhhdCB0aGlzIGZ1bmN0aW9uIGlzIHNtYWxsIGFuZCBzZWVtcyByZWFzb25hYmxl IHRvIGlubGluZS4KKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OmxvY2FsU2VsZWN0 aW9uUmVjdCBjb25zdCk6IE1vZGlmaWVkIHRvIGNhbGwgbGluZUZvbnQoKS4KKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVUZXh0Qm94OjpvZmZzZXRGb3JQb3NpdGlvbiBjb25zdCk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6SW5saW5lVGV4dEJveDo6cG9zaXRpb25Gb3JPZmZzZXQgY29uc3QpOiBEaXR0by4g UmVtb3ZlIGFuIGV4dHJhbmVvdXMKKyAgICAgICAgaWYtc3RhdGVtZW50IHdoaWxlIEkgYW0gaGVy ZS4KKyAgICAgICAgKFdlYkNvcmU6OmZvbnRUb1VzZSk6IERlbGV0ZWQ7IG1vdmVkIGxvZ2ljIHRv IElubGluZVRleHRCb3g6OmxpbmVGb250KCkuCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRl eHRCb3guaDoKKworMjAxNy0wOS0yNiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+ CisKICAgICAgICAgRXh0cmFjdCBvdXQgY29tYmluZWQgdGV4dCBxdWVyeSBpbnRvIGEgbWVtYmVy IGZ1bmN0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzc0OTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRl eHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmlu ZGV4IDI2ZjM1YzU1OThmYmE3N2M1ODg0Mjc3MTg0YWE4NWRjZTAwM2ZiNmMuLjVjMmI2M2EyOTFl Y2Y4YzU2MzA2MTYzMjUzM2I3ODIyNTQwNDYwZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lVGV4dEJveC5jcHAKQEAgLTE4NSwxNCArMTg1LDkgQEAgUmVuZGVyT2JqZWN0OjpT ZWxlY3Rpb25TdGF0ZSBJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25TdGF0ZSgpCiAgICAgcmV0dXJu IHN0YXRlOwogfQogCi1zdGF0aWMgY29uc3QgRm9udENhc2NhZGUmIGZvbnRUb1VzZShjb25zdCBS ZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcmVyKQoraW5saW5lIGNv bnN0IEZvbnRDYXNjYWRlJiBJbmxpbmVUZXh0Qm94OjpsaW5lRm9udCgpIGNvbnN0CiB7Ci0gICAg aWYgKHN0eWxlLmhhc1RleHRDb21iaW5lKCkgJiYgaXM8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRl cmVyKSkgewotICAgICAgICBjb25zdCBhdXRvJiB0ZXh0Q29tYmluZVJlbmRlcmVyID0gZG93bmNh c3Q8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRlcmVyKTsKLSAgICAgICAgaWYgKHRleHRDb21iaW5l UmVuZGVyZXIuaXNDb21iaW5lZCgpKQotICAgICAgICAgICAgcmV0dXJuIHRleHRDb21iaW5lUmVu ZGVyZXIudGV4dENvbWJpbmVGb250KCk7Ci0gICAgfQotICAgIHJldHVybiBzdHlsZS5mb250Q2Fz Y2FkZSgpOworICAgIHJldHVybiBjb21iaW5lZFRleHQoKSA/IGNvbWJpbmVkVGV4dCgpLT50ZXh0 Q29tYmluZUZvbnQoKSA6IGxpbmVTdHlsZSgpLmZvbnRDYXNjYWRlKCk7CiB9CiAKIExheW91dFJl Y3QgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0KHVuc2lnbmVkIHN0YXJ0UG9zLCB1 bnNpZ25lZCBlbmRQb3MpIGNvbnN0CkBAIC0yMTAsNyArMjA1LDcgQEAgTGF5b3V0UmVjdCBJbmxp bmVUZXh0Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QodW5zaWduZWQgc3RhcnRQb3MsIHVuc2lnbmVk IGVuZFBvcykKICAgICBMYXlvdXRVbml0IHNlbGVjdGlvblRvcCA9IHRoaXMtPnNlbGVjdGlvblRv cCgpOwogICAgIExheW91dFVuaXQgc2VsZWN0aW9uSGVpZ2h0ID0gdGhpcy0+c2VsZWN0aW9uSGVp Z2h0KCk7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSA9IHRoaXMtPmxpbmVTdHls ZSgpOwotICAgIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250ID0gZm9udFRvVXNlKGxpbmVTdHlsZSwg cmVuZGVyZXIoKSk7CisgICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBsaW5lRm9udCgpOwog CiAgICAgU3RyaW5nIGh5cGhlbmF0ZWRTdHJpbmc7CiAgICAgYm9vbCByZXNwZWN0SHlwaGVuID0g ZVBvcyA9PSBtX2xlbiAmJiBoYXNIeXBoZW4oKTsKQEAgLTQ4Myw3ICs0NzgsNyBAQCB2b2lkIElu bGluZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2lu dCYgcGFpbnRPZmZzZXQsCiAgICAgVGV4dFBhaW50U3R5bGUgc2VsZWN0aW9uUGFpbnRTdHlsZSA9 IGhhdmVTZWxlY3Rpb24gJiYgIXVzZUN1c3RvbVVuZGVybGluZXMgPyBjb21wdXRlVGV4dFNlbGVj dGlvblBhaW50U3R5bGUodGV4dFBhaW50U3R5bGUsIHJlbmRlcmVyKCksIGxpbmVTdHlsZSwgcGFp bnRJbmZvLCBwYWludFNlbGVjdGVkVGV4dE9ubHksIHBhaW50U2VsZWN0ZWRUZXh0U2VwYXJhdGVs eSwgcGFpbnROb25TZWxlY3RlZFRleHRPbmx5LCBzZWxlY3Rpb25TaGFkb3cpIDogdGV4dFBhaW50 U3R5bGU7CiAKICAgICAvLyBTZXQgb3VyIGZvbnQuCi0gICAgY29uc3QgRm9udENhc2NhZGUmIGZv bnQgPSBmb250VG9Vc2UobGluZVN0eWxlLCByZW5kZXJlcigpKTsKKyAgICBjb25zdCBGb250Q2Fz Y2FkZSYgZm9udCA9IGxpbmVGb250KCk7CiAgICAgLy8gMS4gUGFpbnQgYmFja2dyb3VuZHMgYmVo aW5kIHRleHQgaWYgbmVlZGVkLiBFeGFtcGxlcyBvZiBzdWNoIGJhY2tncm91bmRzIGluY2x1ZGUg c2VsZWN0aW9uCiAgICAgLy8gYW5kIGNvbXBvc2l0aW9uIHVuZGVybGluZXMuCiAgICAgaWYgKHBh aW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlU2VsZWN0aW9uICYmIHBhaW50SW5mby5waGFzZSAh PSBQYWludFBoYXNlVGV4dENsaXAgJiYgIWlzUHJpbnRpbmcpIHsKQEAgLTEwNTEsMTUgKzEwNDYs MTEgQEAgaW50IElubGluZVRleHRCb3g6Om9mZnNldEZvclBvc2l0aW9uKGZsb2F0IGxpbmVPZmZz ZXQsIGJvb2wgaW5jbHVkZVBhcnRpYWxHbHlwaHMKIHsKICAgICBpZiAoaXNMaW5lQnJlYWsoKSkK ICAgICAgICAgcmV0dXJuIDA7Ci0KICAgICBpZiAobGluZU9mZnNldCAtIGxvZ2ljYWxMZWZ0KCkg PiBsb2dpY2FsV2lkdGgoKSkKICAgICAgICAgcmV0dXJuIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24o KSA/IGxlbigpIDogMDsKICAgICBpZiAobGluZU9mZnNldCAtIGxvZ2ljYWxMZWZ0KCkgPCAwKQog ICAgICAgICByZXR1cm4gaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gMCA6IGxlbigpOwotCi0g ICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSA9IHRoaXMtPmxpbmVTdHlsZSgpOwotICAg IGNvbnN0IEZvbnRDYXNjYWRlJiBmb250ID0gZm9udFRvVXNlKGxpbmVTdHlsZSwgcmVuZGVyZXIo KSk7Ci0gICAgcmV0dXJuIGZvbnQub2Zmc2V0Rm9yUG9zaXRpb24oY29uc3RydWN0VGV4dFJ1bihs aW5lU3R5bGUpLCBsaW5lT2Zmc2V0IC0gbG9naWNhbExlZnQoKSwgaW5jbHVkZVBhcnRpYWxHbHlw aHMpOworICAgIHJldHVybiBsaW5lRm9udCgpLm9mZnNldEZvclBvc2l0aW9uKGNvbnN0cnVjdFRl eHRSdW4obGluZVN0eWxlKCkpLCBsaW5lT2Zmc2V0IC0gbG9naWNhbExlZnQoKSwgaW5jbHVkZVBh cnRpYWxHbHlwaHMpOwogfQogCiBmbG9hdCBJbmxpbmVUZXh0Qm94Ojpwb3NpdGlvbkZvck9mZnNl dCh1bnNpZ25lZCBvZmZzZXQpIGNvbnN0CkBAIC0xMDcwLDE1ICsxMDYxLDIxIEBAIGZsb2F0IElu bGluZVRleHRCb3g6OnBvc2l0aW9uRm9yT2Zmc2V0KHVuc2lnbmVkIG9mZnNldCkgY29uc3QKICAg ICBpZiAoaXNMaW5lQnJlYWsoKSkKICAgICAgICAgcmV0dXJuIGxvZ2ljYWxMZWZ0KCk7CiAKLSAg ICBjb25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlID0gdGhpcy0+bGluZVN0eWxlKCk7Ci0gICAg Y29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBmb250VG9Vc2UobGluZVN0eWxlLCByZW5kZXJlcigp KTsKLSAgICB1bnNpZ25lZCBmcm9tID0gIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IGNsYW1w ZWRPZmZzZXQob2Zmc2V0KSA6IDA7Ci0gICAgdW5zaWduZWQgdG8gPSAhaXNMZWZ0VG9SaWdodERp cmVjdGlvbigpID8gbV9sZW4gOiBjbGFtcGVkT2Zmc2V0KG9mZnNldCk7CisgICAgdW5zaWduZWQg c3RhcnRPZmZzZXQ7CisgICAgdW5zaWduZWQgZW5kT2Zmc2V0OworICAgIGlmIChpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKCkpIHsKKyAgICAgICAgc3RhcnRPZmZzZXQgPSAwOworICAgICAgICBlbmRP ZmZzZXQgPSBjbGFtcGVkT2Zmc2V0KG9mZnNldCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc3Rh cnRPZmZzZXQgPSBjbGFtcGVkT2Zmc2V0KG9mZnNldCk7CisgICAgICAgIGVuZE9mZnNldCA9IG1f bGVuOworICAgIH0KKwogICAgIC8vIEZJWE1FOiBEbyB3ZSBuZWVkIHRvIGFkZCByaWdodEJlYXJp bmcgaGVyZT8KICAgICBMYXlvdXRSZWN0IHNlbGVjdGlvblJlY3QgPSBMYXlvdXRSZWN0KGxvZ2lj YWxMZWZ0KCksIDAsIDAsIDApOwotICAgIFRleHRSdW4gcnVuID0gY29uc3RydWN0VGV4dFJ1bihs aW5lU3R5bGUpOwotICAgIGZvbnQuYWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQocnVuLCBzZWxl Y3Rpb25SZWN0LCBmcm9tLCB0byk7Ci0gICAgcmV0dXJuIHNuYXBSZWN0VG9EZXZpY2VQaXhlbHNX aXRoV3JpdGluZ0RpcmVjdGlvbihzZWxlY3Rpb25SZWN0LCByZW5kZXJlcigpLmRvY3VtZW50KCku ZGV2aWNlU2NhbGVGYWN0b3IoKSwgcnVuLmx0cigpKS5tYXhYKCk7CisgICAgVGV4dFJ1biB0ZXh0 UnVuID0gY29uc3RydWN0VGV4dFJ1bihsaW5lU3R5bGUoKSk7CisgICAgbGluZUZvbnQoKS5hZGp1 c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dCh0ZXh0UnVuLCBzZWxlY3Rpb25SZWN0LCBzdGFydE9mZnNl dCwgZW5kT2Zmc2V0KTsKKyAgICByZXR1cm4gc25hcFJlY3RUb0RldmljZVBpeGVsc1dpdGhXcml0 aW5nRGlyZWN0aW9uKHNlbGVjdGlvblJlY3QsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5kZXZpY2VT Y2FsZUZhY3RvcigpLCB0ZXh0UnVuLmx0cigpKS5tYXhYKCk7CiB9CiAKIFN0cmluZ1ZpZXcgSW5s aW5lVGV4dEJveDo6c3Vic3RyaW5nVG9SZW5kZXIoc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gb3Zl cnJpZGluZ0xlbmd0aCkgY29uc3QKQEAgLTExMTIsNyArMTEwOSw3IEBAIFRleHRSdW4gSW5saW5l VGV4dEJveDo6Y29uc3RydWN0VGV4dFJ1bihjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFN0cmlu Z1ZpZXcgc3RyCiAgICAgcmV0dXJuIHJ1bjsKIH0KIAotY29uc3QgUmVuZGVyQ29tYmluZVRleHQq IElubGluZVRleHRCb3g6OmNvbWJpbmVkVGV4dCgpIGNvbnN0CitpbmxpbmUgY29uc3QgUmVuZGVy Q29tYmluZVRleHQqIElubGluZVRleHRCb3g6OmNvbWJpbmVkVGV4dCgpIGNvbnN0CiB7CiAgICAg cmV0dXJuIGxpbmVTdHlsZSgpLmhhc1RleHRDb21iaW5lKCkgJiYgaXM8UmVuZGVyQ29tYmluZVRl eHQ+KHJlbmRlcmVyKCkpICYmIGRvd25jYXN0PFJlbmRlckNvbWJpbmVUZXh0PihyZW5kZXJlcigp KS5pc0NvbWJpbmVkKCkgPyAmZG93bmNhc3Q8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRlcmVyKCkp IDogbnVsbHB0cjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCmlu ZGV4IDhmNDMyMDhiYzY0NDU0ODE1MWEwYThjMDg1NWZiY2I2ZWM2M2I3OWIuLmE2YjUxNzZhY2Rm MmY4ZWEwYWQ5YzcxYWIwNTg0OTJjYTMxZTdlMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZVRleHRCb3guaApAQCAtMTY5LDYgKzE2OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBw YWludFRleHRTdWJyYW5nZUJhY2tncm91bmQoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRmxvYXRQ b2ludCYgYm94T3JpZ2luLCBjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IENvbG9yJiwgdW5zaWdu ZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9mZnNldCk7CiAKICAgICBjb25zdCBSZW5kZXJD b21iaW5lVGV4dCogY29tYmluZWRUZXh0KCkgY29uc3Q7CisgICAgY29uc3QgRm9udENhc2NhZGUm IGxpbmVGb250KCkgY29uc3Q7CiAKICAgICBFeHBhbnNpb25CZWhhdmlvciBleHBhbnNpb25CZWhh dmlvcigpIGNvbnN0OwogCg== 321879 2017-09-26 15:30:42 -0700 2017-09-26 16:05:33 -0700 Patch bug-177495-20170926153042.patch text/plain 7084 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI0YzZlOGQzZmM5ZGY4 NGNjYjc1OGUzZjcwOWExMTFhZjE5MmI4NS4uYmUxMWVjOTAwM2Y2N2E1MzY1MzdjMjdjNzIwZTE0 MGEwMTM3NTg5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTA5LTI2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBNYWtlIGZvbnRUb1VzZSgp IGEgbWVtYmVyIGZ1bmN0aW9uIG9mIElubGluZVRleHRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvbGxvd2luZyBidWcgIzE3NzQ5MyB3ZSBjYW4g d3JpdGUgZm9udFRvVXNlKCkgaW4gdGVybXMgb2YgSW5saW5lVGV4dEJveDo6Y29tYmluZWRUZXh0 KCkuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRlc3Rz LgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lVGV4dEJveDo6bGluZUZvbnQgY29uc3QpOiBBZGRlZDsgZXh0cmFjdGVkIGZy b20gZm9udFRvVXNlKCkuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpjb21iaW5l ZFRleHQgY29uc3QpOiBNYXJrIGlubGluZSB0byBnaXZlIGEgaGludCB0byB0aGUgY29tcGlsZXIK KyAgICAgICAgdGhhdCB0aGlzIGZ1bmN0aW9uIGlzIHNtYWxsIGFuZCBzZWVtcyByZWFzb25hYmxl IHRvIGlubGluZS4KKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OmxvY2FsU2VsZWN0 aW9uUmVjdCBjb25zdCk6IE1vZGlmaWVkIHRvIGNhbGwgbGluZUZvbnQoKS4KKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVUZXh0Qm94OjpvZmZzZXRGb3JQb3NpdGlvbiBjb25zdCk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6SW5saW5lVGV4dEJveDo6cG9zaXRpb25Gb3JPZmZzZXQgY29uc3QpOiBEaXR0by4g UmVtb3ZlIGFuIGV4dHJhbmVvdXMKKyAgICAgICAgaWYtc3RhdGVtZW50IHdoaWxlIEkgYW0gaGVy ZS4KKyAgICAgICAgKFdlYkNvcmU6OmZvbnRUb1VzZSk6IERlbGV0ZWQ7IG1vdmVkIGxvZ2ljIHRv IElubGluZVRleHRCb3g6OmxpbmVGb250KCkuCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRl eHRCb3guaDoKKworMjAxNy0wOS0yNiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+ CisKICAgICAgICAgRXh0cmFjdCBvdXQgY29tYmluZWQgdGV4dCBxdWVyeSBpbnRvIGEgbWVtYmVy IGZ1bmN0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzc0OTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRl eHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmlu ZGV4IDI2ZjM1YzU1OThmYmE3N2M1ODg0Mjc3MTg0YWE4NWRjZTAwM2ZiNmMuLjVjMmI2M2EyOTFl Y2Y4YzU2MzA2MTYzMjUzM2I3ODIyNTQwNDYwZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lVGV4dEJveC5jcHAKQEAgLTE4NSwxNCArMTg1LDkgQEAgUmVuZGVyT2JqZWN0OjpT ZWxlY3Rpb25TdGF0ZSBJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25TdGF0ZSgpCiAgICAgcmV0dXJu IHN0YXRlOwogfQogCi1zdGF0aWMgY29uc3QgRm9udENhc2NhZGUmIGZvbnRUb1VzZShjb25zdCBS ZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcmVyKQoraW5saW5lIGNv bnN0IEZvbnRDYXNjYWRlJiBJbmxpbmVUZXh0Qm94OjpsaW5lRm9udCgpIGNvbnN0CiB7Ci0gICAg aWYgKHN0eWxlLmhhc1RleHRDb21iaW5lKCkgJiYgaXM8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRl cmVyKSkgewotICAgICAgICBjb25zdCBhdXRvJiB0ZXh0Q29tYmluZVJlbmRlcmVyID0gZG93bmNh c3Q8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRlcmVyKTsKLSAgICAgICAgaWYgKHRleHRDb21iaW5l UmVuZGVyZXIuaXNDb21iaW5lZCgpKQotICAgICAgICAgICAgcmV0dXJuIHRleHRDb21iaW5lUmVu ZGVyZXIudGV4dENvbWJpbmVGb250KCk7Ci0gICAgfQotICAgIHJldHVybiBzdHlsZS5mb250Q2Fz Y2FkZSgpOworICAgIHJldHVybiBjb21iaW5lZFRleHQoKSA/IGNvbWJpbmVkVGV4dCgpLT50ZXh0 Q29tYmluZUZvbnQoKSA6IGxpbmVTdHlsZSgpLmZvbnRDYXNjYWRlKCk7CiB9CiAKIExheW91dFJl Y3QgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0KHVuc2lnbmVkIHN0YXJ0UG9zLCB1 bnNpZ25lZCBlbmRQb3MpIGNvbnN0CkBAIC0yMTAsNyArMjA1LDcgQEAgTGF5b3V0UmVjdCBJbmxp bmVUZXh0Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QodW5zaWduZWQgc3RhcnRQb3MsIHVuc2lnbmVk IGVuZFBvcykKICAgICBMYXlvdXRVbml0IHNlbGVjdGlvblRvcCA9IHRoaXMtPnNlbGVjdGlvblRv cCgpOwogICAgIExheW91dFVuaXQgc2VsZWN0aW9uSGVpZ2h0ID0gdGhpcy0+c2VsZWN0aW9uSGVp Z2h0KCk7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSA9IHRoaXMtPmxpbmVTdHls ZSgpOwotICAgIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250ID0gZm9udFRvVXNlKGxpbmVTdHlsZSwg cmVuZGVyZXIoKSk7CisgICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBsaW5lRm9udCgpOwog CiAgICAgU3RyaW5nIGh5cGhlbmF0ZWRTdHJpbmc7CiAgICAgYm9vbCByZXNwZWN0SHlwaGVuID0g ZVBvcyA9PSBtX2xlbiAmJiBoYXNIeXBoZW4oKTsKQEAgLTQ4Myw3ICs0NzgsNyBAQCB2b2lkIElu bGluZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2lu dCYgcGFpbnRPZmZzZXQsCiAgICAgVGV4dFBhaW50U3R5bGUgc2VsZWN0aW9uUGFpbnRTdHlsZSA9 IGhhdmVTZWxlY3Rpb24gJiYgIXVzZUN1c3RvbVVuZGVybGluZXMgPyBjb21wdXRlVGV4dFNlbGVj dGlvblBhaW50U3R5bGUodGV4dFBhaW50U3R5bGUsIHJlbmRlcmVyKCksIGxpbmVTdHlsZSwgcGFp bnRJbmZvLCBwYWludFNlbGVjdGVkVGV4dE9ubHksIHBhaW50U2VsZWN0ZWRUZXh0U2VwYXJhdGVs eSwgcGFpbnROb25TZWxlY3RlZFRleHRPbmx5LCBzZWxlY3Rpb25TaGFkb3cpIDogdGV4dFBhaW50 U3R5bGU7CiAKICAgICAvLyBTZXQgb3VyIGZvbnQuCi0gICAgY29uc3QgRm9udENhc2NhZGUmIGZv bnQgPSBmb250VG9Vc2UobGluZVN0eWxlLCByZW5kZXJlcigpKTsKKyAgICBjb25zdCBGb250Q2Fz Y2FkZSYgZm9udCA9IGxpbmVGb250KCk7CiAgICAgLy8gMS4gUGFpbnQgYmFja2dyb3VuZHMgYmVo aW5kIHRleHQgaWYgbmVlZGVkLiBFeGFtcGxlcyBvZiBzdWNoIGJhY2tncm91bmRzIGluY2x1ZGUg c2VsZWN0aW9uCiAgICAgLy8gYW5kIGNvbXBvc2l0aW9uIHVuZGVybGluZXMuCiAgICAgaWYgKHBh aW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlU2VsZWN0aW9uICYmIHBhaW50SW5mby5waGFzZSAh PSBQYWludFBoYXNlVGV4dENsaXAgJiYgIWlzUHJpbnRpbmcpIHsKQEAgLTEwNTEsMTUgKzEwNDYs MTEgQEAgaW50IElubGluZVRleHRCb3g6Om9mZnNldEZvclBvc2l0aW9uKGZsb2F0IGxpbmVPZmZz ZXQsIGJvb2wgaW5jbHVkZVBhcnRpYWxHbHlwaHMKIHsKICAgICBpZiAoaXNMaW5lQnJlYWsoKSkK ICAgICAgICAgcmV0dXJuIDA7Ci0KICAgICBpZiAobGluZU9mZnNldCAtIGxvZ2ljYWxMZWZ0KCkg PiBsb2dpY2FsV2lkdGgoKSkKICAgICAgICAgcmV0dXJuIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24o KSA/IGxlbigpIDogMDsKICAgICBpZiAobGluZU9mZnNldCAtIGxvZ2ljYWxMZWZ0KCkgPCAwKQog ICAgICAgICByZXR1cm4gaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gMCA6IGxlbigpOwotCi0g ICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSA9IHRoaXMtPmxpbmVTdHlsZSgpOwotICAg IGNvbnN0IEZvbnRDYXNjYWRlJiBmb250ID0gZm9udFRvVXNlKGxpbmVTdHlsZSwgcmVuZGVyZXIo KSk7Ci0gICAgcmV0dXJuIGZvbnQub2Zmc2V0Rm9yUG9zaXRpb24oY29uc3RydWN0VGV4dFJ1bihs aW5lU3R5bGUpLCBsaW5lT2Zmc2V0IC0gbG9naWNhbExlZnQoKSwgaW5jbHVkZVBhcnRpYWxHbHlw aHMpOworICAgIHJldHVybiBsaW5lRm9udCgpLm9mZnNldEZvclBvc2l0aW9uKGNvbnN0cnVjdFRl eHRSdW4obGluZVN0eWxlKCkpLCBsaW5lT2Zmc2V0IC0gbG9naWNhbExlZnQoKSwgaW5jbHVkZVBh cnRpYWxHbHlwaHMpOwogfQogCiBmbG9hdCBJbmxpbmVUZXh0Qm94Ojpwb3NpdGlvbkZvck9mZnNl dCh1bnNpZ25lZCBvZmZzZXQpIGNvbnN0CkBAIC0xMDcwLDE1ICsxMDYxLDIxIEBAIGZsb2F0IElu bGluZVRleHRCb3g6OnBvc2l0aW9uRm9yT2Zmc2V0KHVuc2lnbmVkIG9mZnNldCkgY29uc3QKICAg ICBpZiAoaXNMaW5lQnJlYWsoKSkKICAgICAgICAgcmV0dXJuIGxvZ2ljYWxMZWZ0KCk7CiAKLSAg ICBjb25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlID0gdGhpcy0+bGluZVN0eWxlKCk7Ci0gICAg Y29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBmb250VG9Vc2UobGluZVN0eWxlLCByZW5kZXJlcigp KTsKLSAgICB1bnNpZ25lZCBmcm9tID0gIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IGNsYW1w ZWRPZmZzZXQob2Zmc2V0KSA6IDA7Ci0gICAgdW5zaWduZWQgdG8gPSAhaXNMZWZ0VG9SaWdodERp cmVjdGlvbigpID8gbV9sZW4gOiBjbGFtcGVkT2Zmc2V0KG9mZnNldCk7CisgICAgdW5zaWduZWQg c3RhcnRPZmZzZXQ7CisgICAgdW5zaWduZWQgZW5kT2Zmc2V0OworICAgIGlmIChpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKCkpIHsKKyAgICAgICAgc3RhcnRPZmZzZXQgPSAwOworICAgICAgICBlbmRP ZmZzZXQgPSBjbGFtcGVkT2Zmc2V0KG9mZnNldCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc3Rh cnRPZmZzZXQgPSBjbGFtcGVkT2Zmc2V0KG9mZnNldCk7CisgICAgICAgIGVuZE9mZnNldCA9IG1f bGVuOworICAgIH0KKwogICAgIC8vIEZJWE1FOiBEbyB3ZSBuZWVkIHRvIGFkZCByaWdodEJlYXJp bmcgaGVyZT8KICAgICBMYXlvdXRSZWN0IHNlbGVjdGlvblJlY3QgPSBMYXlvdXRSZWN0KGxvZ2lj YWxMZWZ0KCksIDAsIDAsIDApOwotICAgIFRleHRSdW4gcnVuID0gY29uc3RydWN0VGV4dFJ1bihs aW5lU3R5bGUpOwotICAgIGZvbnQuYWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQocnVuLCBzZWxl Y3Rpb25SZWN0LCBmcm9tLCB0byk7Ci0gICAgcmV0dXJuIHNuYXBSZWN0VG9EZXZpY2VQaXhlbHNX aXRoV3JpdGluZ0RpcmVjdGlvbihzZWxlY3Rpb25SZWN0LCByZW5kZXJlcigpLmRvY3VtZW50KCku ZGV2aWNlU2NhbGVGYWN0b3IoKSwgcnVuLmx0cigpKS5tYXhYKCk7CisgICAgVGV4dFJ1biB0ZXh0 UnVuID0gY29uc3RydWN0VGV4dFJ1bihsaW5lU3R5bGUoKSk7CisgICAgbGluZUZvbnQoKS5hZGp1 c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dCh0ZXh0UnVuLCBzZWxlY3Rpb25SZWN0LCBzdGFydE9mZnNl dCwgZW5kT2Zmc2V0KTsKKyAgICByZXR1cm4gc25hcFJlY3RUb0RldmljZVBpeGVsc1dpdGhXcml0 aW5nRGlyZWN0aW9uKHNlbGVjdGlvblJlY3QsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5kZXZpY2VT Y2FsZUZhY3RvcigpLCB0ZXh0UnVuLmx0cigpKS5tYXhYKCk7CiB9CiAKIFN0cmluZ1ZpZXcgSW5s aW5lVGV4dEJveDo6c3Vic3RyaW5nVG9SZW5kZXIoc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gb3Zl cnJpZGluZ0xlbmd0aCkgY29uc3QKQEAgLTExMTIsNyArMTEwOSw3IEBAIFRleHRSdW4gSW5saW5l VGV4dEJveDo6Y29uc3RydWN0VGV4dFJ1bihjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFN0cmlu Z1ZpZXcgc3RyCiAgICAgcmV0dXJuIHJ1bjsKIH0KIAotY29uc3QgUmVuZGVyQ29tYmluZVRleHQq IElubGluZVRleHRCb3g6OmNvbWJpbmVkVGV4dCgpIGNvbnN0CitpbmxpbmUgY29uc3QgUmVuZGVy Q29tYmluZVRleHQqIElubGluZVRleHRCb3g6OmNvbWJpbmVkVGV4dCgpIGNvbnN0CiB7CiAgICAg cmV0dXJuIGxpbmVTdHlsZSgpLmhhc1RleHRDb21iaW5lKCkgJiYgaXM8UmVuZGVyQ29tYmluZVRl eHQ+KHJlbmRlcmVyKCkpICYmIGRvd25jYXN0PFJlbmRlckNvbWJpbmVUZXh0PihyZW5kZXJlcigp KS5pc0NvbWJpbmVkKCkgPyAmZG93bmNhc3Q8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRlcmVyKCkp IDogbnVsbHB0cjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCmlu ZGV4IDhmNDMyMDhiYzY0NDU0ODE1MWEwYThjMDg1NWZiY2I2ZWM2M2I3OWIuLmE2YjUxNzZhY2Rm MmY4ZWEwYWQ5YzcxYWIwNTg0OTJjYTMxZTdlMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZVRleHRCb3guaApAQCAtMTY5LDYgKzE2OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBw YWludFRleHRTdWJyYW5nZUJhY2tncm91bmQoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRmxvYXRQ b2ludCYgYm94T3JpZ2luLCBjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IENvbG9yJiwgdW5zaWdu ZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9mZnNldCk7CiAKICAgICBjb25zdCBSZW5kZXJD b21iaW5lVGV4dCogY29tYmluZWRUZXh0KCkgY29uc3Q7CisgICAgY29uc3QgRm9udENhc2NhZGUm IGxpbmVGb250KCkgY29uc3Q7CiAKICAgICBFeHBhbnNpb25CZWhhdmlvciBleHBhbnNpb25CZWhh dmlvcigpIGNvbnN0OwogCg==