140505 2015-01-15 11:59:12 -0800 Give WebsiteDataStore a StorageManager 2015-01-15 12:21:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 andersca andersca oldest_to_newest 1061605 0 andersca 2015-01-15 11:59:12 -0800 Give WebsiteDataStore a StorageManager 1061606 1 244707 andersca 2015-01-15 12:04:39 -0800 Created attachment 244707 Patch 244707 2015-01-15 12:04:39 -0800 2015-01-15 12:21:28 -0800 Patch bug-140505-20150115120445.patch text/plain 13279 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWI5MmZlZjE5ZWQzYzA4 ODUyNzNmYjE1ZDMxMzI5ZmMzOGZmMTNiOC4uNzFiODAwMzBiYzc2NmJhZjIzNzZjNmFmOTcwNjFl YmM0MjAxNDc4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDcwIEBACiAyMDE1LTAxLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgR2l2ZSBXZWJzaXRl RGF0YVN0b3JlIGEgU3RvcmFnZU1hbmFnZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MDUwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBwcm9jZXNzIHBvb2wgc3RvcmFnZSBtYW5hZ2VyIGlzIHN0 aWxsIGFyb3VuZCBidXQgaXMgb25seSB1c2VkIGZvciBjbGVhcmluZyBkYXRhLiBJdCB3aWxsIGJl IHJlbW92ZWQKKyAgICAgICAgY29tcGxldGVseSBpbiBhbiB1cGNvbWluZyBjb21taXQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbToK KyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3Vy YXRpb24pOgorICAgICAgICBTZXQgdXAgdGhlIGxvY2FsIHN0b3JhZ2UgZGlyZWN0b3J5LgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sLm1tOgorICAgICAgICAo d2Vic2l0ZURhdGFEaXJlY3RvcnlVUkwpOgorICAgICAgICBFeHBvcnQgdGhpcyBzbyBpdCBjYW4g YmUgY2FsbGVkIGZyb20gQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLgorCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Y3JlYXRlTmV3UGFnZSk6CisgICAgICAgIENhbGwgV2Vic2l0ZURhdGFTdG9yZTo6Y2xvbmVTZXNz aW9uRGF0YSBpbnN0ZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OndlYnNpdGVEYXRhU3RvcmUpOgorICAgICAg ICBBZGQgZ2V0dGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoK KyAgICAgICAgKFdlYktpdDo6d2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOgorICAgICAg ICBVcGRhdGUgdGhpcyB0byB0YWtlIGEgV2ViUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIG9iamVj dCBhbmQgYXNzaWduIHRoZSBsb2NhbCBzdG9yYWdlIGRpcmVjdG9yeS4KKworICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUG9vbDo6V2ViUHJvY2Vzc1Bvb2wpOgorICAgICAgICBQYXNzIHRoZSBj b25maWd1cmF0aW9uIHRvIHdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLgorCisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwcm9jZXNzV2lsbE9wZW5Db25uZWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NXaWxsQ2xvc2VDb25uZWN0aW9u KToKKyAgICAgICAgUmVtb3ZlIHN0b3JhZ2UgbWFuYWdlciBjYWxscy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6V2Vic2l0ZURhdGFTdG9yZSk6CisgICAgICAgIFdoZW4gY3Jl YXRpbmcgYSBwZXJzaXN0ZW50IGRhdGEgc3RvcmUsIGFsc28gY3JlYXRlIGEgc3RvcmFnZSBtYW5h Z2VyLgorCisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmNsb25lU2Vzc2lvbkRh dGEpOgorICAgICAgICBDbG9uZSB0aGUgc2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFjZS4KKworICAg ICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjp3ZWJQYWdlV2FzQWRkZWQpOgorICAgICAg ICBDcmVhdGUgYSBzZXNzaW9uIHN0b3JhZ2UgbmFtZXNwYWNlIGZvciB0aGlzIHBhZ2UuCisKKyAg ICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6d2ViUGFnZVdhc1JlbW92ZWQpOgorICAg ICAgICBEZXN0cm95IHRoZSBzZXNzaW9uIHN0b3JhZ2UgbmFtZXNwYWNlLgorCisgICAgICAgIChX ZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OndlYlByb2Nlc3NXaWxsT3BlbkNvbm5lY3Rpb24pOgor ICAgICAgICBUZWxsIHRoZSBzdG9yYWdlIG1hbmFnZXIgYWJvdXQgdGhlIG5ldyBwcm9jZXNzIGNv bm5lY3Rpb24uCisKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6d2ViUGFnZVdp bGxPcGVuQ29ubmVjdGlvbik6CisgICAgICAgIFNldCB0aGUgYWxsb3dlZCBjb25uZWN0aW9uLgor CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OndlYlBhZ2VEaWRDbG9zZUNvbm5l Y3Rpb24pOgorICAgICAgICBDbGVhciB0aGUgYWxsb3dlZCBjb25uZWN0aW9uLgorCisgICAgICAg IChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OndlYlByb2Nlc3NEaWRDbG9zZUNvbm5lY3Rpb24p OgorICAgICAgICBUZWxsIHRoZSBzdG9yYWdlIG1hbmFnZXIgdGhhdCB0aGUgcHJvY2VzcyBjb25u ZWN0aW9uIGhhcyBiZWVuIGNsb3NlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmg6CisgICAgICAgIEFkZCBuZXcgbWVtYmVycy4KKworMjAxNS0w MS0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE1v cmUgd29yayBvbiB0aGUgbGlmZXRpbWUgb2JzZXJ2ZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDUwMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29h Lm1tCmluZGV4IDIwZmIyNzAyZDU1NDE3YmQ0OTBlMzgzZTc5NzVkMjZkYmU4ZTRkOGYuLjJmNjU1 ZjA5NzQzMDM2ZWMzMDZmZjUyODFkMGU3ZjMxOWJkZDAyOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9y ZUNvY29hLm1tCkBAIC0yNiw2ICsyNiw5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk ZSAiQVBJV2Vic2l0ZURhdGFTdG9yZS5oIgogCisvLyBGSVhNRTogVGhpcyBmdW5jdGlvbiBpcyBj dXJyZW50bHkgaW4gV0tQcm9jZXNzUG9vbC4gSXQgc2hvdWxkIGJlIG1vdmVkIHRvIHRoaXMgZmls ZSBpbnN0ZWFkLgorTlNVUkwgKndlYnNpdGVEYXRhRGlyZWN0b3J5VVJMKE5TU3RyaW5nICpkaXJl Y3RvcnlOYW1lKTsKKwogbmFtZXNwYWNlIEFQSSB7CiAKIFdlYktpdDo6V2Vic2l0ZURhdGFTdG9y ZTo6Q29uZmlndXJhdGlvbiBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmln dXJhdGlvbigpCkBAIC0zMyw2ICszNiw4IEBAIFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Q29u ZmlndXJhdGlvbiBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlnCiAgICAg Ly8gRklYTUU6IEZpbGwgZXZlcnl0aGluZyBpbi4KICAgICBXZWJLaXQ6OldlYnNpdGVEYXRhU3Rv cmU6OkNvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbjsKIAorICAgIGNvbmZpZ3VyYXRpb24ubG9j YWxTdG9yYWdlRGlyZWN0b3J5ID0gd2Vic2l0ZURhdGFEaXJlY3RvcnlVUkwoQCJMb2NhbFN0b3Jh Z2UiKS5hYnNvbHV0ZVVSTC5wYXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbjsKKwogICAgIHJl dHVybiBjb25maWd1cmF0aW9uOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0KaW5kZXggOGE4NTY1ZmIwMGVhZTJmYTBmNmQ3 NmUyN2Y2MGRkZTBmMWVhNjc3Zi4uODljYjEyOGQ2ZDYzOTEwN2E3OTgyZWFhNzhkOTc3NGMwYjM5 MTAxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1By b2Nlc3NQb29sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQ cm9jZXNzUG9vbC5tbQpAQCAtNDksNiArNDksOSBAQAogI2ltcG9ydCAiV0tHZW9sb2NhdGlvblBy b3ZpZGVySU9TLmgiCiAjZW5kaWYKIAorLy8gRklYTUU6IE1vdmUgdGhpcyBmcm9tIFdLUHJvY2Vz c1Bvb2wgdG8gQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLgorTlNVUkwgKndlYnNpdGVEYXRhRGly ZWN0b3J5VVJMKE5TU3RyaW5nICpkaXJlY3RvcnlOYW1lKTsKKwogQGltcGxlbWVudGF0aW9uIFdL UHJvY2Vzc1Bvb2wgewogICAgIFdlYktpdDo6V2Vha09iakNQdHI8aWQgPF9XS0Rvd25sb2FkRGVs ZWdhdGU+PiBfZG93bmxvYWREZWxlZ2F0ZTsKIApAQCAtMTEzLDcgKzExNiw3IEBACiAgICAgcmV0 dXJuIFt1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vic2l0ZURhdGEiIGlzRGly ZWN0b3J5OllFU107CiB9CiAKLXN0YXRpYyBOU1VSTCAqd2Vic2l0ZURhdGFEaXJlY3RvcnlVUkwo TlNTdHJpbmcgKmRpcmVjdG9yeU5hbWUpCitOU1VSTCAqd2Vic2l0ZURhdGFEaXJlY3RvcnlVUkwo TlNTdHJpbmcgKmRpcmVjdG9yeU5hbWUpCiB7CiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBv bmNlVG9rZW47CiAgICAgc3RhdGljIE5TVVJMICp3ZWJzaXRlRGF0YVVSTDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYWUwM2YwMmIxNWM2ZDQyZDc4MDZj NjM0YjBlNTQ2NTQyNDk0MzMzMy4uNjhiYmQwNjk1NGJkYzI2MjAwMDJiN2Y0OTZkMjlhNDBkYjAy OGFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTMw OTMsNyArMzA5Myw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjcmVhdGVOZXdQYWdlKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzCiAKICAgICBuZXdQYWdlSUQg PSBuZXdQYWdlLT5wYWdlSUQoKTsKICAgICBuZXdQYWdlUGFyYW1ldGVycyA9IG5ld1BhZ2UtPmNy ZWF0aW9uUGFyYW1ldGVycygpOwotICAgIHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnN0b3JhZ2VN YW5hZ2VyKCkuY2xvbmVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShtX3BhZ2VJRCwgbmV3UGFnZS0+ cGFnZUlEKCkpOworCisgICAgV2Vic2l0ZURhdGFTdG9yZTo6Y2xvbmVTZXNzaW9uRGF0YSgqdGhp cywgKm5ld1BhZ2UpOwogfQogICAgIAogdm9pZCBXZWJQYWdlUHJveHk6OnNob3dQYWdlKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAwNTAyZmFlOTE2M2Y1Y2U3 NTA1MjYxMzlhMzdmMjUxZTI1YTJhOTQ0Li4zMTkwZTYyYWZlZTlhODYwMGJkMjQ4YmRmNjcxMDg4 NGY4YjI4NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0y NzAsNiArMjcwLDggQEAgcHVibGljOgogCiAgICAgV2ViTmF2aWdhdGlvblN0YXRlJiBuYXZpZ2F0 aW9uU3RhdGUoKSB7IHJldHVybiAqbV9uYXZpZ2F0aW9uU3RhdGUuZ2V0KCk7IH0KIAorICAgIFdl YnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUoKSB7IHJldHVybiBtX3dlYnNpdGVEYXRh U3RvcmU7IH0KKwogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eSogc2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpIGNvbnN0IHsg cmV0dXJuIG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5nZXQoKTsgfQogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBhOGM1NTUzY2I3 MzEwYzdkZDgwZWMyZGI2MDZiMzQ4MWJjNGZkMGI0Li5iMTQwODJkYzFjMWU0MzAwNzFjZGI1ZDll MjM0YmE5NjNiOGYxZDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHAKQEAgLTE1MCwxMSArMTUwLDEyIEBAIGNvbnN0IFZlY3RvcjxXZWJQcm9jZXNzUG9v bCo+JiBXZWJQcm9jZXNzUG9vbDo6YWxsUHJvY2Vzc1Bvb2xzKCkKICAgICByZXR1cm4gcHJvY2Vz c1Bvb2xzKCk7CiB9CiAKLXN0YXRpYyBXZWJzaXRlRGF0YVN0b3JlOjpDb25maWd1cmF0aW9uIHdl YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uKCkKK3N0YXRpYyBXZWJzaXRlRGF0YVN0b3JlOjpD b25maWd1cmF0aW9uIHdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uKGNvbnN0IFdlYlByb2Nl c3NQb29sQ29uZmlndXJhdGlvbiYgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKQogewogICAgIFdl YnNpdGVEYXRhU3RvcmU6OkNvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbjsKIAotICAgIC8vIEZJ WE1FOiBGaWxsIGluIHRoZSBjb25maWd1cmF0aW9uLgorICAgIGNvbmZpZ3VyYXRpb24ubG9jYWxT dG9yYWdlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmxvY2FsU3RvcmFnZURp cmVjdG9yeTsKKwogICAgIHJldHVybiBjb25maWd1cmF0aW9uOwogfQogCkBAIC0xNzUsNyArMTc2 LDcgQEAgV2ViUHJvY2Vzc1Bvb2w6OldlYlByb2Nlc3NQb29sKFdlYlByb2Nlc3NQb29sQ29uZmln dXJhdGlvbiBjb25maWd1cmF0aW9uKQogICAgICwgbV9jYWNoZU1vZGVsKENhY2hlTW9kZWxEb2N1 bWVudFZpZXdlcikKICAgICAsIG1fbWVtb3J5U2FtcGxlckVuYWJsZWQoZmFsc2UpCiAgICAgLCBt X21lbW9yeVNhbXBsZXJJbnRlcnZhbCgxNDAwLjApCi0gICAgLCBtX3dlYnNpdGVEYXRhU3RvcmUo V2Vic2l0ZURhdGFTdG9yZTo6Y3JlYXRlKHdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uKCkp KQorICAgICwgbV93ZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmU6OmNyZWF0ZSh3ZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbihjb25maWd1cmF0aW9uKSkpCiAgICAgLCBtX3N0b3Jh Z2VNYW5hZ2VyKFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGUoY29uZmlndXJhdGlvbi5sb2NhbFN0b3Jh Z2VEaXJlY3RvcnkpKQogI2lmIFVTRShTT1VQKQogICAgICwgbV9pbml0aWFsSFRUUENvb2tpZUFj Y2VwdFBvbGljeShIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21h aW4pCkBAIC03NzcsMTIgKzc3OCwxMCBAQCBib29sIFdlYlByb2Nlc3NQb29sOjpzaG91bGRUZXJt aW5hdGUoV2ViUHJvY2Vzc1Byb3h5KiBwcm9jZXNzKQogCiB2b2lkIFdlYlByb2Nlc3NQb29sOjpw cm9jZXNzV2lsbE9wZW5Db25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSogcHJvY2VzcykKIHsKLSAg ICBtX3N0b3JhZ2VNYW5hZ2VyLT5wcm9jZXNzV2lsbE9wZW5Db25uZWN0aW9uKHByb2Nlc3MpOwog fQogCiB2b2lkIFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzV2lsbENsb3NlQ29ubmVjdGlvbihXZWJQ cm9jZXNzUHJveHkqIHByb2Nlc3MpCiB7Ci0gICAgbV9zdG9yYWdlTWFuYWdlci0+cHJvY2Vzc1dp bGxDbG9zZUNvbm5lY3Rpb24ocHJvY2Vzcyk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmFw cGxpY2F0aW9uV2lsbFRlcm1pbmF0ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggMjRhMjIyMGJi MWUxMDNhN2E4ZWYwZGVkODc1ZWUxMTUxNTU5OGQyYy4uYTI4YzNjMTc4NDlkNjk2ZGVmYWQyOGM3 MmU5NzE2NjZhZTRlMGFlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMjYsNiArMjYsNyBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYnNpdGVEYXRhU3RvcmUuaCIKIAorI2lu Y2x1ZGUgIlN0b3JhZ2VNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNp bmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogCkBAIC01Niw5ICs1NywxMCBAQCBSZWZQdHI8V2Vic2l0 ZURhdGFTdG9yZT4gV2Vic2l0ZURhdGFTdG9yZTo6Y3JlYXRlKENvbmZpZ3VyYXRpb24gY29uZmln dXJhdGlvbikKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYnNpdGVEYXRhU3RvcmUoV1RGOjpt b3ZlKGNvbmZpZ3VyYXRpb24pKSk7CiB9CiAKLVdlYnNpdGVEYXRhU3RvcmU6OldlYnNpdGVEYXRh U3RvcmUoQ29uZmlndXJhdGlvbikKK1dlYnNpdGVEYXRhU3RvcmU6OldlYnNpdGVEYXRhU3RvcmUo Q29uZmlndXJhdGlvbiBjb25maWd1cmF0aW9uKQogICAgIDogbV9pZGVudGlmaWVyKGdlbmVyYXRl SWRlbnRpZmllcigpKQogICAgICwgbV9zZXNzaW9uSUQoV2ViQ29yZTo6U2Vzc2lvbklEOjpkZWZh dWx0U2Vzc2lvbklEKCkpCisgICAgLCBtX3N0b3JhZ2VNYW5hZ2VyKFN0b3JhZ2VNYW5hZ2VyOjpj cmVhdGUoV1RGOjptb3ZlKGNvbmZpZ3VyYXRpb24ubG9jYWxTdG9yYWdlRGlyZWN0b3J5KSkpCiB7 CiB9CiAKQEAgLTcyLDYgKzc0LDIxIEBAIFdlYnNpdGVEYXRhU3RvcmU6On5XZWJzaXRlRGF0YVN0 b3JlKCkKIHsKIH0KIAordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpjbG9uZVNlc3Npb25EYXRhKFdl YlBhZ2VQcm94eSYgc291cmNlUGFnZSwgV2ViUGFnZVByb3h5JiBuZXdQYWdlKQoreworICAgIGF1 dG8mIHNvdXJjZURhdGFTdG9yZSA9IHNvdXJjZVBhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpOworICAg IGF1dG8mIG5ld0RhdGFTdG9yZSA9IG5ld1BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpOworCisgICAg Ly8gRklYTUU6IEhhbmRsZSB0aGlzLgorICAgIGlmICgmc291cmNlRGF0YVN0b3JlICE9ICZuZXdE YXRhU3RvcmUpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghc291cmNlRGF0YVN0b3JlLm1f c3RvcmFnZU1hbmFnZXIpCisgICAgICAgIHJldHVybjsKKworICAgIHNvdXJjZURhdGFTdG9yZS5t X3N0b3JhZ2VNYW5hZ2VyLT5jbG9uZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHNvdXJjZVBhZ2Uu cGFnZUlEKCksIG5ld1BhZ2UucGFnZUlEKCkpOworfQorCiBlbnVtIGNsYXNzIFByb2Nlc3NBY2Nl c3NUeXBlIHsKICAgICBOb25lLAogICAgIE9ubHlJZkxhdW5jaGVkLApAQCAtMTYwLDQgKzE3Nyw0 MCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vic2l0ZURhdGFUeXBlcyBk YXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZQogICAgIGNhbGxiYWNrQWdncmVnYXRvci0+Y2Fs bElmTmVlZGVkKCk7CiB9CiAKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6d2ViUGFnZVdhc0FkZGVk KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQoreworICAgIGlmIChtX3N0b3JhZ2VNYW5hZ2Vy KQorICAgICAgICBtX3N0b3JhZ2VNYW5hZ2VyLT5jcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZSh3ZWJQYWdlUHJveHkucGFnZUlEKCksIHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+Ojpt YXgoKSk7Cit9CisKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6d2ViUGFnZVdhc1JlbW92ZWQoV2Vi UGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCit7CisgICAgaWYgKG1fc3RvcmFnZU1hbmFnZXIpCisg ICAgICAgIG1fc3RvcmFnZU1hbmFnZXItPmRlc3Ryb3lTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh3 ZWJQYWdlUHJveHkucGFnZUlEKCkpOworfQorCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OndlYlBy b2Nlc3NXaWxsT3BlbkNvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5JiB3ZWJQcm9jZXNzUHJveHks IElQQzo6Q29ubmVjdGlvbiYpCit7CisgICAgaWYgKG1fc3RvcmFnZU1hbmFnZXIpCisgICAgICAg IG1fc3RvcmFnZU1hbmFnZXItPnByb2Nlc3NXaWxsT3BlbkNvbm5lY3Rpb24oJndlYlByb2Nlc3NQ cm94eSk7Cit9CisKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6d2ViUGFnZVdpbGxPcGVuQ29ubmVj dGlvbihXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0 aW9uKQoreworICAgIGlmIChtX3N0b3JhZ2VNYW5hZ2VyKQorICAgICAgICBtX3N0b3JhZ2VNYW5h Z2VyLT5zZXRBbGxvd2VkU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VDb25uZWN0aW9uKHdlYlBhZ2VQ cm94eS5wYWdlSUQoKSwgJmNvbm5lY3Rpb24pOworfQorCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6 OndlYlBhZ2VEaWRDbG9zZUNvbm5lY3Rpb24oV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIElQ Qzo6Q29ubmVjdGlvbiYpCit7CisgICAgaWYgKG1fc3RvcmFnZU1hbmFnZXIpCisgICAgICAgIG1f c3RvcmFnZU1hbmFnZXItPnNldEFsbG93ZWRTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUNvbm5lY3Rp b24od2ViUGFnZVByb3h5LnBhZ2VJRCgpLCBudWxscHRyKTsKK30KKwordm9pZCBXZWJzaXRlRGF0 YVN0b3JlOjp3ZWJQcm9jZXNzRGlkQ2xvc2VDb25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYgd2Vi UHJvY2Vzc1Byb3h5LCBJUEM6OkNvbm5lY3Rpb24mKQoreworICAgIGlmIChtX3N0b3JhZ2VNYW5h Z2VyKQorICAgICAgICBtX3N0b3JhZ2VNYW5hZ2VyLT5wcm9jZXNzV2lsbENsb3NlQ29ubmVjdGlv bigmd2ViUHJvY2Vzc1Byb3h5KTsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKaW5kZXggYzkzMWRiMzUw YmUzOTFlYTM4Mjc3Y2UxMjgyOWFmNTViN2JkNTRjNi4uOWYwOTExYzc3YWFmNzY2N2Q0ZmRmZmMz MmRhNGFhMGQzNTVkMDA0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCkBAIC0zMywxNCArMzMsMTcgQEAKICNp bmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5j bHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgU3RvcmFnZU1hbmFnZXI7CiBjbGFzcyBXZWJQYWdl UHJveHk7CiAKIGNsYXNzIFdlYnNpdGVEYXRhU3RvcmUgOiBwdWJsaWMgUmVmQ291bnRlZDxXZWJz aXRlRGF0YVN0b3JlPiwgcHVibGljIFdlYlByb2Nlc3NMaWZldGltZU9ic2VydmVyIHsKIHB1Ymxp YzoKICAgICBzdHJ1Y3QgQ29uZmlndXJhdGlvbiB7CisgICAgICAgIFN0cmluZyBsb2NhbFN0b3Jh Z2VEaXJlY3Rvcnk7CiAgICAgfTsKICAgICBzdGF0aWMgUmVmUHRyPFdlYnNpdGVEYXRhU3RvcmU+ IGNyZWF0ZU5vblBlcnNpc3RlbnQoKTsKICAgICBzdGF0aWMgUmVmUHRyPFdlYnNpdGVEYXRhU3Rv cmU+IGNyZWF0ZShDb25maWd1cmF0aW9uKTsKQEAgLTUxLDE0ICs1NCwyNiBAQCBwdWJsaWM6CiAg ICAgYm9vbCBpc05vblBlcnNpc3RlbnQoKSBjb25zdCB7IHJldHVybiBtX3Nlc3Npb25JRC5pc0Vw aGVtZXJhbCgpOyB9CiAgICAgV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0IHsg cmV0dXJuIG1fc2Vzc2lvbklEOyB9CiAKKyAgICBzdGF0aWMgdm9pZCBjbG9uZVNlc3Npb25EYXRh KFdlYlBhZ2VQcm94eSYgc291cmNlUGFnZSwgV2ViUGFnZVByb3h5JiBuZXdQYWdlKTsKKwogICAg IHZvaWQgcmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzLCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Ns b2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2luY2UsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29t cGxldGlvbkhhbmRsZXIpOwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdlYnNpdGVEYXRhU3Rv cmUoV2ViQ29yZTo6U2Vzc2lvbklEKTsKICAgICBleHBsaWNpdCBXZWJzaXRlRGF0YVN0b3JlKENv bmZpZ3VyYXRpb24pOwogCi0gICAgdWludDY0X3QgbV9pZGVudGlmaWVyOwotICAgIFdlYkNvcmU6 OlNlc3Npb25JRCBtX3Nlc3Npb25JRDsKKyAgICAvLyBXZWJQcm9jZXNzTGlmZXRpbWVPYnNlcnZl ci4KKyAgICB2aXJ0dWFsIHZvaWQgd2ViUGFnZVdhc0FkZGVkKFdlYlBhZ2VQcm94eSYpIG92ZXJy aWRlOworICAgIHZpcnR1YWwgdm9pZCB3ZWJQYWdlV2FzUmVtb3ZlZChXZWJQYWdlUHJveHkmKSBv dmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgd2ViUHJvY2Vzc1dpbGxPcGVuQ29ubmVjdGlvbihX ZWJQcm9jZXNzUHJveHkmLCBJUEM6OkNvbm5lY3Rpb24mKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFs IHZvaWQgd2ViUGFnZVdpbGxPcGVuQ29ubmVjdGlvbihXZWJQYWdlUHJveHkmLCBJUEM6OkNvbm5l Y3Rpb24mKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgd2ViUGFnZURpZENsb3NlQ29ubmVj dGlvbihXZWJQYWdlUHJveHkmLCBJUEM6OkNvbm5lY3Rpb24mKSBvdmVycmlkZTsKKyAgICB2aXJ0 dWFsIHZvaWQgd2ViUHJvY2Vzc0RpZENsb3NlQ29ubmVjdGlvbihXZWJQcm9jZXNzUHJveHkmLCBJ UEM6OkNvbm5lY3Rpb24mKSBvdmVycmlkZTsKKworICAgIGNvbnN0IHVpbnQ2NF90IG1faWRlbnRp ZmllcjsKKyAgICBjb25zdCBXZWJDb3JlOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CisKKyAgICBj b25zdCBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IG1fc3RvcmFnZU1hbmFnZXI7CiB9OwogCiB9Cg==