134557 2014-07-02 14:05:34 -0700 Store the back forward list item id inside BackForwardListItemState 2014-07-02 14:13:44 -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 1020025 0 andersca 2014-07-02 14:05:34 -0700 Store the back forward list item id inside BackForwardListItemState 1020027 1 234277 andersca 2014-07-02 14:07:47 -0700 Created attachment 234277 Patch 1020030 2 andersca 2014-07-02 14:13:44 -0700 Committed r170722: <http://trac.webkit.org/changeset/170722> 234277 2014-07-02 14:07:47 -0700 2014-07-02 14:08:31 -0700 Patch bug-134557-20140702140731.patch text/plain 9045 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzJlNjM3OWVmNTJkNDZj MjMxYmRiZTJmYzg2OGRhNDkwNTc5ZjAwYS4uNDdhYmJkM2I2OTkxNWQ2NmFmYWQ2NzdiYjNmMzY2 MzkzMzU0N2RmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA3LTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcmUgdGhlIGJh Y2sgZm9yd2FyZCBsaXN0IGl0ZW0gaWQgaW5zaWRlIEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTU3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQv U2Vzc2lvblN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QmFja0ZvcndhcmRMaXN0SXRlbVN0 YXRlOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU6 OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1Nlc3Npb25TdGF0ZS5oOgorICAgICAgICAqIFNo YXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmFj a0ZvcndhcmRMaXN0SXRlbTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0Zvcndh cmRMaXN0SXRlbTo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbSk6CisgICAgICAgIChXZWJLaXQ6Oldl YkJhY2tGb3J3YXJkTGlzdEl0ZW06OmVuY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYkJhY2tG b3J3YXJkTGlzdEl0ZW0uaDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRl bTo6aXRlbUlEKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0OjpyZXN0b3JlRnJvbVN0YXRlKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5OjphZGRCYWNrRm9yd2FyZEl0ZW0pOgorCisyMDE0LTA3LTAyICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgQmVnaW4gcmlw cGluZyBvdXQgdGhlIG9sZCBzZXNzaW9uIHN0YXRlIGNvZGUKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDU1NgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9T ZXNzaW9uU3RhdGUuY3BwCmluZGV4IDJiMGYwYzQ2MTE1Mjc2NzMwZGE3MDNmYWNhNmU0NTUzOWM1 MDc0NWQuLjE2OGFiZjc5Mzk3NzI4MTkyYTE0ODIzMGEwNDg1ZmYxM2NhMTE2MDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuY3BwCkBAIC0xODQsMTEgKzE4NCwxNSBAQCBib29s IFBhZ2VTdGF0ZTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBQYWdlU3Rh dGUmIHJlc3VsdCkKIAogdm9pZCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU6OmVuY29kZShJUEM6 OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsKKyAgICBlbmNvZGVyIDw8IGlkZW50 aWZpZXI7CiAgICAgZW5jb2RlciA8PCBwYWdlU3RhdGU7CiB9CiAKIGJvb2wgQmFja0ZvcndhcmRM aXN0SXRlbVN0YXRlOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIEJhY2tG b3J3YXJkTGlzdEl0ZW1TdGF0ZSYgcmVzdWx0KQogeworICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0LmlkZW50aWZpZXIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHJlc3VsdC5wYWdlU3RhdGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuaCBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuaAppbmRleCBkMjA1NjIwZGY4ZTM1NTEyNTFl YjMyMTc3OGI3YjEwMGJjYWY5ZmY2Li43NmU0MWMyNjNjYzlmNGMwOWEwMDNmMTRjMGRiZGNjYjBm MWRkMmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmgK KysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCkBAIC0xMTcsNiArMTE3 LDggQEAgc3RydWN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSB7CiAgICAgdm9pZCBlbmNvZGUo SVBDOjpBcmd1bWVudEVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUoSVBD OjpBcmd1bWVudERlY29kZXImLCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUmKTsKIAorICAgIHVp bnQ2NF90IGlkZW50aWZpZXI7CisKICAgICBQYWdlU3RhdGUgcGFnZVN0YXRlOwogICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCBob2xkIHRoZSBzbmFwc2hvdCBpdHNlbGYsIG5vdCBpdHMgVVVJRC4K ICAgICBTdHJpbmcgc25hcHNob3RVVUlEOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCmluZGV4IDhjY2Q0YTcyM2E1MGY5YTQ3MDE0ODI4YjBj NWIwNzRiNDFiNmVhMzIuLmIwMmQ3NzhmMjdjYjE4Y2FmNDBlMWYyNDJiMTI3ZWE4N2FjMzRhNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVt LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5j cHAKQEAgLTM1LDI4ICszNSwyNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RhdGljIHVpbnQ2 NF90IGhpZ2hlc3RVc2VkSXRlbUlEID0gMDsKIAotUGFzc1JlZlB0cjxXZWJCYWNrRm9yd2FyZExp c3RJdGVtPiBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpjcmVhdGUodWludDY0X3QgaXRlbUlELCBC YWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgYmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlKQorUGFzc1Jl ZlB0cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPiBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpjcmVh dGUoQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlIGJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSkKIHsK LSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oaXRlbUlELCBz dGQ6Om1vdmUoYmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlKSkpOworICAgIHJldHVybiBhZG9wdFJl ZihuZXcgV2ViQmFja0ZvcndhcmRMaXN0SXRlbShzdGQ6Om1vdmUoYmFja0ZvcndhcmRMaXN0SXRl bVN0YXRlKSkpOwogfQogCi1XZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpXZWJCYWNrRm9yd2FyZExp c3RJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlIGJhY2tGb3J3 YXJkTGlzdEl0ZW1TdGF0ZSkKLSAgICA6IG1faXRlbUlEKGl0ZW1JRCkKLSAgICAsIG1faXRlbVN0 YXRlKHN0ZDo6bW92ZShiYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUpKQorV2ViQmFja0ZvcndhcmRM aXN0SXRlbTo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbShCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUg YmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlKQorICAgIDogbV9pdGVtU3RhdGUoc3RkOjptb3ZlKGJh Y2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSkpCiB7Ci0gICAgaWYgKG1faXRlbUlEID4gaGlnaGVzdFVz ZWRJdGVtSUQpCi0gICAgICAgIGhpZ2hlc3RVc2VkSXRlbUlEID0gbV9pdGVtSUQ7CisgICAgaWYg KG1faXRlbVN0YXRlLmlkZW50aWZpZXIgPiBoaWdoZXN0VXNlZEl0ZW1JRCkKKyAgICAgICAgaGln aGVzdFVzZWRJdGVtSUQgPSBtX2l0ZW1TdGF0ZS5pZGVudGlmaWVyOwogfQogCiBXZWJCYWNrRm9y d2FyZExpc3RJdGVtOjpXZWJCYWNrRm9yd2FyZExpc3RJdGVtKGNvbnN0IFN0cmluZyYgb3JpZ2lu YWxVUkwsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCB1aW50 OF90KiBiYWNrRm9yd2FyZERhdGEsIHNpemVfdCBiYWNrRm9yd2FyZERhdGFTaXplLCB1aW50NjRf dCBpdGVtSUQpCi0gICAgOiBtX2l0ZW1JRChpdGVtSUQpCiB7CiAgICAgbV9pdGVtU3RhdGUucGFn ZVN0YXRlLm1haW5GcmFtZVN0YXRlLm9yaWdpbmFsVVJMU3RyaW5nID0gb3JpZ2luYWxVUkw7CiAg ICAgbV9pdGVtU3RhdGUucGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLnVybFN0cmluZyA9IHVybDsK ICAgICBtX2l0ZW1TdGF0ZS5wYWdlU3RhdGUudGl0bGUgPSB0aXRsZTsKKyAgICBtX2l0ZW1TdGF0 ZS5pZGVudGlmaWVyID0gaXRlbUlEOwogCi0gICAgaWYgKG1faXRlbUlEID4gaGlnaGVzdFVzZWRJ dGVtSUQpCi0gICAgICAgIGhpZ2hlc3RVc2VkSXRlbUlEID0gbV9pdGVtSUQ7CisgICAgaWYgKG1f aXRlbVN0YXRlLmlkZW50aWZpZXIgPiBoaWdoZXN0VXNlZEl0ZW1JRCkKKyAgICAgICAgaGlnaGVz dFVzZWRJdGVtSUQgPSBtX2l0ZW1TdGF0ZS5pZGVudGlmaWVyOwogCiAgICAgc2V0QmFja0Zvcndh cmREYXRhKGJhY2tGb3J3YXJkRGF0YSwgYmFja0ZvcndhcmREYXRhU2l6ZSk7CiB9CkBAIC04NSw3 ICs4NCw3IEBAIHZvaWQgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6ZW5jb2RlKElQQzo6QXJndW1l bnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgbV9pdGVtU3RhdGUucGFn ZVN0YXRlLm1haW5GcmFtZVN0YXRlLm9yaWdpbmFsVVJMU3RyaW5nOwogICAgIGVuY29kZXIgPDwg bV9pdGVtU3RhdGUucGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLnVybFN0cmluZzsKICAgICBlbmNv ZGVyIDw8IG1faXRlbVN0YXRlLnBhZ2VTdGF0ZS50aXRsZTsKLSAgICBlbmNvZGVyIDw8IG1faXRl bUlEOworICAgIGVuY29kZXIgPDwgbV9pdGVtU3RhdGUuaWRlbnRpZmllcjsKIAogICAgIFJlZlB0 cjxBUEk6OkRhdGE+IGJhY2tGb3J3YXJkRGF0YSA9IHRoaXMtPmJhY2tGb3J3YXJkRGF0YSgpOwog ICAgIGVuY29kZXIgPDwgSVBDOjpEYXRhUmVmZXJlbmNlKGJhY2tGb3J3YXJkRGF0YS0+Ynl0ZXMo KSwgYmFja0ZvcndhcmREYXRhLT5zaXplKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgKaW5kZXggZjBkM2ZmZjE4YjczMmRkM2I5OGZiM2RjNjI3 ZDlkY2E4MDFmZjhhNC4uZDAxNDBhOThlYjI1MmYzMTZlNDE4NDZmZDQzNmIwZjNkMjljM2I1YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0u aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCkBA IC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtIDogcHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVjdDo6VHlwZTo6QmFj a0ZvcndhcmRMaXN0SXRlbT4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0+IGNyZWF0ZSh1aW50NjRfdCBpdGVtSUQsIEJhY2tGb3J3YXJkTGlz dEl0ZW1TdGF0ZSk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRl bT4gY3JlYXRlKEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSk7CiAKICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBvcmlnaW5h bFVSTCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IHVpbnQ4 X3QqIGJhY2tGb3J3YXJkRGF0YSwgc2l6ZV90IGJhY2tGb3J3YXJkRGF0YVNpemUsIHVpbnQ2NF90 IGl0ZW1JRCkKICAgICB7CkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg fldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oKTsKIAotICAgIHVpbnQ2NF90IGl0ZW1JRCgpIGNvbnN0 IHsgcmV0dXJuIG1faXRlbUlEOyB9CisgICAgdWludDY0X3QgaXRlbUlEKCkgY29uc3QgeyByZXR1 cm4gbV9pdGVtU3RhdGUuaWRlbnRpZmllcjsgfQogICAgIGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0 ZW1TdGF0ZSYgaXRlbVN0YXRlKCkgeyByZXR1cm4gbV9pdGVtU3RhdGU7IH0KIAogICAgIHZvaWQg c2V0UGFnZVN0YXRlKFBhZ2VTdGF0ZSBwYWdlU3RhdGUpIHsgbV9pdGVtU3RhdGUucGFnZVN0YXRl ID0gc3RkOjptb3ZlKHBhZ2VTdGF0ZSk7IH0KQEAgLTc5LDExICs3OSwxMCBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIHVpbnQ2NF90IGhpZ2hlZFVzZWRJdGVtSUQoKTsKIAogcHJpdmF0ZToKLSAgICBX ZWJCYWNrRm9yd2FyZExpc3RJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgQmFja0ZvcndhcmRMaXN0SXRl bVN0YXRlKTsKKyAgICBleHBsaWNpdCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKEJhY2tGb3J3YXJk TGlzdEl0ZW1TdGF0ZSk7CiAKICAgICBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKGNvbnN0IFN0cmlu ZyYgb3JpZ2luYWxVUkwsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBj b25zdCB1aW50OF90KiBiYWNrRm9yd2FyZERhdGEsIHNpemVfdCBiYWNrRm9yd2FyZERhdGFTaXpl LCB1aW50NjRfdCBpdGVtSUQpOwogCi0gICAgdWludDY0X3QgbV9pdGVtSUQ7CiAgICAgQmFja0Zv cndhcmRMaXN0SXRlbVN0YXRlIG1faXRlbVN0YXRlOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcAppbmRleCA5MDE5NWEzOGMyNjZjNDE1 YjYyOGY4OTQ1NzIzYzM5ZGYyYTYzZDMxLi5lOGMwZTEzODhkNGE1ZWI4MmNkMjE5MzJkYjg2Yzhi Yjc4YTNjMWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0Zv cndhcmRMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0Zvcndh cmRMaXN0LmNwcApAQCAtNDA5LDkgKzQwOSwxMCBAQCB2b2lkIFdlYkJhY2tGb3J3YXJkTGlzdDo6 cmVzdG9yZUZyb21TdGF0ZShCYWNrRm9yd2FyZExpc3RTdGF0ZSBiYWNrRm9yd2FyZExpc3RTdAog ICAgIFZlY3RvcjxSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+IGl0ZW1zOwogICAgIGl0 ZW1zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoYmFja0ZvcndhcmRMaXN0U3RhdGUuaXRlbXMuc2l6 ZSgpKTsKIAotICAgIGZvciAoYXV0byYgYmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlIDogYmFja0Zv cndhcmRMaXN0U3RhdGUuaXRlbXMpCi0gICAgICAgIGl0ZW1zLnVuY2hlY2tlZEFwcGVuZChXZWJC YWNrRm9yd2FyZExpc3RJdGVtOjpjcmVhdGUoZ2VuZXJhdGVXZWJCYWNrRm9yd2FyZEl0ZW1JRCgp LCBzdGQ6Om1vdmUoYmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlKSkpOwotCisgICAgZm9yIChhdXRv JiBiYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgOiBiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcykg eworICAgICAgICBiYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUuaWRlbnRpZmllciA9IGdlbmVyYXRl V2ViQmFja0ZvcndhcmRJdGVtSUQoKTsKKyAgICAgICAgaXRlbXMudW5jaGVja2VkQXBwZW5kKFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShzdGQ6Om1vdmUoYmFja0ZvcndhcmRMaXN0SXRl bVN0YXRlKSkpOworICAgIH0KICAgICBtX2hhc0N1cnJlbnRJbmRleCA9ICEhYmFja0ZvcndhcmRM aXN0U3RhdGUuY3VycmVudEluZGV4OwogICAgIG1fY3VycmVudEluZGV4ID0gYmFja0ZvcndhcmRM aXN0U3RhdGUuY3VycmVudEluZGV4LnZhbHVlT3IoMCk7CiAgICAgbV9lbnRyaWVzID0gc3RkOjpt b3ZlKGl0ZW1zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKaW5kZXggNDE1MzA3MGY1MGY3YmJmNThhYTY3M2Q5YjdiMzEzZDgwMmE0Mzk0Mi4uNzk5MTJk ZGQ1MGVkZjdiZWI4OTg1NTE5YjZmYWIwZGM2NjljODBmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTMxOCw4ICszMTgsOSBAQCB2b2lkIFdl YlByb2Nlc3NQcm94eTo6YWRkQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgY29uc3Qg UGFnZVN0YXRlJiBwYWdlUwogICAgIGF1dG8mIGJhY2tGb3J3YXJkTGlzdEl0ZW0gPSBtX2JhY2tG b3J3YXJkTGlzdEl0ZW1NYXAuYWRkKGl0ZW1JRCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOwog ICAgIGlmICghYmFja0ZvcndhcmRMaXN0SXRlbSkgewogICAgICAgICBCYWNrRm9yd2FyZExpc3RJ dGVtU3RhdGUgYmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlOworICAgICAgICBiYWNrRm9yd2FyZExp c3RJdGVtU3RhdGUuaWRlbnRpZmllciA9IGl0ZW1JRDsKICAgICAgICAgYmFja0ZvcndhcmRMaXN0 SXRlbVN0YXRlLnBhZ2VTdGF0ZSA9IHBhZ2VTdGF0ZTsKLSAgICAgICAgYmFja0ZvcndhcmRMaXN0 SXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShpdGVtSUQsIHN0ZDo6bW92ZShi YWNrRm9yd2FyZExpc3RJdGVtU3RhdGUpKTsKKyAgICAgICAgYmFja0ZvcndhcmRMaXN0SXRlbSA9 IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShzdGQ6Om1vdmUoYmFja0ZvcndhcmRMaXN0 SXRlbVN0YXRlKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK