100121 2012-10-23 07:20:41 -0700 [Qt] Port QWebPreferences to C++ 2012-10-23 07:50:09 -0700 1 1 1 Unclassified WebKit WebKit2 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen abecsi cmarcelo jturcotte menard webkit.review.bot oldest_to_newest 748618 0 allan.jensen 2012-10-23 07:20:41 -0700 For some odd reason qwebpreferences has been implemented using the C-API. It makes it hard to read and maintain, and is unnecessarily demented. 748621 1 170161 allan.jensen 2012-10-23 07:24:39 -0700 Created attachment 170161 Patch 748643 2 170161 webkit.review.bot 2012-10-23 07:50:06 -0700 Comment on attachment 170161 Patch Clearing flags on attachment: 170161 Committed r132222: <http://trac.webkit.org/changeset/132222> 748645 3 webkit.review.bot 2012-10-23 07:50:09 -0700 All reviewed patches have been landed. Closing bug. 170161 2012-10-23 07:24:39 -0700 2012-10-23 07:50:06 -0700 Patch bug-100121-20121023162256.patch text/plain 12952 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODRhNGVkNThmNzJiY2I4 NzNhNjc2OTFjODNmYWExNjdkNWEzNDMyMy4uM2E3MDc3YjQ1NDQ5MzQ4Njg3MGUzMmNkMmQ4YThi MjgxNTkxMzYxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTEwLTIzICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCisgICAgICAgIFtR dF0gUG9ydCBRV2ViUHJlZmVyZW5jZXMgdG8gQysrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAxMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQb3J0IGFsbCB0aGUgV2ViUHJlZmVyZW5jZSBjYWxscyB0 byB1c2luZyB0aGUgZGlyZWN0IEFQSSBpbnN0ZWFkIG9mIGdvaW5nIHRocm91Z2gKKyAgICAgICAg dGhlIGF1dG8tZ2VuZXJhdGVkIEMgQVBJLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9x d2VicHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6dGVz dEF0dHJpYnV0ZSk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpzZXRBdHRyaWJ1 dGUpOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6c2V0Rm9udEZhbWlseSk6Cisg ICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpmb250RmFtaWx5KToKKyAgICAgICAgKFFX ZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnNldEZvbnRTaXplKToKKyAgICAgICAgKFFXZWJQcmVmZXJl bmNlc1ByaXZhdGU6OmZvbnRTaXplKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6 OnByZWZlcmVuY2VzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNl c19wX3AuaDoKKworMjAxMi0xMC0yMyAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVu c2VuQGRpZ2lhLmNvbT4KKwogICAgICAgICBbUXRdIE1ha2UgZGVmYXVsdCB0eXBlc2V0dGluZ3Mg Y29uZmlndXJhYmxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDAxMDYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2VicHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VicHJlZmVyZW5jZXMuY3BwCmluZGV4IGUyN2Y1MTI2NDY5ZDg5MWU4NWVhMTUzYjRlOGFlYzcx NGUwMTcwYTEuLjI3MTBmYjZmMWFmYTUxMmJhMzlhMjAwMDYxZDcxNjVlOTY4ZWQ3Y2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlcy5j cHAKQEAgLTIwLDExICsyMCw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAicXdl YnByZWZlcmVuY2VzX3AuaCIKIAotI2luY2x1ZGUgIldLUGFnZUdyb3VwLmgiCi0jaW5jbHVkZSAi V0tQcmVmZXJlbmNlcy5oIgotI2luY2x1ZGUgIldLUHJlZmVyZW5jZXNQcml2YXRlLmgiCi0jaW5j bHVkZSAiV0tSZXRhaW5QdHIuaCIKLSNpbmNsdWRlICJXS1N0cmluZ1F0LmgiCisjaW5jbHVkZSAi V2ViUGFnZUdyb3VwLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAicXF1 aWNrd2Vidmlld19wX3AuaCIKICNpbmNsdWRlICJxd2VicHJlZmVyZW5jZXNfcF9wLmgiCiAKQEAg LTQwLDQwICszNyw0MCBAQCBib29sIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnRlc3RBdHRyaWJ1 dGUoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6V2ViQXR0cmlidXRlCiB7CiAgICAgc3dpdGNoIChh dHRyKSB7CiAgICAgY2FzZSBBdXRvTG9hZEltYWdlczoKLSAgICAgICAgcmV0dXJuIFdLUHJlZmVy ZW5jZXNHZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkocHJlZmVyZW5jZXNSZWYoKSk7CisgICAg ICAgIHJldHVybiBwcmVmZXJlbmNlcygpLT5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoKTsKICNp ZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgY2FzZSBGdWxsU2NyZWVuRW5hYmxlZDoKLSAg ICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRGdWxsU2NyZWVuRW5hYmxlZChwcmVmZXJlbmNl c1JlZigpKTsKKyAgICAgICAgcmV0dXJuIHByZWZlcmVuY2VzKCktPmZ1bGxTY3JlZW5FbmFibGVk KCk7CiAjZW5kaWYKICAgICBjYXNlIEphdmFzY3JpcHRFbmFibGVkOgotICAgICAgICByZXR1cm4g V0tQcmVmZXJlbmNlc0dldEphdmFTY3JpcHRFbmFibGVkKHByZWZlcmVuY2VzUmVmKCkpOworICAg ICAgICByZXR1cm4gcHJlZmVyZW5jZXMoKS0+amF2YVNjcmlwdEVuYWJsZWQoKTsKICAgICBjYXNl IFBsdWdpbnNFbmFibGVkOgotICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFBsdWdpbnNF bmFibGVkKHByZWZlcmVuY2VzUmVmKCkpOworICAgICAgICByZXR1cm4gcHJlZmVyZW5jZXMoKS0+ cGx1Z2luc0VuYWJsZWQoKTsKICAgICBjYXNlIE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5h YmxlZDoKLSAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRPZmZsaW5lV2ViQXBwbGljYXRp b25DYWNoZUVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CisgICAgICAgIHJldHVybiBwcmVmZXJl bmNlcygpLT5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoKTsKICAgICBjYXNlIExv Y2FsU3RvcmFnZUVuYWJsZWQ6Ci0gICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0TG9jYWxT dG9yYWdlRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpKTsKKyAgICAgICAgcmV0dXJuIHByZWZlcmVu Y2VzKCktPmxvY2FsU3RvcmFnZUVuYWJsZWQoKTsKICAgICBjYXNlIFhTU0F1ZGl0aW5nRW5hYmxl ZDoKLSAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRYU1NBdWRpdG9yRW5hYmxlZChwcmVm ZXJlbmNlc1JlZigpKTsKKyAgICAgICAgcmV0dXJuIHByZWZlcmVuY2VzKCktPnhzc0F1ZGl0b3JF bmFibGVkKCk7CiAgICAgY2FzZSBQcml2YXRlQnJvd3NpbmdFbmFibGVkOgotICAgICAgICByZXR1 cm4gV0tQcmVmZXJlbmNlc0dldFByaXZhdGVCcm93c2luZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYo KSk7CisgICAgICAgIHJldHVybiBwcmVmZXJlbmNlcygpLT5wcml2YXRlQnJvd3NpbmdFbmFibGVk KCk7CiAgICAgY2FzZSBEbnNQcmVmZXRjaEVuYWJsZWQ6Ci0gICAgICAgIHJldHVybiBXS1ByZWZl cmVuY2VzR2V0RE5TUHJlZmV0Y2hpbmdFbmFibGVkKHByZWZlcmVuY2VzUmVmKCkpOworICAgICAg ICByZXR1cm4gcHJlZmVyZW5jZXMoKS0+ZG5zUHJlZmV0Y2hpbmdFbmFibGVkKCk7CiAgICAgY2Fz ZSBGcmFtZUZsYXR0ZW5pbmdFbmFibGVkOgotICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dl dEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CisgICAgICAgIHJldHVy biBwcmVmZXJlbmNlcygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCk7CiAgICAgY2FzZSBEZXZl bG9wZXJFeHRyYXNFbmFibGVkOgotICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldERldmVs b3BlckV4dHJhc0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CisgICAgICAgIHJldHVybiBwcmVm ZXJlbmNlcygpLT5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCk7CiAjaWYgRU5BQkxFKFdFQkdMKQog ICAgIGNhc2UgV2ViR0xFbmFibGVkOgotICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFdl YkdMRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpKTsKKyAgICAgICAgcmV0dXJuIHByZWZlcmVuY2Vz KCktPndlYkdMRW5hYmxlZCgpOwogI2lmIEVOQUJMRShDU1NfU0hBREVSUykKICAgICBjYXNlIENT U0N1c3RvbUZpbHRlckVuYWJsZWQ6Ci0gICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0Q1NT Q3VzdG9tRmlsdGVyRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpKTsKKyAgICAgICAgcmV0dXJuIHBy ZWZlcmVuY2VzKCktPmNzc0N1c3RvbUZpbHRlckVuYWJsZWQoKTsKICNlbmRpZgogI2VuZGlmCiAj aWYgRU5BQkxFKFdFQl9BVURJTykKICAgICBjYXNlIFdlYkF1ZGlvRW5hYmxlZDoKLSAgICAgICAg cmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRXZWJBdWRpb0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7 CisgICAgICAgIHJldHVybiBwcmVmZXJlbmNlcygpLT53ZWJBdWRpb0VuYWJsZWQoKTsKICNlbmRp ZgogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtODUsNTIg KzgyLDUyIEBAIHZvaWQgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6c2V0QXR0cmlidXRlKFFXZWJQ cmVmZXJlbmNlc1ByaXZhdGU6OldlYkF0dHJpYnV0ZSBhCiB7CiAgICAgc3dpdGNoIChhdHRyKSB7 CiAgICAgY2FzZSBBdXRvTG9hZEltYWdlczoKLSAgICAgICAgV0tQcmVmZXJlbmNlc1NldExvYWRz SW1hZ2VzQXV0b21hdGljYWxseShwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBw cmVmZXJlbmNlcygpLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoZW5hYmxlKTsKICAgICAg ICAgYnJlYWs7CiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIGNhc2UgRnVsbFNjcmVl bkVuYWJsZWQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRGdWxsU2NyZWVuRW5hYmxlZChwcmVm ZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRGdWxsU2Ny ZWVuRW5hYmxlZChlbmFibGUpOwogICAgICAgICBicmVhazsKICNlbmRpZgogICAgIGNhc2UgSmF2 YXNjcmlwdEVuYWJsZWQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRKYXZhU2NyaXB0RW5hYmxl ZChwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRK YXZhU2NyaXB0RW5hYmxlZChlbmFibGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFBsdWdp bnNFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0UGx1Z2luc0VuYWJsZWQocHJlZmVy ZW5jZXNSZWYoKSwgZW5hYmxlKTsKKyAgICAgICAgcHJlZmVyZW5jZXMoKS0+c2V0UGx1Z2luc0Vu YWJsZWQoZW5hYmxlKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBPZmZsaW5lV2ViQXBwbGlj YXRpb25DYWNoZUVuYWJsZWQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRPZmZsaW5lV2ViQXBw bGljYXRpb25DYWNoZUVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSwgZW5hYmxlKTsKKyAgICAgICAg cHJlZmVyZW5jZXMoKS0+c2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKGVuYWJs ZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTG9jYWxTdG9yYWdlRW5hYmxlZDoKLSAgICAg ICAgV0tQcmVmZXJlbmNlc1NldExvY2FsU3RvcmFnZUVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSwg ZW5hYmxlKTsKKyAgICAgICAgcHJlZmVyZW5jZXMoKS0+c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChl bmFibGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFhTU0F1ZGl0aW5nRW5hYmxlZDoKLSAg ICAgICAgV0tQcmVmZXJlbmNlc1NldFhTU0F1ZGl0b3JFbmFibGVkKHByZWZlcmVuY2VzUmVmKCks IGVuYWJsZSk7CisgICAgICAgIHByZWZlcmVuY2VzKCktPnNldFhTU0F1ZGl0b3JFbmFibGVkKGVu YWJsZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZDoK LSAgICAgICAgV0tQcmVmZXJlbmNlc1NldFByaXZhdGVCcm93c2luZ0VuYWJsZWQocHJlZmVyZW5j ZXNSZWYoKSwgZW5hYmxlKTsKKyAgICAgICAgcHJlZmVyZW5jZXMoKS0+c2V0UHJpdmF0ZUJyb3dz aW5nRW5hYmxlZChlbmFibGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIERuc1ByZWZldGNo RW5hYmxlZDoKLSAgICAgICAgV0tQcmVmZXJlbmNlc1NldEROU1ByZWZldGNoaW5nRW5hYmxlZChw cmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRETlNQ cmVmZXRjaGluZ0VuYWJsZWQoZW5hYmxlKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBGcmFt ZUZsYXR0ZW5pbmdFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0RnJhbWVGbGF0dGVu aW5nRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBwcmVmZXJlbmNl cygpLT5zZXRGcmFtZUZsYXR0ZW5pbmdFbmFibGVkKGVuYWJsZSk7CiAgICAgY2FzZSBEZXZlbG9w ZXJFeHRyYXNFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0RGV2ZWxvcGVyRXh0cmFz RW5hYmxlZChwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBwcmVmZXJlbmNlcygp LT5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKGVuYWJsZSk7CiAgICAgICAgIGJyZWFrOwogI2lm IEVOQUJMRShXRUJHTCkKICAgICBjYXNlIFdlYkdMRW5hYmxlZDoKLSAgICAgICAgV0tQcmVmZXJl bmNlc1NldFdlYkdMRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOworICAgICAgICBw cmVmZXJlbmNlcygpLT5zZXRXZWJHTEVuYWJsZWQoZW5hYmxlKTsKICAgICAgICAgYnJlYWs7CiAj aWYgRU5BQkxFKENTU19TSEFERVJTKQogICAgIGNhc2UgQ1NTQ3VzdG9tRmlsdGVyRW5hYmxlZDoK LSAgICAgICAgV0tQcmVmZXJlbmNlc1NldENTU0N1c3RvbUZpbHRlckVuYWJsZWQocHJlZmVyZW5j ZXNSZWYoKSwgZW5hYmxlKTsKKyAgICAgICAgcHJlZmVyZW5jZXMoKS0+c2V0Q1NTQ3VzdG9tRmls dGVyRW5hYmxlZChlbmFibGUpOwogICAgICAgICBicmVhazsKICNlbmRpZgogI2VuZGlmCiAjaWYg RU5BQkxFKFdFQl9BVURJTykKICAgICBjYXNlIFdlYkF1ZGlvRW5hYmxlZDoKLSAgICAgICAgV0tQ cmVmZXJlbmNlc1NldFdlYkF1ZGlvRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOwor ICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRXZWJBdWRpb0VuYWJsZWQoZW5hYmxlKTsKICAgICAg ICAgYnJlYWs7CiAjZW5kaWYKICAgICBkZWZhdWx0OgpAQCAtMTY2LDIyICsxNjMsMjIgQEAgdm9p ZCBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpzZXRGb250RmFtaWx5KFFXZWJQcmVmZXJlbmNlc1By aXZhdGU6OkZvbnRGYW1pbHkgd2gKIHsKICAgICBzd2l0Y2ggKHdoaWNoKSB7CiAgICAgY2FzZSBT dGFuZGFyZEZvbnQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRTdGFuZGFyZEZvbnRGYW1pbHko cHJlZmVyZW5jZXNSZWYoKSwgV0tTdHJpbmdDcmVhdGVXaXRoUVN0cmluZyhmYW1pbHkpKTsKKyAg ICAgICAgcHJlZmVyZW5jZXMoKS0+c2V0U3RhbmRhcmRGb250RmFtaWx5KGZhbWlseSk7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgRml4ZWRGb250OgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0 Rml4ZWRGb250RmFtaWx5KHByZWZlcmVuY2VzUmVmKCksIFdLU3RyaW5nQ3JlYXRlV2l0aFFTdHJp bmcoZmFtaWx5KSk7CisgICAgICAgIHByZWZlcmVuY2VzKCktPnNldEZpeGVkRm9udEZhbWlseShm YW1pbHkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFNlcmlmRm9udDoKLSAgICAgICAgV0tQ cmVmZXJlbmNlc1NldFNlcmlmRm9udEZhbWlseShwcmVmZXJlbmNlc1JlZigpLCBXS1N0cmluZ0Ny ZWF0ZVdpdGhRU3RyaW5nKGZhbWlseSkpOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRTZXJp ZkZvbnRGYW1pbHkoZmFtaWx5KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBTYW5zU2VyaWZG b250OgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0U2Fuc1NlcmlmRm9udEZhbWlseShwcmVmZXJl bmNlc1JlZigpLCBXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5nKGZhbWlseSkpOworICAgICAgICBw cmVmZXJlbmNlcygpLT5zZXRTYW5zU2VyaWZGb250RmFtaWx5KGZhbWlseSk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgQ3Vyc2l2ZUZvbnQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRDdXJz aXZlRm9udEZhbWlseShwcmVmZXJlbmNlc1JlZigpLCBXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5n KGZhbWlseSkpOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRDdXJzaXZlRm9udEZhbWlseShm YW1pbHkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEZhbnRhc3lGb250OgotICAgICAgICBX S1ByZWZlcmVuY2VzU2V0RmFudGFzeUZvbnRGYW1pbHkocHJlZmVyZW5jZXNSZWYoKSwgV0tTdHJp bmdDcmVhdGVXaXRoUVN0cmluZyhmYW1pbHkpKTsKKyAgICAgICAgcHJlZmVyZW5jZXMoKS0+c2V0 RmFudGFzeUZvbnRGYW1pbHkoZmFtaWx5KTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoK ICAgICAgICAgYnJlYWs7CkBAIC0xOTEsMzAgKzE4OCwxOCBAQCB2b2lkIFFXZWJQcmVmZXJlbmNl c1ByaXZhdGU6OnNldEZvbnRGYW1pbHkoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6Rm9udEZhbWls eSB3aAogUVN0cmluZyBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpmb250RmFtaWx5KFFXZWJQcmVm ZXJlbmNlc1ByaXZhdGU6OkZvbnRGYW1pbHkgd2hpY2gpIGNvbnN0CiB7CiAgICAgc3dpdGNoICh3 aGljaCkgewotICAgIGNhc2UgU3RhbmRhcmRGb250OiB7Ci0gICAgICAgIFdLUmV0YWluUHRyPFdL U3RyaW5nUmVmPiBzdHJpbmdSZWYoQWRvcHRXSywgV0tQcmVmZXJlbmNlc0NvcHlTdGFuZGFyZEZv bnRGYW1pbHkocHJlZmVyZW5jZXNSZWYoKSkpOwotICAgICAgICByZXR1cm4gV0tTdHJpbmdDb3B5 UVN0cmluZyhzdHJpbmdSZWYuZ2V0KCkpOwotICAgIH0KLSAgICBjYXNlIEZpeGVkRm9udDogewot ICAgICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gc3RyaW5nUmVmKEFkb3B0V0ssIFdLUHJl ZmVyZW5jZXNDb3B5Rml4ZWRGb250RmFtaWx5KHByZWZlcmVuY2VzUmVmKCkpKTsKLSAgICAgICAg cmV0dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcoc3RyaW5nUmVmLmdldCgpKTsKLSAgICB9Ci0gICAg Y2FzZSBTZXJpZkZvbnQ6IHsKLSAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHN0cmlu Z1JlZihBZG9wdFdLLCBXS1ByZWZlcmVuY2VzQ29weVNlcmlmRm9udEZhbWlseShwcmVmZXJlbmNl c1JlZigpKSk7Ci0gICAgICAgIHJldHVybiBXS1N0cmluZ0NvcHlRU3RyaW5nKHN0cmluZ1JlZi5n ZXQoKSk7Ci0gICAgfQotICAgIGNhc2UgU2Fuc1NlcmlmRm9udDogewotICAgICAgICBXS1JldGFp blB0cjxXS1N0cmluZ1JlZj4gc3RyaW5nUmVmKEFkb3B0V0ssIFdLUHJlZmVyZW5jZXNDb3B5U2Fu c1NlcmlmRm9udEZhbWlseShwcmVmZXJlbmNlc1JlZigpKSk7Ci0gICAgICAgIHJldHVybiBXS1N0 cmluZ0NvcHlRU3RyaW5nKHN0cmluZ1JlZi5nZXQoKSk7Ci0gICAgfQotICAgIGNhc2UgQ3Vyc2l2 ZUZvbnQ6IHsKLSAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHN0cmluZ1JlZihBZG9w dFdLLCBXS1ByZWZlcmVuY2VzQ29weUN1cnNpdmVGb250RmFtaWx5KHByZWZlcmVuY2VzUmVmKCkp KTsKLSAgICAgICAgcmV0dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcoc3RyaW5nUmVmLmdldCgpKTsK LSAgICB9Ci0gICAgY2FzZSBGYW50YXN5Rm9udDogewotICAgICAgICBXS1JldGFpblB0cjxXS1N0 cmluZ1JlZj4gc3RyaW5nUmVmKEFkb3B0V0ssIFdLUHJlZmVyZW5jZXNDb3B5RmFudGFzeUZvbnRG YW1pbHkocHJlZmVyZW5jZXNSZWYoKSkpOwotICAgICAgICByZXR1cm4gV0tTdHJpbmdDb3B5UVN0 cmluZyhzdHJpbmdSZWYuZ2V0KCkpOwotICAgIH0KKyAgICBjYXNlIFN0YW5kYXJkRm9udDoKKyAg ICAgICAgcmV0dXJuIHByZWZlcmVuY2VzKCktPnN0YW5kYXJkRm9udEZhbWlseSgpOworICAgIGNh c2UgRml4ZWRGb250OgorICAgICAgICByZXR1cm4gcHJlZmVyZW5jZXMoKS0+Zml4ZWRGb250RmFt aWx5KCk7CisgICAgY2FzZSBTZXJpZkZvbnQ6CisgICAgICAgIHJldHVybiBwcmVmZXJlbmNlcygp LT5zZXJpZkZvbnRGYW1pbHkoKTsKKyAgICBjYXNlIFNhbnNTZXJpZkZvbnQ6CisgICAgICAgIHJl dHVybiBwcmVmZXJlbmNlcygpLT5zYW5zU2VyaWZGb250RmFtaWx5KCk7CisgICAgY2FzZSBDdXJz aXZlRm9udDoKKyAgICAgICAgcmV0dXJuIHByZWZlcmVuY2VzKCktPmN1cnNpdmVGb250RmFtaWx5 KCk7CisgICAgY2FzZSBGYW50YXN5Rm9udDoKKyAgICAgICAgcmV0dXJuIHByZWZlcmVuY2VzKCkt PmZhbnRhc3lGb250RmFtaWx5KCk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIFFTdHJp bmcoKTsKICAgICB9CkBAIC0yMjQsMTQgKzIwOSwxNCBAQCB2b2lkIFFXZWJQcmVmZXJlbmNlc1By aXZhdGU6OnNldEZvbnRTaXplKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OkZvbnRTaXplVHlwZSB0 eQogewogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2UgTWluaW11bUZvbnRTaXplOgotICAg ICAgICAgV0tQcmVmZXJlbmNlc1NldE1pbmltdW1Gb250U2l6ZShwcmVmZXJlbmNlc1JlZigpLCBz aXplKTsKLSAgICAgICAgIGJyZWFrOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRNaW5pbXVt Rm9udFNpemUoc2l6ZSk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRGVmYXVsdEZvbnRTaXpl OgotICAgICAgICAgV0tQcmVmZXJlbmNlc1NldERlZmF1bHRGb250U2l6ZShwcmVmZXJlbmNlc1Jl ZigpLCBzaXplKTsKLSAgICAgICAgIGJyZWFrOworICAgICAgICBwcmVmZXJlbmNlcygpLT5zZXRE ZWZhdWx0Rm9udFNpemUoc2l6ZSk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRGVmYXVsdEZp eGVkRm9udFNpemU6Ci0gICAgICAgICBXS1ByZWZlcmVuY2VzU2V0RGVmYXVsdEZpeGVkRm9udFNp emUocHJlZmVyZW5jZXNSZWYoKSwgc2l6ZSk7Ci0gICAgICAgICBicmVhazsKKyAgICAgICAgcHJl ZmVyZW5jZXMoKS0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUoc2l6ZSk7CisgICAgICAgIGJyZWFr OwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KQEAg LTI0MSwxMSArMjI2LDExIEBAIHVuc2lnbmVkIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmZvbnRT aXplKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OkZvbnRTaXplVHlwZSB0CiB7CiAgICAgc3dpdGNo ICh0eXBlKSB7CiAgICAgY2FzZSBNaW5pbXVtRm9udFNpemU6Ci0gICAgICAgICByZXR1cm4gV0tQ cmVmZXJlbmNlc0dldE1pbmltdW1Gb250U2l6ZShwcmVmZXJlbmNlc1JlZigpKTsKKyAgICAgICAg cmV0dXJuIHByZWZlcmVuY2VzKCktPm1pbmltdW1Gb250U2l6ZSgpOwogICAgIGNhc2UgRGVmYXVs dEZvbnRTaXplOgotICAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXREZWZhdWx0Rm9udFNp emUocHJlZmVyZW5jZXNSZWYoKSk7CisgICAgICAgIHJldHVybiBwcmVmZXJlbmNlcygpLT5kZWZh dWx0Rm9udFNpemUoKTsKICAgICBjYXNlIERlZmF1bHRGaXhlZEZvbnRTaXplOgotICAgICAgICAg cmV0dXJuIFdLUHJlZmVyZW5jZXNHZXREZWZhdWx0Rml4ZWRGb250U2l6ZShwcmVmZXJlbmNlc1Jl ZigpKTsKKyAgICAgICAgcmV0dXJuIHByZWZlcmVuY2VzKCktPmRlZmF1bHRGaXhlZEZvbnRTaXpl KCk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAg IHJldHVybiBmYWxzZTsKQEAgLTU0MSwxMCArNTI2LDkgQEAgdm9pZCBRV2ViUHJlZmVyZW5jZXM6 OnNldFdlYkF1ZGlvRW5hYmxlZChib29sIGVuYWJsZSkKICNlbmRpZgogfQogCi1XS1ByZWZlcmVu Y2VzUmVmIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnByZWZlcmVuY2VzUmVmKCkgY29uc3QKK1dl YktpdDo6V2ViUHJlZmVyZW5jZXMqIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnByZWZlcmVuY2Vz KCkgY29uc3QKIHsKLSAgICBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYgPSB0b0FQSSh3ZWJW aWV3UHJpdmF0ZS0+d2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKSk7Ci0gICAgcmV0dXJuIFdLUGFn ZUdyb3VwR2V0UHJlZmVyZW5jZXMocGFnZUdyb3VwUmVmKTsKKyAgICByZXR1cm4gd2ViVmlld1By aXZhdGUtPndlYlBhZ2VQcm94eS0+cGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCk7CiB9CiAKIFFX ZWJQcmVmZXJlbmNlc1ByaXZhdGUqIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmdldChRV2ViUHJl ZmVyZW5jZXMqIHByZWZlcmVuY2VzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXNfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wX3AuaAppbmRleCBjNjA2YmJlODk5NDk2ZGYzMjA4 ODNmOWY3ZjViNWE1NzY0Y2NlZjFmLi5jZTNlMWIyMjg0ZjRhY2ZjNDRiYTcxZjA1Y2Q2OWNlNmQy YTZmM2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJw cmVmZXJlbmNlc19wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJwcmVmZXJlbmNlc19wX3AuaApAQCAtMjAsNyArMjAsNyBAQAogI2lmbmRlZiBxd2VicHJlZmVy ZW5jZXNfcF9wX2gKICNkZWZpbmUgcXdlYnByZWZlcmVuY2VzX3BfcF9oCiAKLSNpbmNsdWRlICJX S1ByZWZlcmVuY2VzLmgiCisjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKIAogY2xhc3MgUVF1 aWNrV2ViVmlld1ByaXZhdGU7CiAKQEAgLTcxLDcgKzcxLDcgQEAgcHVibGljOgogICAgIHZvaWQg c2V0Rm9udFNpemUoRm9udFNpemVUeXBlIHR5cGUsIHVuc2lnbmVkIHNpemUpOwogICAgIHVuc2ln bmVkIGZvbnRTaXplKEZvbnRTaXplVHlwZSB0eXBlKSBjb25zdDsKIAotICAgIFdLUHJlZmVyZW5j ZXNSZWYgcHJlZmVyZW5jZXNSZWYoKSBjb25zdDsKKyAgICBXZWJLaXQ6OldlYlByZWZlcmVuY2Vz KiBwcmVmZXJlbmNlcygpIGNvbnN0OwogCiAgICAgUVF1aWNrV2ViVmlld1ByaXZhdGUqIHdlYlZp ZXdQcml2YXRlOwogCg==