40949 2010-06-21 15:47:52 -0700 Add PluginInfoStore class 2010-06-21 16:00:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 240927 0 andersca 2010-06-21 15:47:52 -0700 Add PluginInfoStore class 240929 1 59301 andersca 2010-06-21 15:50:48 -0700 Created attachment 59301 Patch 240934 2 59301 sam 2010-06-21 15:54:28 -0700 Comment on attachment 59301 Patch > Index: WebKit2/Shared/WebPreferencesStore.h > =================================================================== > --- WebKit2/Shared/WebPreferencesStore.h (revision 61578) > +++ WebKit2/Shared/WebPreferencesStore.h (working copy) > @@ -43,6 +43,7 @@ struct WebPreferencesStore { > { > encoder.encode(javaScriptEnabled); > encoder.encode(loadsImagesAutomatically); > + encoder.encode(pluginsEnabled); > encoder.encode(minimumFontSize); > encoder.encode(minimumLogicalFontSize); > encoder.encode(defaultFontSize); > @@ -61,6 +62,8 @@ struct WebPreferencesStore { > return false; > if (!decoder.decode(s.loadsImagesAutomatically)) > return false; > + if (!decoder.decode(s.pluginsEnabled)) > + return false; > if (!decoder.decode(s.minimumFontSize)) > return false; > if (!decoder.decode(s.minimumLogicalFontSize)) > @@ -86,6 +89,8 @@ struct WebPreferencesStore { > > bool javaScriptEnabled; > bool loadsImagesAutomatically; > + bool pluginsEnabled; You should mention in your changelog that you are also making this change to the preferences. Otherwise, looks good. r=me. 240935 3 andersca 2010-06-21 16:00:25 -0700 Committed r61587: <http://trac.webkit.org/changeset/61587> 59301 2010-06-21 15:50:48 -0700 2010-06-21 15:54:27 -0700 Patch bug-40949-20100621155047.patch text/plain 13989 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTU4NSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTAtMDYtMjEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgUGx1Z2luSW5mb1N0b3JlIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00MDk0OQorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpXZWJQ cmVmZXJlbmNlc1N0b3JlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjplbmNvZGUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpkZWNvZGUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9QbHVnaW5zOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5J bmZvU3RvcmUuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpz aGFyZWQpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbkluZm9TdG9y ZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6cmVmcmVzaCk6CisgICAgICAg IChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2lucyk6CisgICAgICAgICogVUlQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmg6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vz cy9QbHVnaW5zL21hYzogQWRkZWQuCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZv cm1TdHJhdGVnaWVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGxhdGZvcm1TdHJhdGVnaWVz OjpyZWZyZXNoUGx1Z2lucyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBsYXRmb3JtU3RyYXRlZ2ll czo6Z2V0UGx1Z2luSW5mbyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKwogMjAxMC0wNi0yMSAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbmRlcnMgQ2FybHNzb24uCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNl c1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0 b3JlLmNwcAkocmV2aXNpb24gNjE1NzgpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNl c1N0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKIFdlYlByZWZlcmVuY2VzU3RvcmU6OldlYlByZWZlcmVuY2VzU3RvcmUoKQogICAgIDog amF2YVNjcmlwdEVuYWJsZWQodHJ1ZSkKICAgICAsIGxvYWRzSW1hZ2VzQXV0b21hdGljYWxseSh0 cnVlKQorICAgICwgcGx1Z2luc0VuYWJsZWQodHJ1ZSkKICAgICAsIG1pbmltdW1Gb250U2l6ZSg5 KQogICAgICwgbWluaW11bUxvZ2ljYWxGb250U2l6ZSg5KQogICAgICwgZGVmYXVsdEZvbnRTaXpl KDE2KQpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkocmV2aXNpb24gNjE1 NzgpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQzLDYgKzQzLDcgQEAgc3RydWN0IFdlYlByZWZlcmVuY2VzU3RvcmUgewogICAgIHsK ICAgICAgICAgZW5jb2Rlci5lbmNvZGUoamF2YVNjcmlwdEVuYWJsZWQpOwogICAgICAgICBlbmNv ZGVyLmVuY29kZShsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkpOworICAgICAgICBlbmNvZGVyLmVu Y29kZShwbHVnaW5zRW5hYmxlZCk7CiAgICAgICAgIGVuY29kZXIuZW5jb2RlKG1pbmltdW1Gb250 U2l6ZSk7CiAgICAgICAgIGVuY29kZXIuZW5jb2RlKG1pbmltdW1Mb2dpY2FsRm9udFNpemUpOwog ICAgICAgICBlbmNvZGVyLmVuY29kZShkZWZhdWx0Rm9udFNpemUpOwpAQCAtNjEsNiArNjIsOCBA QCBzdHJ1Y3QgV2ViUHJlZmVyZW5jZXNTdG9yZSB7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUocy5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkp KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KHMucGx1Z2luc0VuYWJsZWQpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHMubWluaW11bUZvbnRTaXplKSkKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShzLm1pbmltdW1Mb2dpY2FsRm9u dFNpemUpKQpAQCAtODYsNiArODksOCBAQCBzdHJ1Y3QgV2ViUHJlZmVyZW5jZXNTdG9yZSB7CiAK ICAgICBib29sIGphdmFTY3JpcHRFbmFibGVkOwogICAgIGJvb2wgbG9hZHNJbWFnZXNBdXRvbWF0 aWNhbGx5OworICAgIGJvb2wgcGx1Z2luc0VuYWJsZWQ7CisgICAgCiAgICAgdWludDMyX3QgbWlu aW11bUZvbnRTaXplOwogICAgIHVpbnQzMl90IG1pbmltdW1Mb2dpY2FsRm9udFNpemU7CiAgICAg dWludDMyX3QgZGVmYXVsdEZvbnRTaXplOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5JbmZvU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYktpdDIvVUlQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1 NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAx LiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAq ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisg KiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAq IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKKworI2luY2x1 ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KKwordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKK25h bWVzcGFjZSBXZWJLaXQgeworCitQbHVnaW5JbmZvU3RvcmUmIFBsdWdpbkluZm9TdG9yZTo6c2hh cmVkKCkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFBsdWdpbkluZm9TdG9yZSwgcGx1Z2lu SW5mb1N0b3JlLCAoKSk7CisgICAgcmV0dXJuIHBsdWdpbkluZm9TdG9yZTsKK30KKworUGx1Z2lu SW5mb1N0b3JlOjpQbHVnaW5JbmZvU3RvcmUoKQorICAgIDogbV9wbHVnaW5MaXN0SXNVcFRvRGF0 ZShmYWxzZSkKK3sKK30KKwordm9pZCBQbHVnaW5JbmZvU3RvcmU6OnJlZnJlc2goKQoreworICAg IG1fcGx1Z2luTGlzdElzVXBUb0RhdGUgPSBmYWxzZTsKK30KKwordm9pZCBQbHVnaW5JbmZvU3Rv cmU6OmdldFBsdWdpbnMoVmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+JiBwbHVnaW5zKQorewor ICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRl eDogV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oCShyZXZpc2lv biAwKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSw1OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn JworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMK KyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAq IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgUGx1Z2luSW5m b1N0b3JlX2gKKyNkZWZpbmUgUGx1Z2luSW5mb1N0b3JlX2gKKworI2luY2x1ZGUgPFdlYkNvcmUv UGx1Z2luRGF0YS5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3MgUGx1Z2luSW5mb1N0 b3JlIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUGx1Z2luSW5mb1N0b3JlJiBzaGFyZWQoKTsKKyAg ICAKKyAgICB2b2lkIHJlZnJlc2goKTsKKyAgICB2b2lkIGdldFBsdWdpbnMoVmVjdG9yPFdlYkNv cmU6OlBsdWdpbkluZm8+JiBwbHVnaW5zKTsKKyAgICAKK3ByaXZhdGU6CisgICAgLy8gUmVwcmVz ZW50cyBhIHNpbmdsZSBwbHVnLWluLgorICAgIHN0cnVjdCBQbHVnaW4geworICAgICAgICBXZWJD b3JlOjpTdHJpbmcgcGF0aDsKKyAgICAgICAgV2ViQ29yZTo6UGx1Z2luSW5mbyBpbmZvOworI2lm IFBMQVRGT1JNKE1BQykKKyAgICAgICAgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmU7Cisj ZW5kaWYKKyAgICB9OworICAgIAorICAgIFBsdWdpbkluZm9TdG9yZSgpOworCisgICAgVmVjdG9y PFBsdWdpbj4gbV9wbHVnaW5zOworICAgIGJvb2wgbV9wbHVnaW5MaXN0SXNVcFRvRGF0ZTsKK307 CisgICAgCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2VuZGlmIC8vIFBsdWdpbkluZm9TdG9y ZV9oCkluZGV4OiBXZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2 aXNpb24gNjE1NzgpCisrKyBXZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsOCBAQAogCQkxQUExQ0M1RDEwMEZBMUExMDA3 OERFQkMgLyogUXVhcnR6Q29yZS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUExQ0M1QzEwMEZBMUExMDA3OERFQkMgLyogUXVhcnR6 Q29yZS5mcmFtZXdvcmsgKi87IH07CiAJCTFBQTFDRDA3MTAwRkExQkEwMDc4REVCQyAvKiBDYXJi b24uZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUFBMUNEMDYxMDBGQTFCQTAwNzhERUJDIC8qIENhcmJvbi5mcmFtZXdvcmsgKi87IH07 CiAJCTFBQURFNkZGMTBEODU1RkMwMEQzRDYzRCAvKiBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1l d29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFB QURFNkZFMTBEODU1RkMwMEQzRDYzRCAvKiBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yayAq LzsgfTsKKwkJMUFFRkNDMTIxMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZS5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFFRkNDMTAxMUQw MUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZS5oICovOyB9OworCQkxQUVGQ0MxMzExRDAx Rjk2MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRUZDQzExMTFEMDFGOTYwMDgyMTlEMyAvKiBQbHVn aW5JbmZvU3RvcmUuY3BwICovOyB9OwogCQkxQUYzMDYwQTExMUI1OTlFMDBGOTY0MzYgLyogV2Vi S2l0Mi5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA4REMyRUY1QjA0ODZBNjk0MDA5OEIyMTYgLyogV2ViS2l0Mi5mcmFtZXdvcmsgKi87 IH07CiAJCTVEQUQ3MjlDMTE2RkY4NjIwMEVFNTM5NiAvKiBBcHBLaXQuZnJhbWV3b3JrIGluIEZy YW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMDg2N0Q2QTVGRTg0 MDMwN0MwMkFBQzA3IC8qIEFwcEtpdC5mcmFtZXdvcmsgKi87IH07CiAJCThEQzJFRjUzMDQ4NkE2 OTQwMDk4QjIxNiAvKiBJbmZvUGxpc3Quc3RyaW5ncyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMDg5QzE2NjZGRTg0MTE1OEMwMkFBQzA3IC8qIEluZm9Q bGlzdC5zdHJpbmdzICovOyB9OwpAQCAtMjUwLDYgKzI1Miw4IEBACiAJCTFBQTFDQzVDMTAwRkEx QTEwMDc4REVCQyAvKiBRdWFydHpDb3JlLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1lID0gUXVh cnR6Q29yZS5mcmFtZXdvcms7IHBhdGggPSAvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9RdWFy dHpDb3JlLmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+IjsgfTsKIAkJMUFBMUNE MDYxMDBGQTFCQTAwNzhERUJDIC8qIENhcmJvbi5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgbmFtZSA9 IENhcmJvbi5mcmFtZXdvcms7IHBhdGggPSAvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9DYXJi b24uZnJhbWV3b3JrOyBzb3VyY2VUcmVlID0gIjxhYnNvbHV0ZT4iOyB9OwogCQkxQUFERTZGRTEw RDg1NUZDMDBEM0Q2M0QgLyogQXBwbGljYXRpb25TZXJ2aWNlcy5mcmFtZXdvcmsgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29y azsgbmFtZSA9IEFwcGxpY2F0aW9uU2VydmljZXMuZnJhbWV3b3JrOyBwYXRoID0gU3lzdGVtL0xp YnJhcnkvRnJhbWV3b3Jrcy9BcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yazsgc291cmNlVHJl ZSA9IFNES1JPT1Q7IH07CisJCTFBRUZDQzEwMTFEMDFGOTYwMDgyMTlEMyAvKiBQbHVnaW5JbmZv U3RvcmUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUGx1Z2luSW5mb1N0b3Jl Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBRUZDQzExMTFEMDFGOTYwMDgyMTlE MyAvKiBQbHVnaW5JbmZvU3RvcmUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gUGx1Z2luSW5mb1N0b3JlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MzJEQkNGNUUwMzcwQURFRTAwQzkxNzgzIC8qIFdlYktpdDJQcmVmaXguaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViS2l0MlByZWZpeC5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk1REFENzI5NDExNkZGNzBCMDBFRTUzOTYgLyogV2ViUHJvY2Vzcy54Y2NvbmZp ZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBXZWJQcm9jZXNzLnhjY29uZmlnOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1REFENzNGMTExNkZGOTBDMDBFRTUzOTYgLyog QmFzZVRhcmdldC54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBCYXNl VGFyZ2V0LnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTY1LDYgKzU2 OSwyMyBAQAogCQkJcGF0aCA9IENvcmVJUEM7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwog CQl9OworCQkxQUVGQ0MwNTExRDAxRjM0MDA4MjE5RDMgLyogUGx1Z2lucyAqLyA9IHsKKwkJCWlz YSA9IFBCWEdyb3VwOworCQkJY2hpbGRyZW4gPSAoCisJCQkJMUFFRkNDMEQxMUQwMUY0MTAwODIx OUQzIC8qIG1hYyAqLywKKwkJCQkxQUVGQ0MxMDExRDAxRjk2MDA4MjE5RDMgLyogUGx1Z2luSW5m b1N0b3JlLmggKi8sCisJCQkJMUFFRkNDMTExMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9T dG9yZS5jcHAgKi8sCisJCQkpOworCQkJcGF0aCA9IFBsdWdpbnM7CisJCQlzb3VyY2VUcmVlID0g Ijxncm91cD4iOworCQl9OworCQkxQUVGQ0MwRDExRDAxRjQxMDA4MjE5RDMgLyogbWFjICovID0g eworCQkJaXNhID0gUEJYR3JvdXA7CisJCQljaGlsZHJlbiA9ICgKKwkJCSk7CisJCQlwYXRoID0g bWFjOworCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKKwkJfTsKIAkJMzJDODhERkYwMzcxQzI0 MjAwQzkxNzgzIC8qIE90aGVyIFNvdXJjZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJ CWNoaWxkcmVuID0gKApAQCAtNjMwLDYgKzY1MSw3IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQlC QzAzMkRDNDEwRjQzODdDMDA1OEMxNUEgLyogQVBJICovLAogCQkJCUJDMTExQjE4MTEyRjVGQjQw MDMzN0JBQiAvKiBMYXVuY2hlciAqLywKKwkJCQkxQUVGQ0MwNTExRDAxRjM0MDA4MjE5RDMgLyog UGx1Z2lucyAqLywKIAkJCQlCQ0NGMDg1QzExM0YzQjc1MDBDNjUwQzUgLyogbWFjICovLAogCQkJ CUJDMjY1MjEyMTE4MjYwODEwMDI0M0UxMiAvKiBEcmF3aW5nQXJlYVByb3h5LmNwcCAqLywKIAkJ CQlCQzI2NTIxMzExODI2MDgxMDAyNDNFMTIgLyogRHJhd2luZ0FyZWFQcm94eS5oICovLApAQCAt MTAwMSw2ICsxMDIzLDcgQEAKIAkJCQlCQzIwNTI4MTExQzk0Mjg0MDA4RjMzNzUgLyogV0tCdW5k bGVQYWdlLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzIwNTI4ODExQzk0M0E1MDA4RjMzNzUgLyog SW5qZWN0ZWRCdW5kbGVQYWdlQ2xpZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTNFNzM2MTEx Q0MyNjU5MDA3QkQ1MzkgLyogV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmggaW4gSGVhZGVycyAqLywK KwkJCQkxQUVGQ0MxMjExRDAxRjk2MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmggaW4gSGVh ZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0g MDsKIAkJfTsKQEAgLTExNjAsNiArMTE4Myw3IEBACiAJCQkJQkMyMDUyODIxMUM5NDI4NDAwOEYz Mzc1IC8qIFdLQnVuZGxlUGFnZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCQzIwNTI4OTExQzk0 M0E1MDA4RjMzNzUgLyogSW5qZWN0ZWRCdW5kbGVQYWdlQ2xpZW50LmNwcCBpbiBTb3VyY2VzICov LAogCQkJCTFBM0U3MzYyMTFDQzI2NTkwMDdCRDUzOSAvKiBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMu Y3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMUFFRkNDMTMxMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdp bkluZm9TdG9yZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95 bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuY3Bw CShyZXZpc2lvbiA2MTU3OCkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw4IEBA CiAKICNpZiBVU0UoUExBVEZPUk1fU1RSQVRFR0lFUykKIAorI2luY2x1ZGUgIlBsdWdpbkluZm9T dG9yZS5oIgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7 CkBAIC01MCwxMiArNTIsMTQgQEAgUGx1Z2luU3RyYXRlZ3kqIFdlYlBsYXRmb3JtU3RyYXRlZ2ll czo6YwogCiB2b2lkIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6cmVmcmVzaFBsdWdpbnMoKQogewot ICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGNhbGwg b3V0IHRvIHRoZSBVSSBwcm9jZXNzLgorICAgIFBsdWdpbkluZm9TdG9yZTo6c2hhcmVkKCkucmVm cmVzaCgpOwogfQogCiB2b2lkIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Z2V0UGx1Z2luSW5mbyhW ZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mIHBsdWdpbnMpCiB7Ci0gICAgLy8gRklYTUU6IElt cGxlbWVudC4KKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgY2FsbCBvdXQgdG8gdGhlIFVJIHBy b2Nlc3MuCisgICAgUGx1Z2luSW5mb1N0b3JlOjpzaGFyZWQoKS5nZXRQbHVnaW5zKHBsdWdpbnMp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA2MTU3OCkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw2ICs4Nyw3IEBAIFdlYlBh Z2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCAKIAogICAgIG1fcGFnZS0+c2V0dGlu Z3MoKS0+c2V0SmF2YVNjcmlwdEVuYWJsZWQoc3RvcmUuamF2YVNjcmlwdEVuYWJsZWQpOwogICAg IG1fcGFnZS0+c2V0dGluZ3MoKS0+c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHN0b3JlLmxv YWRzSW1hZ2VzQXV0b21hdGljYWxseSk7CisgICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRQbHVn aW5zRW5hYmxlZChzdG9yZS5wbHVnaW5zRW5hYmxlZCk7CiAgICAgbV9wYWdlLT5zZXR0aW5ncygp LT5zZXRNaW5pbXVtRm9udFNpemUoc3RvcmUubWluaW11bUZvbnRTaXplKTsKICAgICBtX3BhZ2Ut PnNldHRpbmdzKCktPnNldE1pbmltdW1Mb2dpY2FsRm9udFNpemUoc3RvcmUubWluaW11bUxvZ2lj YWxGb250U2l6ZSk7CiAgICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXREZWZhdWx0Rm9udFNpemUo c3RvcmUuZGVmYXVsdEZvbnRTaXplKTsK