146145 2015-06-19 01:16:48 -0700 [GTK] Do not use legacy data store options in WebKit2 GTK+ API 2015-06-25 00:16:55 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 146149 1 cgarcia webkit-unassigned andersca gustavo mcatanzaro svillar oldest_to_newest 1103209 0 cgarcia 2015-06-19 01:16:48 -0700 Use a custom WebsiteDataStore in WebKitWebContext, configured with the context options, and passed to every page created. This is in preparation for exposing WebsiteDataStore in the public API. 1103212 1 255184 cgarcia 2015-06-19 01:23:33 -0700 Created attachment 255184 Patch 1104609 2 cgarcia 2015-06-25 00:16:55 -0700 Committed r185949: <http://trac.webkit.org/changeset/185949> 255184 2015-06-19 01:23:33 -0700 2015-06-24 08:37:04 -0700 Patch wk2-no-legacy.diff text/plain 20019 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZmYwNmUwLi4wZmRjODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDgg QEAKKzIwMTUtMDYtMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvIG5vdCB1c2UgbGVnYWN5IGRhdGEgc3RvcmUgb3B0aW9ucyBp biBXZWJLaXQyIEdUSysgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDYxNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVc2UgYSBjdXN0b20gV2Vic2l0ZURhdGFTdG9yZSBpbiBXZWJLaXRXZWJDb250 ZXh0LCBjb25maWd1cmVkIHdpdGgKKyAgICAgICAgdGhlIGNvbnRleHQgb3B0aW9ucywgYW5kIHBh c3NlZCB0byBldmVyeSBwYWdlIGNyZWF0ZWQuIFRoaXMgaXMgaW4KKyAgICAgICAgcHJlcGFyYXRp b24gZm9yIGV4cG9zaW5nIFdlYnNpdGVEYXRhU3RvcmUgaW4gdGhlIHB1YmxpYyBBUEkuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogQWRkIEFQSVdlYnNpdGVEYXRhU3RvcmUuY3BwIHRv IGNvbXBpbGF0aW9uLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9y ZS5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvQVBJV2Vic2l0ZURhdGFTdG9yZUd0 ay5jcHA6CisgICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVs dE5ldHdvcmtDYWNoZURpcmVjdG9yeSk6CisgICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6 OmRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSk6CisgICAgICAgIChBUEk6OldlYnNp dGVEYXRhU3RvcmU6OmRlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOgorICAgICAgICAoQVBJ OjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSk6Cisg ICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVj dG9yeSk6CisgICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmNhY2hlRGlyZWN0b3J5Rmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6 d2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOgorICAgICAgICAo QVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbik6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAg ICh3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbkZvcldlYlByb2Nlc3NQb29sQ29uZmlndXJh dGlvbik6CisgICAgICAgIEhlbHBlciBmdW5jdGlvbiB0byBjcmVhdGUgdGhlIFdlYnNpdGVEYXRh U3RvcmUgY29uZmlndXJhdGlvbiB3aXRoCisgICAgICAgIHRoZSBXZWJQcm9jZXNzUG9vbCBjb25m aWd1cmF0aW9uIG9wdGlvbnMuCisgICAgICAgICh3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQp OiBEbyBub3QgY3JlYXRlIGEKKyAgICAgICAgV2ViUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIHdp dGggbGVnYWN5IG9wdGlvbnMgYW5kIGNyZWF0ZSBhIFdlYnNpdGVEYXRhU3RvcmUuCisgICAgICAg ICh3ZWJraXRXZWJDb250ZXh0Q3JlYXRlUGFnZUZvcldlYlZpZXcpOiBTZXQgdGhlIFdlYnNpdGVE YXRhU3RvcmUKKyAgICAgICAgYW5kIHNlc3Npb24gSUQgaW4gd2ViIHBhZ2UgY29uZmlndXJhdGlv bi4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6Cisg ICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZSk6IENyZWF0ZSBhIFdlYlBhZ2VDb25maWd1 cmF0aW9uIGZvciB0aGUKKyAgICAgICAgZ2l2ZW4gb3B0aW9ucyBhbmQgcGFzcyBpdCB0byB3ZWJr aXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNy ZWF0ZVdlYlBhZ2UpOiBJdCByZWNlaXZlcyBub3cgYQorICAgICAgICBXZWJQYWdlQ29uZmlndXJh dGlvbiwgaW5zdGVhZCBvZiBjcmVhdGluZyBpdCBiYXNlZCBvbiB0aGUgZ2l2ZW4gcGFyYW1ldGVy cy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29sR3RrLmNwcDogVXNlIFdl YnNpdGVEYXRhU3RvcmUgZGVmYXVsdCBjb25maWd1cmF0aW9uLgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUG9vbDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVj dG9yeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURl ZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRM b2NhbFN0b3JhZ2VEaXJlY3RvcnkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6 bGVnYWN5UGxhdGZvcm1EZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSk6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHROZXR3b3JrQ2Fj aGVEaXJlY3RvcnkpOgorCiAyMDE1LTA2LTE4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBEbyBub3Qgc3RvcmUgY29uZmlndXJhdGlvbiBwYXJh bWV0ZXJzIHR3aWNlIGluIFdlYlByb2Nlc3NQb29sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCmlu ZGV4IGEzYmI2ZDcuLjY5MWM2NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt R1RLLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC05Niw2 ICs5Niw3IEBAIGxpc3QoQVBQRU5EIFdlYktpdDJfU09VUkNFUwogICAgIFVJUHJvY2Vzcy9BUEkv Qy9zb3VwL1dLQ29va2llTWFuYWdlclNvdXAuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9DL3NvdXAv V0tTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlci5jcHAKIAorICAgIFVJUHJvY2Vzcy9B UEkvZ3RrL0FQSVdlYnNpdGVEYXRhU3RvcmVHdGsuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9ndGsv UGFnZUNsaWVudEltcGwuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwu aAogICAgIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLmNwcApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0 b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9y ZS5jcHAKaW5kZXggOGM1YjhkNi4uNDk4YjdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC02Niw3ICs2Niw3IEBA IGJvb2wgV2Vic2l0ZURhdGFTdG9yZTo6aXNQZXJzaXN0ZW50KCkKICAgICByZXR1cm4gbV93ZWJz aXRlRGF0YVN0b3JlLT5pc1BlcnNpc3RlbnQoKTsKIH0KIAotI2lmICFQTEFURk9STShDT0NPQSkK KyNpZiAhUExBVEZPUk0oQ09DT0EpICYmICFQTEFURk9STShHVEspCiBXZWJLaXQ6OldlYnNpdGVE YXRhU3RvcmU6OkNvbmZpZ3VyYXRpb24gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9y ZUNvbmZpZ3VyYXRpb24oKQogewogICAgIC8vIEZJWE1FOiBGaWxsIGV2ZXJ5dGhpbmcgaW4uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9BUElXZWJzaXRlRGF0 YVN0b3JlR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL0FQSVdlYnNp dGVEYXRhU3RvcmVHdGsuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM2 YjA3ODcKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9BUElXZWJzaXRlRGF0YVN0b3JlR3RrLmNwcApAQCAtMCwwICsxLDkyIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE1IElnYWxpYSBTLkwuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn JworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMK KyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAq IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcu aCIKKyNpbmNsdWRlICJBUElXZWJzaXRlRGF0YVN0b3JlLmgiCisKKyNpbmNsdWRlIDxXZWJDb3Jl L0ZpbGVTeXN0ZW0uaD4KKworbmFtZXNwYWNlIEFQSSB7CisKK1N0cmluZyBXZWJzaXRlRGF0YVN0 b3JlOjpkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpCit7CisgICAgcmV0dXJuIGNh Y2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKCJ3ZWJraXRndGsiIEdfRElSX1NF UEFSQVRPUl9TICJhcHBsaWNhdGlvbnMiKTsKK30KKworU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6 OmRlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoKQoreworI2lmIEVOQUJMRShORVRXT1JLX0NB Q0hFKQorICAgIHN0YXRpYyBjb25zdCBjaGFyIG5ldHdvcmtDYWNoZVN1YmRpcmVjdG9yeVtdID0g IldlYktpdENhY2hlIjsKKyNlbHNlCisgICAgc3RhdGljIGNvbnN0IGNoYXIgbmV0d29ya0NhY2hl U3ViZGlyZWN0b3J5W10gPSAid2Via2l0IjsKKyNlbmRpZgorICAgIHJldHVybiBjYWNoZURpcmVj dG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdDb21w b25lbnQoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhnX2dldF9wcmduYW1lKCkpLCBuZXR3b3Jr Q2FjaGVTdWJkaXJlY3RvcnkpKTsKK30KKworU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1 bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpCit7CisgICAgcmV0dXJuIHdlYnNpdGVEYXRh RGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKCJ3ZWJraXRndGsiIEdfRElSX1NFUEFS QVRPUl9TICJkYXRhYmFzZXMiIEdfRElSX1NFUEFSQVRPUl9TICJpbmRleGVkZGIiKTsKK30KKwor U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKQor eworICAgIHJldHVybiB3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlv bigid2Via2l0Z3RrIiBHX0RJUl9TRVBBUkFUT1JfUyAibG9jYWxzdG9yYWdlIik7Cit9CisKK1N0 cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgp Cit7CisgICAgcmV0dXJuIHdlYnNpdGVEYXRhRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0 aW9uKCJ3ZWJraXRndGsiIEdfRElSX1NFUEFSQVRPUl9TICJtZWRpYWtleXMiKTsKK30KKworU3Ry aW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpCit7 CisgICAgcmV0dXJuIHdlYnNpdGVEYXRhRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u KCJ3ZWJraXRndGsiIEdfRElSX1NFUEFSQVRPUl9TICJkYXRhYmFzZXMiKTsKK30KKworU3RyaW5n IFdlYnNpdGVEYXRhU3RvcmU6OmNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u KGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5TmFtZSkKK3sKKyAgICByZXR1cm4gV2ViQ29yZTo6cGF0 aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZ19nZXRfdXNl cl9jYWNoZV9kaXIoKSksIGRpcmVjdG9yeU5hbWUpOworfQorCitTdHJpbmcgV2Vic2l0ZURhdGFT dG9yZTo6d2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3Qg U3RyaW5nJiBkaXJlY3RvcnlOYW1lKQoreworICAgIHJldHVybiBXZWJDb3JlOjpwYXRoQnlBcHBl bmRpbmdDb21wb25lbnQoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhnX2dldF91c2VyX2RhdGFf ZGlyKCkpLCBkaXJlY3RvcnlOYW1lKTsKK30KKworV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpD b25maWd1cmF0aW9uIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0 aW9uKCkKK3sKKyAgICBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OkNvbmZpZ3VyYXRpb24gY29u ZmlndXJhdGlvbjsKKworICAgIGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZURpcmVjdG9y eSA9IGRlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCk7CisgICAgY29uZmlndXJhdGlv bi5uZXR3b3JrQ2FjaGVEaXJlY3RvcnkgPSBkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCk7 CisKKyAgICBjb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gZGVmYXVsdFdl YlNRTERhdGFiYXNlRGlyZWN0b3J5KCk7CisgICAgY29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VE aXJlY3RvcnkgPSBkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CisgICAgY29uZmlndXJh dGlvbi5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5ID0gZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VE aXJlY3RvcnkoKTsKKworICAgIHJldHVybiBjb25maWd1cmF0aW9uOworfQorCit9IC8vIG5hbWVz cGFjZSBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViQ29udGV4dC5jcHAKaW5kZXggZGU2ODgzNi4uZWU5NGQ3MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAg LTE3Myw2ICsxNzMsOCBAQCBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKICNpZiBF TkFCTEUoTk9USUZJQ0FUSU9OUykKICAgICBSZWZQdHI8V2ViS2l0Tm90aWZpY2F0aW9uUHJvdmlk ZXI+IG5vdGlmaWNhdGlvblByb3ZpZGVyOwogI2VuZGlmCisgICAgUmVmUHRyPFdlYnNpdGVEYXRh U3RvcmU+IHdlYnNpdGVEYXRhU3RvcmU7CisKICAgICBDU3RyaW5nIGZhdmljb25EYXRhYmFzZURp cmVjdG9yeTsKICAgICBXZWJLaXRUTFNFcnJvcnNQb2xpY3kgdGxzRXJyb3JzUG9saWN5OwogCkBA IC0yNjAsMjYgKzI2MiwzOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0U2V0UHJvcGVy dHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSUQsIGNvbnN0IEdWYQogICAgIH0KIH0KIAor c3RhdGljIGlubGluZSBXZWJzaXRlRGF0YVN0b3JlOjpDb25maWd1cmF0aW9uIHdlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uRm9yV2ViUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKGNvbnN0IEFQ STo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uJiBwcm9jZXNzUG9vbGNvbmZpZ3VyYXJpb24pCit7 CisgICAgV2Vic2l0ZURhdGFTdG9yZTo6Q29uZmlndXJhdGlvbiBjb25maWd1cmF0aW9uOworICAg IGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSA9IHByb2Nlc3NQb29sY29u ZmlndXJhcmlvbi5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCk7CisgICAgY29uZmlndXJhdGlv bi5uZXR3b3JrQ2FjaGVEaXJlY3RvcnkgPSBwcm9jZXNzUG9vbGNvbmZpZ3VyYXJpb24uZGlza0Nh Y2hlRGlyZWN0b3J5KCk7CisgICAgY29uZmlndXJhdGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9y eSA9IHByb2Nlc3NQb29sY29uZmlndXJhcmlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpOwor ICAgIGNvbmZpZ3VyYXRpb24ubG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xjb25m aWd1cmFyaW9uLmxvY2FsU3RvcmFnZURpcmVjdG9yeSgpOworICAgIGNvbmZpZ3VyYXRpb24ubWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeSA9IHByb2Nlc3NQb29sY29uZmlndXJhcmlvbi5tZWRpYUtl eXNTdG9yYWdlRGlyZWN0b3J5KCk7CisgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb247Cit9CisKIHN0 YXRpYyB2b2lkIHdlYmtpdFdlYkNvbnRleHRDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCiB7 CiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl9jb250ZXh0X3BhcmVudF9jbGFzcyktPmNv bnN0cnVjdGVkKG9iamVjdCk7CiAKICAgICBHVW5pcXVlUHRyPGNoYXI+IGJ1bmRsZUZpbGVuYW1l KGdfYnVpbGRfZmlsZW5hbWUoaW5qZWN0ZWRCdW5kbGVEaXJlY3RvcnkoKSwgImxpYndlYmtpdDJn dGtpbmplY3RlZGJ1bmRsZS5zbyIsIG51bGxwdHIpKTsKIAotICAgIGF1dG8gY29uZmlndXJhdGlv biA9IEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpjcmVhdGVXaXRoTGVnYWN5T3B0aW9u cygpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldEluamVjdGVkQnVuZGxlUGF0aChXZWJDb3JlOjpm aWxlbmFtZVRvU3RyaW5nKGJ1bmRsZUZpbGVuYW1lLmdldCgpKSk7CisgICAgQVBJOjpQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbjsKKyAgICBjb25maWd1cmF0aW9uLnNldElu amVjdGVkQnVuZGxlUGF0aChXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGJ1bmRsZUZpbGVuYW1l LmdldCgpKSk7CisgICAgY29uZmlndXJhdGlvbi5zZXRQcm9jZXNzTW9kZWwoUHJvY2Vzc01vZGVs U2hhcmVkU2Vjb25kYXJ5UHJvY2Vzcyk7CisgICAgY29uZmlndXJhdGlvbi5zZXRVc2VOZXR3b3Jr UHJvY2VzcyhmYWxzZSk7CiAKICAgICBXZWJLaXRXZWJDb250ZXh0KiB3ZWJDb250ZXh0ID0gV0VC S0lUX1dFQl9DT05URVhUKG9iamVjdCk7CiAgICAgV2ViS2l0V2ViQ29udGV4dFByaXZhdGUqIHBy aXYgPSB3ZWJDb250ZXh0LT5wcml2OwogICAgIGlmICghcHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0 b3J5LmlzTnVsbCgpKQotICAgICAgICBjb25maWd1cmF0aW9uLT5zZXRMb2NhbFN0b3JhZ2VEaXJl Y3RvcnkoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhwcml2LT5sb2NhbFN0b3JhZ2VEaXJlY3Rv cnkuZGF0YSgpKSk7CisgICAgICAgIGNvbmZpZ3VyYXRpb24uc2V0TG9jYWxTdG9yYWdlRGlyZWN0 b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5 LmRhdGEoKSkpOwogICAgIGlmICghcHJpdi0+aW5kZXhlZERCRGlyZWN0b3J5LmlzTnVsbCgpKQot ICAgICAgICBjb25maWd1cmF0aW9uLT5zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeShXZWJD b3JlOjpmaWxlbmFtZVRvU3RyaW5nKHByaXYtPmluZGV4ZWREQkRpcmVjdG9yeS5kYXRhKCkpKTsK KyAgICAgICAgY29uZmlndXJhdGlvbi5zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeShXZWJD b3JlOjpmaWxlbmFtZVRvU3RyaW5nKHByaXYtPmluZGV4ZWREQkRpcmVjdG9yeS5kYXRhKCkpKTsK IAotICAgIHByaXYtPmNvbnRleHQgPSBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlKGNvbmZpZ3VyYXRp b24uZ2V0KCkpOworICAgIHByaXYtPmNvbnRleHQgPSBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlKGNv bmZpZ3VyYXRpb24pOwogCisgICAgcHJpdi0+d2Vic2l0ZURhdGFTdG9yZSA9IFdlYnNpdGVEYXRh U3RvcmU6OmNyZWF0ZSh3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbkZvcldlYlByb2Nlc3NQ b29sQ29uZmlndXJhdGlvbihjb25maWd1cmF0aW9uKSk7CiAgICAgcHJpdi0+cmVxdWVzdE1hbmFn ZXIgPSBwcml2LT5jb250ZXh0LT5zdXBwbGVtZW50PFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVl c3RNYW5hZ2VyPigpOwotICAgIHByaXYtPmNvbnRleHQtPnNldENhY2hlTW9kZWwoQ2FjaGVNb2Rl bFByaW1hcnlXZWJCcm93c2VyKTsKIAogICAgIHByaXYtPnRsc0Vycm9yc1BvbGljeSA9IFdFQktJ VF9UTFNfRVJST1JTX1BPTElDWV9GQUlMOwogICAgIHByaXYtPmNvbnRleHQtPnNldElnbm9yZVRM U0Vycm9ycyhmYWxzZSk7CkBAIC0xMjE1LDEwICsxMjMwLDEzIEBAIHZvaWQgd2Via2l0V2ViQ29u dGV4dERpZEZpbmlzaExvYWRpbmdDdXN0b21Qcm90b2NvbChXZWJLaXRXZWJDb250ZXh0KiBjb250 ZXh0LCB1CiB2b2lkIHdlYmtpdFdlYkNvbnRleHRDcmVhdGVQYWdlRm9yV2ViVmlldyhXZWJLaXRX ZWJDb250ZXh0KiBjb250ZXh0LCBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRVc2VyQ29u dGVudE1hbmFnZXIqIHVzZXJDb250ZW50TWFuYWdlciwgV2ViS2l0V2ViVmlldyogcmVsYXRlZFZp ZXcpCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9W SUVXX0JBU0Uod2ViVmlldyk7Ci0gICAgV2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSA9IHJlbGF0 ZWRWaWV3ID8gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHJl bGF0ZWRWaWV3KSkgOiBudWxscHRyOwotICAgIFdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcyA9 IHdlYmtpdFNldHRpbmdzR2V0UHJlZmVyZW5jZXMod2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5n cyh3ZWJWaWV3KSk7Ci0gICAgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkqIHVzZXJDb250 ZW50Q29udHJvbGxlclByb3h5ID0gdXNlckNvbnRlbnRNYW5hZ2VyID8gd2Via2l0VXNlckNvbnRl bnRNYW5hZ2VyR2V0VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkodXNlckNvbnRlbnRNYW5hZ2Vy KSA6IG51bGxwdHI7Ci0gICAgd2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKHdlYlZpZXdC YXNlLCBjb250ZXh0LT5wcml2LT5jb250ZXh0LmdldCgpLCBwcmVmZXJlbmNlcywgbnVsbHB0ciwg dXNlckNvbnRlbnRDb250cm9sbGVyUHJveHksIHJlbGF0ZWRQYWdlKTsKKyAgICBXZWJQYWdlQ29u ZmlndXJhdGlvbiB3ZWJQYWdlQ29uZmlndXJhdGlvbjsKKyAgICB3ZWJQYWdlQ29uZmlndXJhdGlv bi5wcmVmZXJlbmNlcyA9IHdlYmtpdFNldHRpbmdzR2V0UHJlZmVyZW5jZXMod2Via2l0X3dlYl92 aWV3X2dldF9zZXR0aW5ncyh3ZWJWaWV3KSk7CisgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucmVs YXRlZFBhZ2UgPSByZWxhdGVkVmlldyA/IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRf V0VCX1ZJRVdfQkFTRShyZWxhdGVkVmlldykpIDogbnVsbHB0cjsKKyAgICB3ZWJQYWdlQ29uZmln dXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXIgPSB1c2VyQ29udGVudE1hbmFnZXIgPyB3ZWJr aXRVc2VyQ29udGVudE1hbmFnZXJHZXRVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSh1c2VyQ29u dGVudE1hbmFnZXIpIDogbnVsbHB0cjsKKyAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi53ZWJzaXRl RGF0YVN0b3JlID0gY29udGV4dC0+cHJpdi0+d2Vic2l0ZURhdGFTdG9yZS5nZXQoKTsKKyAgICB3 ZWJQYWdlQ29uZmlndXJhdGlvbi5zZXNzaW9uSUQgPSBjb250ZXh0LT5wcml2LT53ZWJzaXRlRGF0 YVN0b3JlLT5zZXNzaW9uSUQoKTsKKyAgICB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2Uo d2ViVmlld0Jhc2UsIGNvbnRleHQtPnByaXYtPmNvbnRleHQuZ2V0KCksIFdURjo6bW92ZSh3ZWJQ YWdlQ29uZmlndXJhdGlvbikpOwogCiAgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2Vi Vmlld0Jhc2VHZXRQYWdlKHdlYlZpZXdCYXNlKTsKICAgICBjb250ZXh0LT5wcml2LT53ZWJWaWV3 cy5zZXQocGFnZS0+cGFnZUlEKCksIHdlYlZpZXcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4IDEwOTY5NWQu Ljk0ZTBlMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTExMjAsOCArMTEyMCwxMyBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRfd2ViX3ZpZXdfYmFzZV9jbGFzc19pbml0KFdlYktpdFdlYlZpZXdCYXNlQ2xhc3Mq IHdlYmtpdFdlYlZpZQogCiBXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2VDcmVh dGUoV2ViUHJvY2Vzc1Bvb2wqIGNvbnRleHQsIFdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcywg V2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KiB1 c2VyQ29udGVudENvbnRyb2xsZXIsIFdlYlBhZ2VQcm94eSogcmVsYXRlZFBhZ2UpCiB7Ci0gICAg V2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVXX0JB U0UoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9WSUVXX0JBU0UsIE5VTEwpKTsKLSAgICB3 ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2Uod2Via2l0V2ViVmlld0Jhc2UsIGNvbnRleHQs IHByZWZlcmVuY2VzLCBwYWdlR3JvdXAsIHVzZXJDb250ZW50Q29udHJvbGxlciwgcmVsYXRlZFBh Z2UpOworICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSA9IFdFQktJVF9X RUJfVklFV19CQVNFKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFV19CQVNFLCBudWxs cHRyKSk7CisgICAgV2ViUGFnZUNvbmZpZ3VyYXRpb24gd2ViUGFnZUNvbmZpZ3VyYXRpb247Cisg ICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMgPSBwcmVmZXJlbmNlczsKKyAgICB3 ZWJQYWdlQ29uZmlndXJhdGlvbi5wYWdlR3JvdXAgPSBwYWdlR3JvdXA7CisgICAgd2ViUGFnZUNv bmZpZ3VyYXRpb24ucmVsYXRlZFBhZ2UgPSByZWxhdGVkUGFnZTsKKyAgICB3ZWJQYWdlQ29uZmln dXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXIgPSB1c2VyQ29udGVudENvbnRyb2xsZXI7Cisg ICAgd2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKHdlYmtpdFdlYlZpZXdCYXNlLCBjb250 ZXh0LCBXVEY6Om1vdmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICByZXR1cm4gd2Via2l0 V2ViVmlld0Jhc2U7CiB9CiAKQEAgLTExNDIsNyArMTE0Nyw3IEBAIHN0YXRpYyB2b2lkIGRldmlj ZVNjYWxlRmFjdG9yQ2hhbmdlZChXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2Up CiB9CiAjZW5kaWYgLy8gSEFWRShHVEtfU0NBTEVfRkFDVE9SKQogCi12b2lkIHdlYmtpdFdlYlZp ZXdCYXNlQ3JlYXRlV2ViUGFnZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2Us IFdlYlByb2Nlc3NQb29sKiBjb250ZXh0LCBXZWJQcmVmZXJlbmNlcyogcHJlZmVyZW5jZXMsIFdl YlBhZ2VHcm91cCogcGFnZUdyb3VwLCBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSogdXNl ckNvbnRlbnRDb250cm9sbGVyLCBXZWJQYWdlUHJveHkqIHJlbGF0ZWRQYWdlKQordm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZp ZXdCYXNlLCBXZWJQcm9jZXNzUG9vbCogY29udGV4dCwgV2ViUGFnZUNvbmZpZ3VyYXRpb24mJiBj b25maWd1cmF0aW9uKQogewogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdl YmtpdFdlYlZpZXdCYXNlLT5wcml2OwogCkBAIC0xMTUzLDEyICsxMTU4LDcgQEAgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZp ZXdCYXNlLCBXZWJQcm8KICAgICAgICAgcHJlZmVyZW5jZXMtPnNldEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdFbmFibGVkKGZhbHNlKTsKICNlbmRpZgogCi0gICAgV2ViUGFnZUNvbmZpZ3VyYXRpb24g d2ViUGFnZUNvbmZpZ3VyYXRpb247Ci0gICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5j ZXMgPSBwcmVmZXJlbmNlczsKLSAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi5wYWdlR3JvdXAgPSBw YWdlR3JvdXA7Ci0gICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucmVsYXRlZFBhZ2UgPSByZWxhdGVk UGFnZTsKLSAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXIgPSB1 c2VyQ29udGVudENvbnRyb2xsZXI7Ci0gICAgcHJpdi0+cGFnZVByb3h5ID0gY29udGV4dC0+Y3Jl YXRlV2ViUGFnZSgqcHJpdi0+cGFnZUNsaWVudCwgV1RGOjptb3ZlKHdlYlBhZ2VDb25maWd1cmF0 aW9uKSk7CisgICAgcHJpdi0+cGFnZVByb3h5ID0gY29udGV4dC0+Y3JlYXRlV2ViUGFnZSgqcHJp di0+cGFnZUNsaWVudCwgV1RGOjptb3ZlKGNvbmZpZ3VyYXRpb24pKTsKICAgICBwcml2LT5wYWdl UHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CiAKICAgICBwcml2LT5pbnB1dE1ldGhvZEZpbHRl ci5zZXRQYWdlKHByaXYtPnBhZ2VQcm94eS5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oCmlu ZGV4IGE1ZjM1NTUuLjA2YTViY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oCkBAIC0zOSw3ICsz OSw3IEBACiBXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2VDcmVhdGUoV2ViS2l0 OjpXZWJQcm9jZXNzUG9vbCosIFdlYktpdDo6V2ViUHJlZmVyZW5jZXMqLCBXZWJLaXQ6OldlYlBh Z2VHcm91cCosIFdlYktpdDo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkqLCBXZWJLaXQ6 OldlYlBhZ2VQcm94eSopOwogR3RrSU1Db250ZXh0KiB3ZWJraXRXZWJWaWV3QmFzZUdldElNQ29u dGV4dChXZWJLaXRXZWJWaWV3QmFzZSopOwogV2ViS2l0OjpXZWJQYWdlUHJveHkqIHdlYmtpdFdl YlZpZXdCYXNlR2V0UGFnZShXZWJLaXRXZWJWaWV3QmFzZSopOwotdm9pZCB3ZWJraXRXZWJWaWV3 QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqLCBXZWJLaXQ6OldlYlByb2Nlc3NQ b29sKiwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlcyosIFdlYktpdDo6V2ViUGFnZUdyb3VwKiwgV2Vi S2l0OjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSosIFdlYktpdDo6V2ViUGFnZVByb3h5 Kik7Cit2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZShXZWJLaXRXZWJWaWV3QmFz ZSosIFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2wqLCBXZWJLaXQ6OldlYlBhZ2VDb25maWd1cmF0aW9u JiYpOwogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldFRvb2x0aXBUZXh0KFdlYktpdFdlYlZpZXdC YXNlKiwgY29uc3QgY2hhciopOwogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldFRvb2x0aXBBcmVh KFdlYktpdFdlYlZpZXdCYXNlKiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwogdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUZvcndhcmROZXh0S2V5RXZlbnQoV2ViS2l0V2ViVmlld0Jhc2UqKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc1Bvb2xHdGsu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAK aW5kZXggNGI2N2FiYi4uMTRhOGM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAKQEAgLTg2LDggKzg2LDcgQEAgc3RhdGljIHZv aWQgaW5pdEluc3BlY3RvclNlcnZlcigpCiAKIFdURjo6U3RyaW5nIFdlYlByb2Nlc3NQb29sOjps ZWdhY3lQbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKIHsKLSAgICBH VW5pcXVlUHRyPGdjaGFyPiBjYWNoZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3Vz ZXJfY2FjaGVfZGlyKCksICJ3ZWJraXRndGsiLCAiYXBwbGljYXRpb25zIiwgbnVsbHB0cikpOwot ICAgIHJldHVybiBXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGNhY2hlRGlyZWN0b3J5LmdldCgp KTsKKyAgICByZXR1cm4gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QXBwbGljYXRpb25D YWNoZURpcmVjdG9yeSgpOwogfQogCiB2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMp CkBAIC0xMTgsMTQgKzExNywxMiBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUludmFs aWRhdGVDb250ZXh0KCkKIAogU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURl ZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpCiB7Ci0gICAgR1VuaXF1ZVB0cjxnY2hhcj4g ZGF0YWJhc2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2RhdGFfZGlyKCks ICJ3ZWJraXRndGsiLCAiZGF0YWJhc2VzIiwgbnVsbHB0cikpOwotICAgIHJldHVybiBXZWJDb3Jl OjpmaWxlbmFtZVRvU3RyaW5nKGRhdGFiYXNlRGlyZWN0b3J5LmdldCgpKTsKKyAgICByZXR1cm4g QVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKTsK IH0KIAogU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRJbmRleGVk REJEYXRhYmFzZURpcmVjdG9yeSgpCiB7Ci0gICAgR1VuaXF1ZVB0cjxnY2hhcj4gaW5kZXhlZERC RGF0YWJhc2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2RhdGFfZGlyKCks ICJ3ZWJraXRndGsiLCAiZGF0YWJhc2VzIiwgImluZGV4ZWRkYiIsIG51bGxwdHIpKTsKLSAgICBy ZXR1cm4gV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhpbmRleGVkREJEYXRhYmFzZURpcmVjdG9y eS5nZXQoKSk7CisgICAgcmV0dXJuIEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdEluZGV4 ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCk7CiB9CiAKIFN0cmluZyBXZWJQcm9jZXNzUG9vbDo6cGxh dGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aCgpIGNvbnN0CkBAIC0xMzYsMjUgKzEzMywxNyBA QCBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtRGVmYXVsdEljb25EYXRhYmFzZVBhdGgo KSBjb25zdAogCiBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdExv Y2FsU3RvcmFnZURpcmVjdG9yeSgpCiB7Ci0gICAgR1VuaXF1ZVB0cjxnY2hhcj4gc3RvcmFnZURp cmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3VzZXJfZGF0YV9kaXIoKSwgIndlYmtpdGd0 ayIsICJsb2NhbHN0b3JhZ2UiLCBudWxscHRyKSk7Ci0gICAgcmV0dXJuIFdlYkNvcmU6OmZpbGVu YW1lVG9TdHJpbmcoc3RvcmFnZURpcmVjdG9yeS5nZXQoKSk7CisgICAgcmV0dXJuIEFQSTo6V2Vi c2l0ZURhdGFTdG9yZTo6ZGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpOwogfQogCiBTdHJp bmcgV2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VE aXJlY3RvcnkoKQogewotICAgIEdVbmlxdWVQdHI8Z2NoYXI+IG1lZGlhS2V5c1N0b3JhZ2VEaXJl Y3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2RhdGFfZGlyKCksICJ3ZWJraXRndGsi LCAibWVkaWFrZXlzIiwgbnVsbHB0cikpOwotICAgIHJldHVybiBXZWJDb3JlOjpmaWxlbmFtZVRv U3RyaW5nKG1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkuZ2V0KCkpOworICAgIHJldHVybiBBUEk6 OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCk7CiB9 CiAKIFN0cmluZyBXZWJQcm9jZXNzUG9vbDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0TmV0d29ya0Nh Y2hlRGlyZWN0b3J5KCkKIHsKLSNpZiBFTkFCTEUoTkVUV09SS19DQUNIRSkKLSAgICBzdGF0aWMg Y29uc3QgY2hhciBuZXR3b3JrQ2FjaGVTdWJkaXJlY3RvcnlbXSA9ICJXZWJLaXRDYWNoZSI7Ci0j ZWxzZQotICAgIHN0YXRpYyBjb25zdCBjaGFyIG5ldHdvcmtDYWNoZVN1YmRpcmVjdG9yeVtdID0g IndlYmtpdCI7Ci0jZW5kaWYKLSAgICBHVW5pcXVlUHRyPGNoYXI+IGRpc2tDYWNoZURpcmVjdG9y eShnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3VzZXJfY2FjaGVfZGlyKCksIGdfZ2V0X3ByZ25hbWUo KSwgbmV0d29ya0NhY2hlU3ViZGlyZWN0b3J5LCBudWxscHRyKSk7Ci0gICAgcmV0dXJuIFdlYkNv cmU6OmZpbGVuYW1lVG9TdHJpbmcoZGlza0NhY2hlRGlyZWN0b3J5LmdldCgpKTsKKyAgICByZXR1 cm4gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCk7 CiB9CiAKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldElnbm9yZVRMU0Vycm9ycyhib29sIGlnbm9y ZVRMU0Vycm9ycykK