42584 2010-07-19 12:37:13 -0700 Add local storage support for WebKit2 2010-07-19 13:08:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 253330 0 sam 2010-07-19 12:37:13 -0700 Add local storage support for WebKit2 253331 1 61978 sam 2010-07-19 12:37:57 -0700 Created attachment 61978 Patch 253347 2 61978 andersca 2010-07-19 12:57:03 -0700 Comment on attachment 61978 Patch > Index: WebKit2/Shared/WebPreferencesStore.h > =================================================================== > --- WebKit2/Shared/WebPreferencesStore.h (revision 63671) > +++ WebKit2/Shared/WebPreferencesStore.h (working copy) > @@ -105,6 +109,8 @@ struct WebPreferencesStore { > WebCore::String fixedFontFamily; > WebCore::String sansSerifFontFamily; > WebCore::String serifFontFamily; > + > + WebCore::String localStorage; > }; > Looks like this isn't used? Do you also need to remove files from the Skipped list? 253357 3 sam 2010-07-19 13:07:12 -0700 (In reply to comment #2) > (From update of attachment 61978 [details]) > > Index: WebKit2/Shared/WebPreferencesStore.h > > =================================================================== > > --- WebKit2/Shared/WebPreferencesStore.h (revision 63671) > > +++ WebKit2/Shared/WebPreferencesStore.h (working copy) > > @@ -105,6 +109,8 @@ struct WebPreferencesStore { > > WebCore::String fixedFontFamily; > > WebCore::String sansSerifFontFamily; > > WebCore::String serifFontFamily; > > + > > + WebCore::String localStorage; > > }; > > > Looks like this isn't used? Oops. Removed. > Do you also need to remove files from the Skipped list? No, these have not been added yet. 253358 4 sam 2010-07-19 13:08:22 -0700 Landed in r63682. 61978 2010-07-19 12:37:57 -0700 2010-07-19 12:57:03 -0700 Patch bug-42584-20100719123756.patch text/plain 9122 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzY4MCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMDctMTkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbG9j YWwgc3RvcmFnZSBzdXBwb3J0IGZvciBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjU4NAorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZl cmVuY2VzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpX ZWJQcmVmZXJlbmNlc1N0b3JlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9y ZTo6c3dhcCk6CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6ZGVjb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0TG9jYWxTdG9y YWdlRW5hYmxlZCk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0TG9jYWxTdG9yYWdlRW5hYmxl ZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVm ZXJlbmNlczo6c2V0TG9jYWxTdG9yYWdlRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy ZWZlcmVuY2VzOjpsb2NhbFN0b3JhZ2VFbmFibGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UHJlZmVyZW5jZXMuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OldlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpwcmVmZXJlbmNlc0RpZENoYW5nZSk6CisKIDIwMTAtMDctMTkgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJz IENhcmxzc29uLgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAJKHJl dmlzaW9uIDYzNjcxKQorKysgV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDggQEAgV2ViUHJlZmVyZW5jZXNTdG9yZTo6V2Vi UHJlZmVyZW5jZXNTdG9yZQogICAgIDogamF2YVNjcmlwdEVuYWJsZWQodHJ1ZSkKICAgICAsIGxv YWRzSW1hZ2VzQXV0b21hdGljYWxseSh0cnVlKQogICAgICwgcGx1Z2luc0VuYWJsZWQodHJ1ZSkK KyAgICAsIG9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChmYWxzZSkKKyAgICAsIGxv Y2FsU3RvcmFnZUVuYWJsZWQodHJ1ZSkKICAgICAsIG1pbmltdW1Gb250U2l6ZSg5KQogICAgICwg bWluaW11bUxvZ2ljYWxGb250U2l6ZSg5KQogICAgICwgZGVmYXVsdEZvbnRTaXplKDE2KQpAQCAt NDgsNyArNTAsOSBAQCBXZWJQcmVmZXJlbmNlc1N0b3JlOjpXZWJQcmVmZXJlbmNlc1N0b3JlCiB7 CiAgICAgamF2YVNjcmlwdEVuYWJsZWQgPSBvdGhlci5qYXZhU2NyaXB0RW5hYmxlZDsKICAgICBs b2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkgPSBvdGhlci5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHk7 Ci0KKyAgICBwbHVnaW5zRW5hYmxlZCA9IG90aGVyLnBsdWdpbnNFbmFibGVkOworICAgIG9mZmxp bmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCA9IG90aGVyLm9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlRW5hYmxlZDsKKyAgICBsb2NhbFN0b3JhZ2VFbmFibGVkID0gb3RoZXIubG9jYWxTdG9y YWdlRW5hYmxlZDsKICAgICBtaW5pbXVtRm9udFNpemUgPSBvdGhlci5taW5pbXVtRm9udFNpemU7 CiAgICAgbWluaW11bUxvZ2ljYWxGb250U2l6ZSA9IG90aGVyLm1pbmltdW1Mb2dpY2FsRm9udFNp emU7CiAgICAgZGVmYXVsdEZvbnRTaXplID0gb3RoZXIuZGVmYXVsdEZvbnRTaXplOwpAQCAtNzMs NiArNzcsOSBAQCB2b2lkIFdlYlByZWZlcmVuY2VzU3RvcmU6OnN3YXAoV2ViUHJlZmVyCiB7CiAg ICAgc3RkOjpzd2FwKGphdmFTY3JpcHRFbmFibGVkLCBvdGhlci5qYXZhU2NyaXB0RW5hYmxlZCk7 CiAgICAgc3RkOjpzd2FwKGxvYWRzSW1hZ2VzQXV0b21hdGljYWxseSwgb3RoZXIubG9hZHNJbWFn ZXNBdXRvbWF0aWNhbGx5KTsKKyAgICBzdGQ6OnN3YXAocGx1Z2luc0VuYWJsZWQsIG90aGVyLnBs dWdpbnNFbmFibGVkKTsKKyAgICBzdGQ6OnN3YXAob2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVF bmFibGVkLCBvdGhlci5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQpOworICAgIHN0 ZDo6c3dhcChsb2NhbFN0b3JhZ2VFbmFibGVkLCBvdGhlci5sb2NhbFN0b3JhZ2VFbmFibGVkKTsK ICAgICBzdGQ6OnN3YXAobWluaW11bUZvbnRTaXplLCBvdGhlci5taW5pbXVtRm9udFNpemUpOwog ICAgIHN0ZDo6c3dhcChtaW5pbXVtTG9naWNhbEZvbnRTaXplLCBvdGhlci5taW5pbXVtTG9naWNh bEZvbnRTaXplKTsKICAgICBzdGQ6OnN3YXAoZGVmYXVsdEZvbnRTaXplLCBvdGhlci5kZWZhdWx0 Rm9udFNpemUpOwpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkocmV2aXNp b24gNjM2NzEpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ1LDYgKzQ1LDcgQEAgc3RydWN0IFdlYlByZWZlcmVuY2VzU3RvcmUgewog ICAgICAgICBlbmNvZGVyLmVuY29kZShsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkpOwogICAgICAg ICBlbmNvZGVyLmVuY29kZShwbHVnaW5zRW5hYmxlZCk7CiAgICAgICAgIGVuY29kZXIuZW5jb2Rl KG9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCk7CisgICAgICAgIGVuY29kZXIuZW5j b2RlKGxvY2FsU3RvcmFnZUVuYWJsZWQpOwogICAgICAgICBlbmNvZGVyLmVuY29kZShtaW5pbXVt Rm9udFNpemUpOwogICAgICAgICBlbmNvZGVyLmVuY29kZShtaW5pbXVtTG9naWNhbEZvbnRTaXpl KTsKICAgICAgICAgZW5jb2Rlci5lbmNvZGUoZGVmYXVsdEZvbnRTaXplKTsKQEAgLTY3LDYgKzY4 LDggQEAgc3RydWN0IFdlYlByZWZlcmVuY2VzU3RvcmUgewogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHMub2ZmbGluZVdlYkFwcGxpY2F0aW9u Q2FjaGVFbmFibGVkKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShzLmxvY2FsU3RvcmFnZUVuYWJsZWQpKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHMubWluaW11bUZvbnRTaXplKSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShz Lm1pbmltdW1Mb2dpY2FsRm9udFNpemUpKQpAQCAtOTQsNiArOTcsNyBAQCBzdHJ1Y3QgV2ViUHJl ZmVyZW5jZXNTdG9yZSB7CiAgICAgYm9vbCBsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHk7CiAgICAg Ym9vbCBwbHVnaW5zRW5hYmxlZDsKICAgICBib29sIG9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hl RW5hYmxlZDsKKyAgICBib29sIGxvY2FsU3RvcmFnZUVuYWJsZWQ7CiAKICAgICB1aW50MzJfdCBt aW5pbXVtRm9udFNpemU7CiAgICAgdWludDMyX3QgbWluaW11bUxvZ2ljYWxGb250U2l6ZTsKQEAg LTEwNSw2ICsxMDksOCBAQCBzdHJ1Y3QgV2ViUHJlZmVyZW5jZXNTdG9yZSB7CiAgICAgV2ViQ29y ZTo6U3RyaW5nIGZpeGVkRm9udEZhbWlseTsKICAgICBXZWJDb3JlOjpTdHJpbmcgc2Fuc1Nlcmlm Rm9udEZhbWlseTsKICAgICBXZWJDb3JlOjpTdHJpbmcgc2VyaWZGb250RmFtaWx5OworCisgICAg V2ViQ29yZTo6U3RyaW5nIGxvY2FsU3RvcmFnZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktp dApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gNjM2NzEp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk3LDQgKzk3LDE1IEBAIGJvb2wgV2ViUHJlZmVyZW5jZXM6Om9mZmxpbmVXZWJBcHBsaWNh dGkKICAgICByZXR1cm4gbV9zdG9yZS5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQ7 CiB9CiAKK3ZvaWQgV2ViUHJlZmVyZW5jZXM6OnNldExvY2FsU3RvcmFnZUVuYWJsZWQoYm9vbCBi KQoreworICAgIG1fc3RvcmUubG9jYWxTdG9yYWdlRW5hYmxlZCA9IGI7CisgICAgdXBkYXRlKCk7 Cit9CisKK2Jvb2wgV2ViUHJlZmVyZW5jZXM6OmxvY2FsU3RvcmFnZUVuYWJsZWQoKSBjb25zdAor eworICAgIHJldHVybiBtX3N0b3JlLmxvY2FsU3RvcmFnZUVuYWJsZWQ7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oCShyZXZpc2lv biA2MzY3MSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTY0LDYgKzY0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0T2ZmbGluZVdlYkFw cGxpY2F0aW9uQ2FjaGVFbmFibGVkKGJvb2wpOwogICAgIGJvb2wgb2ZmbGluZVdlYkFwcGxpY2F0 aW9uQ2FjaGVFbmFibGVkKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldExvY2FsU3RvcmFnZUVuYWJs ZWQoYm9vbCk7CisgICAgYm9vbCBsb2NhbFN0b3JhZ2VFbmFibGVkKCkgY29uc3Q7CisKIHByaXZh dGU6CiAgICAgV2ViUHJlZmVyZW5jZXMoKTsKICAgICBXZWJQcmVmZXJlbmNlcyhXZWJQcmVmZXJl bmNlcyopOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJ KHJldmlzaW9uIDYzNjcxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc0LDYgKzc0LDE2IEBAIGJvb2wgV0tQcmVmZXJlbmNl c0dldE9mZmxpbmVXZWJBcHBsaWNhdGkKICAgICByZXR1cm4gdG9XSyhwcmVmZXJlbmNlc1JlZikt Pm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVy ZW5jZXNTZXRMb2NhbFN0b3JhZ2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNS ZWYsIGJvb2wgbG9jYWxTdG9yYWdlRW5hYmxlZCkKK3sKKyAgICB0b1dLKHByZWZlcmVuY2VzUmVm KS0+c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChsb2NhbFN0b3JhZ2VFbmFibGVkKTsKK30KKworYm9v bCBXS1ByZWZlcmVuY2VzR2V0TG9jYWxTdG9yYWdlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHBy ZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0b1dLKHByZWZlcmVuY2VzUmVmKS0+bG9jYWxT dG9yYWdlRW5hYmxlZCgpOworfQorCiBXS1ByZWZlcmVuY2VzUmVmIFdLUHJlZmVyZW5jZXNSZXRh aW4oV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKIHsKICAgICB0b1dLKHByZWZlcmVu Y2VzUmVmKS0+cmVmKCk7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl cy5oCShyZXZpc2lvbiA2MzY3MSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMzksMTMgKzM5LDIyIEBAIGV4dGVybiAiQyIgewog V0tfRVhQT1JUIFdLUHJlZmVyZW5jZXNSZWYgV0tQcmVmZXJlbmNlc0NyZWF0ZSgpOwogV0tfRVhQ T1JUIFdLUHJlZmVyZW5jZXNSZWYgV0tQcmVmZXJlbmNlc0NyZWF0ZUNvcHkoV0tQcmVmZXJlbmNl c1JlZik7CiAKKy8vIERlZmF1bHRzIHRvIHRydWUuCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVu Y2VzU2V0SmF2YVNjcmlwdEVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcywgYm9v bCBqYXZhU2NyaXB0RW5hYmxlZCk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0SmF2 YVNjcmlwdEVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyk7CisKKy8vIERlZmF1 bHRzIHRvIHRydWUuCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0TG9hZHNJbWFnZXNB dXRvbWF0aWNhbGx5KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMsIGJvb2wgbG9hZHNJbWFn ZXNBdXRvbWF0aWNhbGx5KTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRMb2Fkc0lt YWdlc0F1dG9tYXRpY2FsbHkoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyk7CisKKy8vIERl ZmF1bHRzIHRvIGZhbHNlLgogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldE9mZmxpbmVX ZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzLCBi b29sIG9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCk7CiBXS19FWFBPUlQgYm9vbCBX S1ByZWZlcmVuY2VzR2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKFdLUHJlZmVy ZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCisvLyBEZWZhdWx0cyB0byB0cnVlLgorV0tfRVhQT1JU IHZvaWQgV0tQcmVmZXJlbmNlc1NldExvY2FsU3RvcmFnZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1Jl ZiBwcmVmZXJlbmNlcywgYm9vbCBsb2NhbFN0b3JhZ2VFbmFibGVkKTsKK1dLX0VYUE9SVCBib29s IFdLUHJlZmVyZW5jZXNHZXRMb2NhbFN0b3JhZ2VFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXMpOworCiBXS19FWFBPUlQgV0tQcmVmZXJlbmNlc1JlZiBXS1ByZWZlcmVuY2VzUmV0 YWluKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogV0tfRVhQT1JUIHZvaWQgV0tQcmVm ZXJlbmNlc1JlbGVhc2UoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyk7CiAKSW5kZXg6IFdl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA2MzY3MSkKKysrIFdl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04 OSw2ICs4OSw4IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCAKICAg ICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldEphdmFTY3JpcHRFbmFibGVkKHN0b3JlLmphdmFTY3Jp cHRFbmFibGVkKTsKICAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldExvYWRzSW1hZ2VzQXV0b21h dGljYWxseShzdG9yZS5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkpOwogICAgIG1fcGFnZS0+c2V0 dGluZ3MoKS0+c2V0UGx1Z2luc0VuYWJsZWQoc3RvcmUucGx1Z2luc0VuYWJsZWQpOworICAgIG1f cGFnZS0+c2V0dGluZ3MoKS0+c2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKHN0 b3JlLm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCk7CisgICAgbV9wYWdlLT5zZXR0 aW5ncygpLT5zZXRMb2NhbFN0b3JhZ2VFbmFibGVkKHN0b3JlLmxvY2FsU3RvcmFnZUVuYWJsZWQp OwogICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0TWluaW11bUZvbnRTaXplKHN0b3JlLm1pbmlt dW1Gb250U2l6ZSk7CiAgICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRNaW5pbXVtTG9naWNhbEZv bnRTaXplKHN0b3JlLm1pbmltdW1Mb2dpY2FsRm9udFNpemUpOwogICAgIG1fcGFnZS0+c2V0dGlu Z3MoKS0+c2V0RGVmYXVsdEZvbnRTaXplKHN0b3JlLmRlZmF1bHRGb250U2l6ZSk7CkBAIC0zMjgs NiArMzMwLDcgQEAgdm9pZCBXZWJQYWdlOjpwcmVmZXJlbmNlc0RpZENoYW5nZShjb25zdAogICAg IG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0SmF2YVNjcmlwdEVuYWJsZWQoc3RvcmUuamF2YVNjcmlw dEVuYWJsZWQpOwogICAgIG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0TG9hZHNJbWFnZXNBdXRvbWF0 aWNhbGx5KHN0b3JlLmxvYWRzSW1hZ2VzQXV0b21hdGljYWxseSk7CiAgICAgbV9wYWdlLT5zZXR0 aW5ncygpLT5zZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoc3RvcmUub2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKTsKKyAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNl dExvY2FsU3RvcmFnZUVuYWJsZWQoc3RvcmUubG9jYWxTdG9yYWdlRW5hYmxlZCk7CiB9CiAKIGJv b2wgV2ViUGFnZTo6aGFuZGxlRWRpdGluZ0tleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZ0 KQo=