134497 2014-07-01 10:41:23 -0700 Add a BackForwardListItemState struct and put the snapshot UUID there 2014-07-01 10:46:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1019661 0 andersca 2014-07-01 10:41:23 -0700 Add a BackForwardListItemState struct and put the snapshot UUID there 1019662 1 234171 andersca 2014-07-01 10:41:50 -0700 Created attachment 234171 Patch 1019664 2 andersca 2014-07-01 10:46:50 -0700 Committed r170649: <http://trac.webkit.org/changeset/170649> 234171 2014-07-01 10:41:50 -0700 2014-07-01 10:43:37 -0700 Patch bug-134497-20140701104131.patch text/plain 13461 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZThkNDNjMjcyN2NlYzBi MGE4NTdiY2U0OWNhOTY2MDZkODljZTY2OC4uMzU0NmZjZGE3ZmFhOTUzNWY0MGFkYTdlODVkZGJh YjFkZmZkNDZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTA3LTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgQmFja0Zv cndhcmRMaXN0SXRlbVN0YXRlIHN0cnVjdCBhbmQgcHV0IHRoZSBzbmFwc2hvdCBVVUlEIHRoZXJl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ0OTcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJl ZC9TZXNzaW9uU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlU3RhdGU6OmVuY29kZSk6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VTdGF0ZTo6ZGVjb2RlKToKKyAgICAgICAgKFdlYktpdDo6 QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpCYWNr Rm9yd2FyZExpc3RJdGVtU3RhdGU6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1Nlc3Npb25T dGF0ZS5oOgorICAgICAgICAqIFNoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6Y3JlYXRlKToKKyAgICAgICAg KFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbSk6 CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmJhY2tGb3J3YXJkRGF0 YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OnNldEJhY2tGb3J3 YXJkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmVuY29k ZSk6CisgICAgICAgICogU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaDoKKyAgICAgICAg KFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6c2V0UGFnZVN0YXRlKToKKyAgICAgICAg KFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6c2V0T3JpZ2luYWxVUkwpOgorICAgICAg ICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpvcmlnaW5hbFVSTCk6CisgICAgICAg IChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OnNldFVSTCk6CisgICAgICAgIChXZWJL aXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OnVybCk6CisgICAgICAgIChXZWJLaXQ6OldlYkJh Y2tGb3J3YXJkTGlzdEl0ZW06OnNldFRpdGxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0Zv cndhcmRMaXN0SXRlbTo6dGl0bGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExp c3RJdGVtOjpzZXRTbmFwc2hvdFVVSUQpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjpzbmFwc2hvdFVVSUQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJCYWNrRm9y d2FyZExpc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3Q6OnJlc3Rv cmVGcm9tU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmFkZEJhY2tGb3J3YXJkSXRlbSk6Cisg ICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAg ICAgICAoV2ViS2l0OjpkZWNvZGVTZXNzaW9uSGlzdG9yeUVudHJpZXMpOgorCiAyMDE0LTA2LTMw ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIGFu IHN0ZDo6ZnVuY3Rpb24gZm9yIGZpbHRlcmluZyBzZXNzaW9uIHN0YXRlIGRhdGEKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuY3BwIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5jcHAKaW5kZXggNDQ5ZDNmMDgyODg3OTYzYTEyZmYxZjU1 MGY1YWNhOGVjZDdhZTE2ZC4uMmIwZjBjNDYxMTUyNzY3MzBkYTcwM2ZhY2E2ZTQ1NTM5YzUwNzQ1 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5jcHAKQEAgLTE2OCwxNyArMTY4 LDMzIEBAIGJvb2wgRnJhbWVTdGF0ZTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNv ZGVyLCBGcmFtZVN0YXRlJiByZXN1bHQpCiAKIHZvaWQgUGFnZVN0YXRlOjplbmNvZGUoSVBDOjpB cmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAgZW5jb2RlciA8PCB0aXRsZTsK ICAgICBlbmNvZGVyIDw8IG1haW5GcmFtZVN0YXRlOwogfQogCiBib29sIFBhZ2VTdGF0ZTo6ZGVj b2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBQYWdlU3RhdGUmIHJlc3VsdCkKIHsK KyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC50aXRsZSkpCisgICAgICAgIHJldHVybiBm YWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tYWluRnJhbWVTdGF0ZSkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0cnVlOwogfQogCit2b2lkIEJhY2tG b3J3YXJkTGlzdEl0ZW1TdGF0ZTo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVy KSBjb25zdAoreworICAgIGVuY29kZXIgPDwgcGFnZVN0YXRlOworfQorCitib29sIEJhY2tGb3J3 YXJkTGlzdEl0ZW1TdGF0ZTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBC YWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmIHJlc3VsdCkKK3sKKyAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5wYWdlU3RhdGUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKwogdm9pZCBCYWNrRm9yd2FyZExpc3RTdGF0ZTo6ZW5jb2RlKElQQzo6QXJn dW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewogICAgIGVuY29kZXIgPDwgaXRlbXM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmgKaW5kZXggMzExNTEzMjg0ZTY4ZjU2M2YyZGEy NTRjYmI5MzcyMTBlM2MyMGNiMC4uZDIwNTYyMGRmOGUzNTUxMjUxZWIzMjE3NzhiN2IxMDBiY2Fm OWZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuaApAQCAtMTEzLDExICsxMTMs MjAgQEAgc3RydWN0IFBhZ2VTdGF0ZSB7CiAgICAgRnJhbWVTdGF0ZSBtYWluRnJhbWVTdGF0ZTsK IH07CiAKK3N0cnVjdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgeworICAgIHZvaWQgZW5jb2Rl KElQQzo6QXJndW1lbnRFbmNvZGVyJikgY29uc3Q7CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKElQ Qzo6QXJndW1lbnREZWNvZGVyJiwgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJik7CisKKyAgICBQ YWdlU3RhdGUgcGFnZVN0YXRlOworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBob2xkIHRoZSBz bmFwc2hvdCBpdHNlbGYsIG5vdCBpdHMgVVVJRC4KKyAgICBTdHJpbmcgc25hcHNob3RVVUlEOwor fTsKKwogc3RydWN0IEJhY2tGb3J3YXJkTGlzdFN0YXRlIHsKICAgICB2b2lkIGVuY29kZShJUEM6 OkFyZ3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBib29sIGRlY29kZShJUEM6OkFy Z3VtZW50RGVjb2RlciYsIEJhY2tGb3J3YXJkTGlzdFN0YXRlJik7CiAKLSAgICBWZWN0b3I8UGFn ZVN0YXRlPiBpdGVtczsKKyAgICBWZWN0b3I8QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlPiBpdGVt czsKICAgICBPcHRpb25hbDx1aW50MzJfdD4gY3VycmVudEluZGV4OwogfTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCmluZGV4IDk0Yzg4 NWE2YmY0MzA3ZWNhMTUwNWYxMWFmYzNjNTU2OWMxMzBmODguLmFmZWM0M2QwODA5MzkyYzM4ZWEy Yjg5ZWQxZTRlZThkOWYwODAwYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJCYWNrRm9yd2FyZExpc3RJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi QmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKQEAgLTM1LDIzICszNSwyMyBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKIAogc3RhdGljIHVpbnQ2NF90IGhpZ2hlc3RVc2VkSXRlbUlEID0gMDsKIAotUGFzc1Jl ZlB0cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPiBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpjcmVh dGUodWludDY0X3QgaXRlbUlELCBQYWdlU3RhdGUgcGFnZVN0YXRlKQorUGFzc1JlZlB0cjxXZWJC YWNrRm9yd2FyZExpc3RJdGVtPiBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpjcmVhdGUodWludDY0 X3QgaXRlbUlELCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgYmFja0ZvcndhcmRMaXN0SXRlbVN0 YXRlKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViQmFja0ZvcndhcmRMaXN0SXRlbShp dGVtSUQsIHN0ZDo6bW92ZShwYWdlU3RhdGUpKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBX ZWJCYWNrRm9yd2FyZExpc3RJdGVtKGl0ZW1JRCwgc3RkOjptb3ZlKGJhY2tGb3J3YXJkTGlzdEl0 ZW1TdGF0ZSkpKTsKIH0KIAotV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6V2ViQmFja0ZvcndhcmRM aXN0SXRlbSh1aW50NjRfdCBpdGVtSUQsIFBhZ2VTdGF0ZSBwYWdlU3RhdGUpCitXZWJCYWNrRm9y d2FyZExpc3RJdGVtOjpXZWJCYWNrRm9yd2FyZExpc3RJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgQmFj a0ZvcndhcmRMaXN0SXRlbVN0YXRlIGJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSkKICAgICA6IG1f aXRlbUlEKGl0ZW1JRCkKLSAgICAsIG1fcGFnZVN0YXRlKHN0ZDo6bW92ZShwYWdlU3RhdGUpKQor ICAgICwgbV9pdGVtU3RhdGUoc3RkOjptb3ZlKGJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSkpCiB7 CiB9CiAKIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oY29u c3QgU3RyaW5nJiBvcmlnaW5hbFVSTCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYg dGl0bGUsIGNvbnN0IHVpbnQ4X3QqIGJhY2tGb3J3YXJkRGF0YSwgc2l6ZV90IGJhY2tGb3J3YXJk RGF0YVNpemUsIHVpbnQ2NF90IGl0ZW1JRCkKICAgICA6IG1faXRlbUlEKGl0ZW1JRCkKIHsKLSAg ICBtX3BhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZyA9IG9yaWdpbmFs VVJMOwotICAgIG1fcGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLnVybFN0cmluZyA9IHVybDsKLSAg ICBtX3BhZ2VTdGF0ZS50aXRsZSA9IHRpdGxlOworICAgIG1faXRlbVN0YXRlLnBhZ2VTdGF0ZS5t YWluRnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZyA9IG9yaWdpbmFsVVJMOworICAgIG1faXRl bVN0YXRlLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS51cmxTdHJpbmcgPSB1cmw7CisgICAgbV9p dGVtU3RhdGUucGFnZVN0YXRlLnRpdGxlID0gdGl0bGU7CiAKICAgICBpZiAobV9pdGVtSUQgPiBo aWdoZXN0VXNlZEl0ZW1JRCkKICAgICAgICAgaGlnaGVzdFVzZWRJdGVtSUQgPSBtX2l0ZW1JRDsK QEAgLTcwLDE5ICs3MCwxOSBAQCB1aW50NjRfdCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpoaWdo ZWRVc2VkSXRlbUlEKCkKIAogUGFzc1JlZlB0cjxBUEk6OkRhdGE+IFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW06OmJhY2tGb3J3YXJkRGF0YSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGVuY29kZUxlZ2Fj eVNlc3Npb25IaXN0b3J5RW50cnlEYXRhKG1fcGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlKTsKKyAg ICByZXR1cm4gZW5jb2RlTGVnYWN5U2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEobV9pdGVtU3RhdGUu cGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlKTsKIH0KIAogdm9pZCBXZWJCYWNrRm9yd2FyZExpc3RJ dGVtOjpzZXRCYWNrRm9yd2FyZERhdGEoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUp CiB7Ci0gICAgZGVjb2RlTGVnYWN5U2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoZGF0YSwgc2l6ZSwg bV9wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUpOworICAgIGRlY29kZUxlZ2FjeVNlc3Npb25IaXN0 b3J5RW50cnlEYXRhKGRhdGEsIHNpemUsIG1faXRlbVN0YXRlLnBhZ2VTdGF0ZS5tYWluRnJhbWVT dGF0ZSk7CiB9CiAKIHZvaWQgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6ZW5jb2RlKElQQzo6QXJn dW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIGVuY29kZXIgPDwgbV9wYWdlU3Rh dGUubWFpbkZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmc7Ci0gICAgZW5jb2RlciA8PCBtX3Bh Z2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS51cmxTdHJpbmc7Ci0gICAgZW5jb2RlciA8PCBtX3BhZ2VT dGF0ZS50aXRsZTsKKyAgICBlbmNvZGVyIDw8IG1faXRlbVN0YXRlLnBhZ2VTdGF0ZS5tYWluRnJh bWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZzsKKyAgICBlbmNvZGVyIDw8IG1faXRlbVN0YXRlLnBh Z2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS51cmxTdHJpbmc7CisgICAgZW5jb2RlciA8PCBtX2l0ZW1T dGF0ZS5wYWdlU3RhdGUudGl0bGU7CiAgICAgZW5jb2RlciA8PCBtX2l0ZW1JRDsKIAogICAgIFJl ZlB0cjxBUEk6OkRhdGE+IGJhY2tGb3J3YXJkRGF0YSA9IHRoaXMtPmJhY2tGb3J3YXJkRGF0YSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgKaW5k ZXggYWY3YTAxY2FiNmQ5ZDE2N2JjMDk1ZmJlOTUyNzEwODg0MTFiMWM1OC4uZWFlNTA0MDEzM2Fh MjEzYmI0MzJhYWU1NGFjMDUwYTViODJjZDViZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCkBAIC00MiwxMSArNDIsOSBAQCBuYW1lc3BhY2Ug SVBDIHsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0cnVjdCBQYWdlU3RhdGU7Ci0KIGNsYXNz IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0gOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6T2Jq ZWN0OjpUeXBlOjpCYWNrRm9yd2FyZExpc3RJdGVtPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBh c3NSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4gY3JlYXRlKHVpbnQ2NF90IGl0ZW1JRCwg UGFnZVN0YXRlKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVt PiBjcmVhdGUodWludDY0X3QgaXRlbUlELCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUpOwogCiAg ICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4gY3JlYXRlKGNvbnN0 IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRp dGxlLCBjb25zdCB1aW50OF90KiBiYWNrRm9yd2FyZERhdGEsIHNpemVfdCBiYWNrRm9yd2FyZERh dGFTaXplLCB1aW50NjRfdCBpdGVtSUQpCiAgICAgewpAQCAtNTcsMjIgKzU1LDIyIEBAIHB1Ymxp YzoKIAogICAgIHVpbnQ2NF90IGl0ZW1JRCgpIGNvbnN0IHsgcmV0dXJuIG1faXRlbUlEOyB9CiAK LSAgICB2b2lkIHNldFBhZ2VTdGF0ZShQYWdlU3RhdGUgcGFnZVN0YXRlKSB7IG1fcGFnZVN0YXRl ID0gc3RkOjptb3ZlKHBhZ2VTdGF0ZSk7IH0KKyAgICB2b2lkIHNldFBhZ2VTdGF0ZShQYWdlU3Rh dGUgcGFnZVN0YXRlKSB7IG1faXRlbVN0YXRlLnBhZ2VTdGF0ZSA9IHN0ZDo6bW92ZShwYWdlU3Rh dGUpOyB9CiAKLSAgICB2b2lkIHNldE9yaWdpbmFsVVJMKGNvbnN0IFN0cmluZyYgb3JpZ2luYWxV UkwpIHsgbV9wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmcgPSBvcmln aW5hbFVSTDsgfQotICAgIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwoKSBjb25zdCB7IHJldHVy biBtX3BhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZzsgfQorICAgIHZv aWQgc2V0T3JpZ2luYWxVUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5hbFVSTCkgeyBtX2l0ZW1TdGF0 ZS5wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmcgPSBvcmlnaW5hbFVS TDsgfQorICAgIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwoKSBjb25zdCB7IHJldHVybiBtX2l0 ZW1TdGF0ZS5wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmc7IH0KIAot ICAgIHZvaWQgc2V0VVJMKGNvbnN0IFN0cmluZyYgdXJsKSB7IG1fcGFnZVN0YXRlLm1haW5GcmFt ZVN0YXRlLnVybFN0cmluZyA9IHVybDsgfQotICAgIGNvbnN0IFN0cmluZyYgdXJsKCkgY29uc3Qg eyByZXR1cm4gbV9wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUudXJsU3RyaW5nOyB9CisgICAgdm9p ZCBzZXRVUkwoY29uc3QgU3RyaW5nJiB1cmwpIHsgbV9pdGVtU3RhdGUucGFnZVN0YXRlLm1haW5G cmFtZVN0YXRlLnVybFN0cmluZyA9IHVybDsgfQorICAgIGNvbnN0IFN0cmluZyYgdXJsKCkgY29u c3QgeyByZXR1cm4gbV9pdGVtU3RhdGUucGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLnVybFN0cmlu ZzsgfQogCi0gICAgdm9pZCBzZXRUaXRsZShjb25zdCBTdHJpbmcmIHRpdGxlKSB7IG1fcGFnZVN0 YXRlLnRpdGxlID0gdGl0bGU7IH0KLSAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3QgeyBy ZXR1cm4gbV9wYWdlU3RhdGUudGl0bGU7IH0KKyAgICB2b2lkIHNldFRpdGxlKGNvbnN0IFN0cmlu ZyYgdGl0bGUpIHsgbV9pdGVtU3RhdGUucGFnZVN0YXRlLnRpdGxlID0gdGl0bGU7IH0KKyAgICBj b25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3QgeyByZXR1cm4gbV9pdGVtU3RhdGUucGFnZVN0YXRl LnRpdGxlOyB9CiAgICAgCiAgICAgdm9pZCBzZXRCYWNrRm9yd2FyZERhdGEoY29uc3QgdWludDhf dCogYnVmZmVyLCBzaXplX3Qgc2l6ZSk7CiAgICAgUGFzc1JlZlB0cjxBUEk6OkRhdGE+IGJhY2tG b3J3YXJkRGF0YSgpIGNvbnN0OwogCi0gICAgdm9pZCBzZXRTbmFwc2hvdFVVSUQoY29uc3QgU3Ry aW5nJiB1dWlkKSB7IG1fc25hcHNob3RVVUlEID0gdXVpZDsgfQotICAgIGNvbnN0IFN0cmluZyYg c25hcHNob3RVVUlEKCkgY29uc3QgeyByZXR1cm4gbV9zbmFwc2hvdFVVSUQ7IH0KKyAgICB2b2lk IHNldFNuYXBzaG90VVVJRChjb25zdCBTdHJpbmcmIHV1aWQpIHsgbV9pdGVtU3RhdGUuc25hcHNo b3RVVUlEID0gdXVpZDsgfQorICAgIGNvbnN0IFN0cmluZyYgc25hcHNob3RVVUlEKCkgY29uc3Qg eyByZXR1cm4gbV9pdGVtU3RhdGUuc25hcHNob3RVVUlEOyB9CiAKICAgICB2b2lkIGVuY29kZShJ UEM6OkFyZ3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0+IGRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYpOwpAQCAtODAs MTMgKzc4LDEyIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdWludDY0X3QgaGlnaGVkVXNlZEl0ZW1J RCgpOwogCiBwcml2YXRlOgotICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0odWludDY0X3QgaXRl bUlELCBQYWdlU3RhdGUpOworICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0odWludDY0X3QgaXRl bUlELCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUpOwogCiAgICAgV2ViQmFja0ZvcndhcmRMaXN0 SXRlbShjb25zdCBTdHJpbmcmIG9yaWdpbmFsVVJMLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg U3RyaW5nJiB0aXRsZSwgY29uc3QgdWludDhfdCogYmFja0ZvcndhcmREYXRhLCBzaXplX3QgYmFj a0ZvcndhcmREYXRhU2l6ZSwgdWludDY0X3QgaXRlbUlEKTsKIAogICAgIHVpbnQ2NF90IG1faXRl bUlEOwotICAgIFBhZ2VTdGF0ZSBtX3BhZ2VTdGF0ZTsKLSAgICBTdHJpbmcgbV9zbmFwc2hvdFVV SUQ7CisgICAgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlIG1faXRlbVN0YXRlOwogfTsKIAogdHlw ZWRlZiBWZWN0b3I8UmVmUHRyPFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0+PiBCYWNrRm9yd2FyZExp c3RJdGVtVmVjdG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJh Y2tGb3J3YXJkTGlzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0Zvcndh cmRMaXN0LmNwcAppbmRleCBkMjNhOTc0MmIyNjU1Yzc3YWEyY2JhMjcxNDA4MmY5NjNjNmUwNTY0 Li42MzY4MzhiMDViM2M2ZGVjOTRhY2U4ZjVhYzE2OTVjZWU2Y2E3YTY0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcApAQCAtMzg1LDggKzM4 NSw4IEBAIHZvaWQgV2ViQmFja0ZvcndhcmRMaXN0OjpyZXN0b3JlRnJvbVN0YXRlKEJhY2tGb3J3 YXJkTGlzdFN0YXRlIGJhY2tGb3J3YXJkTGlzdFN0CiAgICAgVmVjdG9yPFJlZlB0cjxXZWJCYWNr Rm9yd2FyZExpc3RJdGVtPj4gaXRlbXM7CiAgICAgaXRlbXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0 eShiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcy5zaXplKCkpOwogCi0gICAgZm9yIChhdXRvJiBw YWdlU3RhdGUgOiBiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcykKLSAgICAgICAgaXRlbXMudW5j aGVja2VkQXBwZW5kKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShnZW5lcmF0ZVdlYkJh Y2tGb3J3YXJkSXRlbUlEKCksIHN0ZDo6bW92ZShwYWdlU3RhdGUpKSk7CisgICAgZm9yIChhdXRv JiBiYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgOiBiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcykK KyAgICAgICAgaXRlbXMudW5jaGVja2VkQXBwZW5kKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNy ZWF0ZShnZW5lcmF0ZVdlYkJhY2tGb3J3YXJkSXRlbUlEKCksIHN0ZDo6bW92ZShiYWNrRm9yd2Fy ZExpc3RJdGVtU3RhdGUpKSk7CiAKICAgICBtX2hhc0N1cnJlbnRJbmRleCA9ICEhYmFja0Zvcndh cmRMaXN0U3RhdGUuY3VycmVudEluZGV4OwogICAgIG1fY3VycmVudEluZGV4ID0gYmFja0Zvcndh cmRMaXN0U3RhdGUuY3VycmVudEluZGV4LnZhbHVlT3IoMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IDI5ZGZlMTVmMjg3MzdiYmNkNzUyMDJm ZDVmNmQ1MjFkNzI2NzVlN2UuLjQxNTMwNzBmNTBmN2JiZjU4YWE2NzNkOWI3YjMxM2Q4MDJhNDM5 NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBA IC0zMTcsNyArMzE3LDkgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmFkZEJhY2tGb3J3YXJkSXRl bSh1aW50NjRfdCBpdGVtSUQsIGNvbnN0IFBhZ2VTdGF0ZSYgcGFnZVMKIAogICAgIGF1dG8mIGJh Y2tGb3J3YXJkTGlzdEl0ZW0gPSBtX2JhY2tGb3J3YXJkTGlzdEl0ZW1NYXAuYWRkKGl0ZW1JRCwg bnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwogICAgIGlmICghYmFja0ZvcndhcmRMaXN0SXRlbSkg ewotICAgICAgICBiYWNrRm9yd2FyZExpc3RJdGVtID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6 Y3JlYXRlKGl0ZW1JRCwgcGFnZVN0YXRlKTsKKyAgICAgICAgQmFja0ZvcndhcmRMaXN0SXRlbVN0 YXRlIGJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZTsKKyAgICAgICAgYmFja0ZvcndhcmRMaXN0SXRl bVN0YXRlLnBhZ2VTdGF0ZSA9IHBhZ2VTdGF0ZTsKKyAgICAgICAgYmFja0ZvcndhcmRMaXN0SXRl bSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShpdGVtSUQsIHN0ZDo6bW92ZShiYWNr Rm9yd2FyZExpc3RJdGVtU3RhdGUpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2Rp bmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVD b2RpbmcuY3BwCmluZGV4IDRmZjZhNzE4ZGYyNGRhM2Y1NDQ2MDM2MDgxZjZmNGUzNmUyMDFjOGYu LjQzNTNjZDk1MTRlZDRmYjQyNTRmYWMyMzA2YjAzNGRjMzdkOGQ1M2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGlu Zy5jcHAKQEAgLTg0NCwxNSArODQ0LDE1IEBAIHN0YXRpYyBib29sIGRlY29kZVNlc3Npb25IaXN0 b3J5RW50cnkoQ0ZEaWN0aW9uYXJ5UmVmIGVudHJ5RGljdGlvbmFyeSwgUGFnZVN0YXRlCiAgICAg cmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBib29sIGRlY29kZVNlc3Npb25IaXN0b3J5RW50cmll cyhDRkFycmF5UmVmIGVudHJpZXNBcnJheSwgVmVjdG9yPFBhZ2VTdGF0ZT4mIGVudHJpZXMpCitz dGF0aWMgYm9vbCBkZWNvZGVTZXNzaW9uSGlzdG9yeUVudHJpZXMoQ0ZBcnJheVJlZiBlbnRyaWVz QXJyYXksIFZlY3RvcjxCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+JiBlbnRyaWVzKQogewogICAg IGZvciAoQ0ZJbmRleCBpID0gMCwgc2l6ZSA9IENGQXJyYXlHZXRDb3VudChlbnRyaWVzQXJyYXkp OyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgIGF1dG8gZW50cnlEaWN0aW9uYXJ5ID0gZHluYW1p Y19jZl9jYXN0PENGRGljdGlvbmFyeVJlZj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChlbnRyaWVz QXJyYXksIGkpKTsKICAgICAgICAgaWYgKCFlbnRyeURpY3Rpb25hcnkpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgUGFnZVN0YXRlIGVudHJ5OwotICAgICAgICBpZiAoIWRl Y29kZVNlc3Npb25IaXN0b3J5RW50cnkoZW50cnlEaWN0aW9uYXJ5LCBlbnRyeSkpCisgICAgICAg IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSBlbnRyeTsKKyAgICAgICAgaWYgKCFkZWNvZGVTZXNz aW9uSGlzdG9yeUVudHJ5KGVudHJ5RGljdGlvbmFyeSwgZW50cnkucGFnZVN0YXRlKSkKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBlbnRyaWVzLmFwcGVuZChzdGQ6Om1vdmUo ZW50cnkpKTsK