134558 2014-07-02 14:24:55 -0700 RestoreSession should take a vector of BackForwardListItemStates 2014-07-02 14:31:45 -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 1020032 0 andersca 2014-07-02 14:24:55 -0700 RestoreSession should take a vector of BackForwardListItemStates 1020033 1 234278 andersca 2014-07-02 14:25:58 -0700 Created attachment 234278 Patch 1020036 2 andersca 2014-07-02 14:31:45 -0700 Committed r170723: <http://trac.webkit.org/changeset/170723> 234278 2014-07-02 14:25:58 -0700 2014-07-02 14:30:52 -0700 Patch bug-134558-20140702142542.patch text/plain 12478 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzkzNDExYzVhNjEwMDk3 ZTkwNGJhZmI3ZjQwZjJiZTEzOWU2OWJhZC4uNjExYjRjOGNlZDM2MmNhNWJiY2FkZjE5ZjBjN2Jm YWUzNzY0ODQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE0LTA3LTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVzdG9yZVNlc3Np b24gc2hvdWxkIHRha2UgYSB2ZWN0b3Igb2YgQmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdDIvbWVzc2FnZXMucHk6CisgICAgICAgIChzdHJ1Y3Rfb3JfY2xhc3MpOgorICAgICAgICAo aGVhZGVyc19mb3JfdHlwZSk6CisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpl bmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNv ZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkJhY2tGb3J3YXJkTGlzdDo6aXRlbVN0YXRlcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dl YkJhY2tGb3J3YXJkTGlzdC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRl KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMpOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6V2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlc3RvcmVT ZXNzaW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVzdG9yZVNlc3Npb25BbmROYXZp Z2F0ZVRvQ3VycmVudEl0ZW0pOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW46CisKKzIwMTQtMDctMDIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KKwogICAgICAgICBTdG9yZSB0aGUgYmFjayBmb3J3YXJkIGxpc3QgaXRlbSBpZCBpbnNpZGUg QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzQ1NTcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2Ny aXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5IGIvU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQy L21lc3NhZ2VzLnB5CmluZGV4IGNiNWQyMWQ1OTBiMTljYmFiMDY3N2Q0YjBjZTBjOGJiNDEzYzM1 NjIuLmViMzI5M2QzZWJjOTExOGZhZTMwZDEzYzI1ODNkZDIwNWQ0M2Y5YTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKQEAgLTE5Myw2ICsxOTMsNyBAQCBk ZWYgc3RydWN0X29yX2NsYXNzKG5hbWVzcGFjZSwgdHlwZSk6CiAgICAgICAgICdXZWJDb3JlOjpX aW5kb3dGZWF0dXJlcycsCiAgICAgICAgICdXZWJLaXQ6OkFzc2lzdGVkTm9kZUluZm9ybWF0aW9u JywKICAgICAgICAgJ1dlYktpdDo6QXR0cmlidXRlZFN0cmluZycsCisgICAgICAgICdXZWJLaXQ6 OkJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZScsCiAgICAgICAgICdXZWJLaXQ6OkNvbG9yU3BhY2VE YXRhJywKICAgICAgICAgJ1dlYktpdDo6Q29udGV4dE1lbnVTdGF0ZScsCiAgICAgICAgICdXZWJL aXQ6OkRhdGFiYXNlUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycycsCkBAIC00MzcsNiArNDM4LDcg QEAgZGVmIGhlYWRlcnNfZm9yX3R5cGUodHlwZSk6CiAgICAgICAgICdXZWJDb3JlOjpUZXh0Q2hl Y2tpbmdSZXF1ZXN0RGF0YSc6IFsnPFdlYkNvcmUvVGV4dENoZWNraW5nLmg+J10sCiAgICAgICAg ICdXZWJDb3JlOjpUZXh0Q2hlY2tpbmdSZXN1bHQnOiBbJzxXZWJDb3JlL1RleHRDaGVja2VyQ2xp ZW50Lmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMnOiBbJzxXZWJD b3JlL1ZpZXdwb3J0QXJndW1lbnRzLmg+J10sCisgICAgICAgICdXZWJLaXQ6OkJhY2tGb3J3YXJk TGlzdEl0ZW1TdGF0ZSc6IFsnIlNlc3Npb25TdGF0ZS5oIiddLAogICAgICAgICAnV2ViS2l0OjpJ bmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcic6IFtdLAogICAgICAgICAnV2ViS2l0OjpQ YWdlU3RhdGUnOiBbJyJTZXNzaW9uU3RhdGUuaCInXSwKICAgICAgICAgJ1dlYktpdDo6V2ViQ29u dGV4dFVzZXJNZXNzYWdlRW5jb2Rlcic6IFtdLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IDhhMWU5NjhhNzQ2YTIwNDZi NGRiYmFiOWEzZDNlMTIyMzYxMDI1ZjYuLmFjMjhjNzA5YjRlYjg0OTA2NjA0NTllMDA3Y2FiNzBm YTA2OWUwN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAKQEAgLTQ4LDcgKzQ4LDcgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAg ICAgZW5jb2RlciA8PCBwYWdlTGVuZ3RoOwogICAgIGVuY29kZXIgPDwgZ2FwQmV0d2VlblBhZ2Vz OwogICAgIGVuY29kZXIgPDwgdXNlckFnZW50OwotICAgIGVuY29kZXIgPDwgc2Vzc2lvblN0YXRl OworICAgIGVuY29kZXIgPDwgaXRlbVN0YXRlczsKICAgICBlbmNvZGVyIDw8IHNlc3Npb25JRDsK ICAgICBlbmNvZGVyIDw8IGhpZ2hlc3RVc2VkQmFja0ZvcndhcmRJdGVtSUQ7CiAgICAgZW5jb2Rl ciA8PCB1c2VyQ29udGVudENvbnRyb2xsZXJJRDsKQEAgLTExMSw3ICsxMTEsNyBAQCBib29sIFdl YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVj b2RlciwgV2ViUGFnZUNyZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVy LmRlY29kZShwYXJhbWV0ZXJzLnVzZXJBZ2VudCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuc2Vzc2lvblN0YXRlKSkKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaXRlbVN0YXRlcykpCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuc2Vzc2lvbklEKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggNWM3ZjIwOTk4MWIwZTNiYjAxNGU0Zjk0ODhjOGUw NmJlYzg1YmE5MS4uZDUyY2UzYTg2ZDA4Zjk1ZDU2YzM2YjI3NTBhYTliNDYyNzI0NWZkNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5o CkBAIC0yOCw3ICsyOCw3IEBACiAKICNpbmNsdWRlICJEcmF3aW5nQXJlYUluZm8uaCIKICNpbmNs dWRlICJMYXllclRyZWVDb250ZXh0LmgiCi0jaW5jbHVkZSAiTGVnYWN5U2Vzc2lvblN0YXRlLmgi CisjaW5jbHVkZSAiU2Vzc2lvblN0YXRlLmgiCiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29k ZXJzLmgiCiAjaW5jbHVkZSAiV2ViUGFnZUdyb3VwRGF0YS5oIgogI2luY2x1ZGUgIldlYlByZWZl cmVuY2VzU3RvcmUuaCIKQEAgLTgxLDcgKzgxLDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMgewogCiAgICAgU3RyaW5nIHVzZXJBZ2VudDsKIAotICAgIExlZ2FjeVNlc3Npb25T dGF0ZSBzZXNzaW9uU3RhdGU7CisgICAgVmVjdG9yPEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZT4g aXRlbVN0YXRlczsKICAgICBXZWJDb3JlOjpTZXNzaW9uSUQgc2Vzc2lvbklEOwogICAgIHVpbnQ2 NF90IGhpZ2hlc3RVc2VkQmFja0ZvcndhcmRJdGVtSUQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5jcHAKaW5kZXggZThjMGUxMzg4ZDRhNWViODJj ZDIxOTMyZGI4NmM4YmI3OGEzYzFiMC4uNjRhYmY4NDQ1NzYxOWI3MTIxNGIwN2Q0N2UzYWExNTJl ZmFjOGRlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3 YXJkTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJk TGlzdC5jcHAKQEAgLTQxOCw0ICs0MTgsMTUgQEAgdm9pZCBXZWJCYWNrRm9yd2FyZExpc3Q6OnJl c3RvcmVGcm9tU3RhdGUoQmFja0ZvcndhcmRMaXN0U3RhdGUgYmFja0ZvcndhcmRMaXN0U3QKICAg ICBtX2VudHJpZXMgPSBzdGQ6Om1vdmUoaXRlbXMpOwogfQogCitWZWN0b3I8QmFja0ZvcndhcmRM aXN0SXRlbVN0YXRlPiBXZWJCYWNrRm9yd2FyZExpc3Q6Oml0ZW1TdGF0ZXMoKSBjb25zdAorewor ICAgIFZlY3RvcjxCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+IGl0ZW1TdGF0ZXM7CisgICAgaXRl bVN0YXRlcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fZW50cmllcy5zaXplKCkpOworCisgICAg Zm9yIChjb25zdCBhdXRvJiBlbnRyeSA6IG1fZW50cmllcykKKyAgICAgICAgaXRlbVN0YXRlcy51 bmNoZWNrZWRBcHBlbmQoZW50cnktPml0ZW1TdGF0ZSgpKTsKKworICAgIHJldHVybiBpdGVtU3Rh dGVzOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuaAppbmRleCA5YWVjMGExNmM3YTFlZmM5ZjE4MWMzZjE5 ZjlkNDYzNjEyNDcxZTc5Li40OTIxN2MwMjRiMWJjZjQ5NGVlZDczNTRiZmEyNDdkMjRiZDI3NWJi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5oCkBA IC01OSw3ICs1OSw3IEBAIHB1YmxpYzoKICAgICBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBiYWNr SXRlbSgpIGNvbnN0OwogICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIGZvcndhcmRJdGVtKCkg Y29uc3Q7CiAgICAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogaXRlbUF0SW5kZXgoaW50KSBjb25z dDsKLSAgICAKKwogICAgIGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1WZWN0b3ImIGVudHJpZXMo KSBjb25zdCB7IHJldHVybiBtX2VudHJpZXM7IH0KIAogICAgIHVpbnQzMl90IGN1cnJlbnRJbmRl eCgpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudEluZGV4OyB9CkBAIC03NSw2ICs3NSw4IEBAIHB1 YmxpYzoKICAgICBCYWNrRm9yd2FyZExpc3RTdGF0ZSBiYWNrRm9yd2FyZExpc3RTdGF0ZShjb25z dCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKT4mKSBjb25zdDsK ICAgICB2b2lkIHJlc3RvcmVGcm9tU3RhdGUoQmFja0ZvcndhcmRMaXN0U3RhdGUpOwogCisgICAg VmVjdG9yPEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZT4gaXRlbVN0YXRlcygpIGNvbnN0OworCiBw cml2YXRlOgogICAgIGV4cGxpY2l0IFdlYkJhY2tGb3J3YXJkTGlzdChXZWJQYWdlUHJveHkmKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBhOTFkMmVk ZjQwMmFjMTkyMjQ1M2UzMjQ0OWVhZjMyMWJhZDE2Zjc2Li5mMzQ1MzhlZmE4ZDBkMDZlN2YzOWU4 Y2E0ZTJiZmEwNzIzNzQyMGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcApAQCAtMTg2OSwxMSArMTg2OSwxMSBAQCB1aW50NjRfdCBXZWJQYWdlUHJveHk6OnJl c3RvcmVGcm9tU2Vzc2lvblN0YXRlKFNlc3Npb25TdGF0ZSBzZXNzaW9uU3RhdGUpCiAKICAgICBp ZiAoaGFzQmFja0ZvcndhcmRMaXN0KSB7CiAgICAgICAgIG1fYmFja0ZvcndhcmRMaXN0LT5yZXN0 b3JlRnJvbVN0YXRlKHN0ZDo6bW92ZShzZXNzaW9uU3RhdGUuYmFja0ZvcndhcmRMaXN0U3RhdGUp KTsKKwogICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGVudHJ5IDogbV9iYWNrRm9yd2FyZExpc3Qt PmVudHJpZXMoKSkKICAgICAgICAgICAgIHByb2Nlc3MoKS5yZWdpc3Rlck5ld1dlYkJhY2tGb3J3 YXJkTGlzdEl0ZW0oZW50cnkuZ2V0KCkpOwogCi0gICAgICAgIExlZ2FjeVNlc3Npb25TdGF0ZSBz dGF0ZShtX2JhY2tGb3J3YXJkTGlzdC0+ZW50cmllcygpLCBtX2JhY2tGb3J3YXJkTGlzdC0+Y3Vy cmVudEluZGV4KCkpOwotICAgICAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 UmVzdG9yZVNlc3Npb24oc3RhdGUpLCBtX3BhZ2VJRCk7CisgICAgICAgIHByb2Nlc3MoKS5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpSZXN0b3JlU2Vzc2lvbihtX2JhY2tGb3J3YXJkTGlzdC0+aXRl bVN0YXRlcygpKSwgbV9wYWdlSUQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBOYXZpZ2F0aW5n IHNob3VsZCBiZSBzZXBhcmF0ZSBmcm9tIHN0YXRlIHJlc3RvcmF0aW9uLgpAQCAtNDQyMCw3ICs0 NDIwLDcgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9u UGFyYW1ldGVycygpCiAgICAgcGFyYW1ldGVycy5wYWdlTGVuZ3RoID0gbV9wYWdlTGVuZ3RoOwog ICAgIHBhcmFtZXRlcnMuZ2FwQmV0d2VlblBhZ2VzID0gbV9nYXBCZXR3ZWVuUGFnZXM7CiAgICAg cGFyYW1ldGVycy51c2VyQWdlbnQgPSB1c2VyQWdlbnQoKTsKLSAgICBwYXJhbWV0ZXJzLnNlc3Np b25TdGF0ZSA9IExlZ2FjeVNlc3Npb25TdGF0ZShtX2JhY2tGb3J3YXJkTGlzdC0+ZW50cmllcygp LCBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEluZGV4KCkpOworICAgIHBhcmFtZXRlcnMuaXRl bVN0YXRlcyA9IG1fYmFja0ZvcndhcmRMaXN0LT5pdGVtU3RhdGVzKCk7CiAgICAgcGFyYW1ldGVy cy5zZXNzaW9uSUQgPSBtX3Nlc3Npb24tPmdldElEKCk7CiAgICAgcGFyYW1ldGVycy5oaWdoZXN0 VXNlZEJhY2tGb3J3YXJkSXRlbUlEID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6aGlnaGVkVXNl ZEl0ZW1JRCgpOwogICAgIHBhcmFtZXRlcnMudXNlckNvbnRlbnRDb250cm9sbGVySUQgPSBtX3Vz ZXJDb250ZW50Q29udHJvbGxlciA/IG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5pZGVudGlmaWVy KCkgOiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CmluZGV4IDljYjczOTMxZjdlNjRlNjEyMTY3YTUyMjMzNjA3Y2YzOGUzYWRhZGMuLmY2MGJjZTY0 YzEyNjRjZjM3Y2IzYjI3MDM4YTZjODkwOGI3NWE0ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTQzNyw4ICs0MzcsOCBAQCBXZWJQYWdl OjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cyYgcGFyYW1ldGVycykKIAogICAgIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjpzZXRIaWdoZXN0 SXRlbUlERnJvbVVJUHJvY2VzcyhwYXJhbWV0ZXJzLmhpZ2hlc3RVc2VkQmFja0ZvcndhcmRJdGVt SUQpOwogICAgIAotICAgIGlmICghcGFyYW1ldGVycy5zZXNzaW9uU3RhdGUuaXNFbXB0eSgpKQot ICAgICAgICByZXN0b3JlU2Vzc2lvbihwYXJhbWV0ZXJzLnNlc3Npb25TdGF0ZSk7CisgICAgaWYg KCFwYXJhbWV0ZXJzLml0ZW1TdGF0ZXMuaXNFbXB0eSgpKQorICAgICAgICByZXN0b3JlU2Vzc2lv bihwYXJhbWV0ZXJzLml0ZW1TdGF0ZXMpOwogCiAgICAgaWYgKHBhcmFtZXRlcnMuc2Vzc2lvbklE LmlzVmFsaWQoKSkKICAgICAgICAgc2V0U2Vzc2lvbklEKHBhcmFtZXRlcnMuc2Vzc2lvbklEKTsK QEAgLTE5NTcsNDAgKzE5NTcsMTAgQEAgdm9pZCBXZWJQYWdlOjpleGVjdXRlRWRpdENvbW1hbmQo Y29uc3QgU3RyaW5nJiBjb21tYW5kTmFtZSkKICAgICBleGVjdXRlRWRpdGluZ0NvbW1hbmQoY29t bWFuZE5hbWUsIFN0cmluZygpKTsKIH0KIAotdWludDY0X3QgV2ViUGFnZTo6cmVzdG9yZVNlc3Np b24oY29uc3QgTGVnYWN5U2Vzc2lvblN0YXRlJiBzZXNzaW9uU3RhdGUpCit2b2lkIFdlYlBhZ2U6 OnJlc3RvcmVTZXNzaW9uKGNvbnN0IFZlY3RvcjxCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+JiBp dGVtU3RhdGVzKQogewotICAgIGNvbnN0IEJhY2tGb3J3YXJkTGlzdEl0ZW1WZWN0b3ImIGxpc3Qg PSBzZXNzaW9uU3RhdGUubGlzdCgpOwotICAgIHNpemVfdCBzaXplID0gbGlzdC5zaXplKCk7Ci0g ICAgdWludDY0X3QgY3VycmVudEl0ZW1JRCA9IDA7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBzaXplOyArK2kpIHsKLSAgICAgICAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogd2ViSXRlbSA9 IGxpc3RbaV0uZ2V0KCk7Ci0KLSAgICAgICAgUGFnZVN0YXRlIHBhZ2VTdGF0ZTsKLSAgICAgICAg cGFnZVN0YXRlLnRpdGxlID0gd2ViSXRlbS0+dGl0bGUoKTsKLSAgICAgICAgcGFnZVN0YXRlLm1h aW5GcmFtZVN0YXRlLnVybFN0cmluZyA9IHdlYkl0ZW0tPnVybCgpOwotICAgICAgICBwYWdlU3Rh dGUubWFpbkZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmcgPSB3ZWJJdGVtLT5vcmlnaW5hbFVS TCgpOwotCi0gICAgICAgIFJlZlB0cjxBUEk6OkRhdGE+IGJhY2tGb3J3YXJkRGF0YSA9IHdlYkl0 ZW0tPmJhY2tGb3J3YXJkRGF0YSgpOwotICAgICAgICBpZiAoIWRlY29kZUxlZ2FjeVNlc3Npb25I aXN0b3J5RW50cnlEYXRhKGJhY2tGb3J3YXJkRGF0YS0+Ynl0ZXMoKSwgYmFja0ZvcndhcmREYXRh LT5zaXplKCksIHBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZSkpIHsKLSAgICAgICAgICAgIExPR19F UlJPUigiRmFpbGVkIHRvIGRlY29kZSBwYWdlIHN0YXRlLiIpOwotICAgICAgICAgICAgcmV0dXJu IDA7Ci0gICAgICAgIH0KLQotICAgICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IGl0ZW0gPSB0b0hp c3RvcnlJdGVtKHBhZ2VTdGF0ZSk7Ci0KLSAgICAgICAgaWYgKGkgPT0gc2Vzc2lvblN0YXRlLmN1 cnJlbnRJbmRleCgpKQotICAgICAgICAgICAgY3VycmVudEl0ZW1JRCA9IHdlYkl0ZW0tPml0ZW1J RCgpOwotICAgICAgICAKLSAgICAgICAgV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6OmFkZEl0ZW1G cm9tVUlQcm9jZXNzKGxpc3RbaV0tPml0ZW1JRCgpLCBpdGVtLnJlbGVhc2UoKSk7Ci0gICAgfSAg ICAKLSAgICBBU1NFUlQoY3VycmVudEl0ZW1JRCk7Ci0gICAgcmV0dXJuIGN1cnJlbnRJdGVtSUQ7 Ci19Ci0KLXZvaWQgV2ViUGFnZTo6cmVzdG9yZVNlc3Npb25BbmROYXZpZ2F0ZVRvQ3VycmVudEl0 ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBMZWdhY3lTZXNzaW9uU3RhdGUmIHNlc3Np b25TdGF0ZSkKLXsKLSAgICBpZiAodWludDY0X3QgY3VycmVudEl0ZW1JRCA9IHJlc3RvcmVTZXNz aW9uKHNlc3Npb25TdGF0ZSkpCi0gICAgICAgIGdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlv bklELCBjdXJyZW50SXRlbUlEKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGl0ZW1TdGF0ZSA6IGl0 ZW1TdGF0ZXMpCisgICAgICAgIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjphZGRJdGVtRnJvbVVJ UHJvY2VzcyhpdGVtU3RhdGUuaWRlbnRpZmllciwgdG9IaXN0b3J5SXRlbShpdGVtU3RhdGUucGFn ZVN0YXRlKSk7CiB9CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMzAwMzcxNzZhZjVhZDFiZDc0ZGRi YjNiOWJkNDg1ODBkYzgxMjE1YS4uYzk3ZWExZDk0NTkyNTAwYjQzNzYyNjhlODBiODM3NDY2MTJi OTEyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBA IC0xNDAsNyArMTQwLDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIERyYXdpbmdBcmVh OwogY2xhc3MgSW5qZWN0ZWRCdW5kbGVCYWNrRm9yd2FyZExpc3Q7Ci1jbGFzcyBMZWdhY3lTZXNz aW9uU3RhdGU7CiBjbGFzcyBOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXI7CiBj bGFzcyBQYWdlQmFubmVyOwogY2xhc3MgUGFnZU92ZXJsYXk7CkBAIC0xNjgsNiArMTY3LDcgQEAg Y2xhc3MgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjsKIGNsYXNzIFdlYldoZWVsRXZlbnQ7CiBz dHJ1Y3QgQXNzaXN0ZWROb2RlSW5mb3JtYXRpb247CiBzdHJ1Y3QgQXR0cmlidXRlZFN0cmluZzsK K3N0cnVjdCBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU7CiBzdHJ1Y3QgRWRpdGluZ1JhbmdlOwog c3RydWN0IEVkaXRvclN0YXRlOwogc3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uOwpAQCAtOTIzLDkgKzkyMyw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxvYWRVUkxJbkZy YW1lKGNvbnN0IFN0cmluZyYsIHVpbnQ2NF90IGZyYW1lSUQpOwogCi0gICAgdWludDY0X3QgcmVz dG9yZVNlc3Npb24oY29uc3QgTGVnYWN5U2Vzc2lvblN0YXRlJik7Ci0gICAgdm9pZCByZXN0b3Jl U2Vzc2lvbkFuZE5hdmlnYXRlVG9DdXJyZW50SXRlbSh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNv bnN0IExlZ2FjeVNlc3Npb25TdGF0ZSYpOwotCisgICAgdm9pZCByZXN0b3JlU2Vzc2lvbihjb25z dCBWZWN0b3I8QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlPiYpOwogICAgIHZvaWQgZGlkUmVtb3Zl QmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90KTsKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9S KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbgppbmRleCAxYzk0N2I4ZDRhOWRhYTVlYjRhN2U2MzgxMzA0MmIxY2Q4NmRkMDYz Li5kODA3OTc1NTQ4MDFiMDY1OWU2YWIyZTgwN2YyMzdiYTQyMzc2ZTFmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpA QCAtMTI5LDggKzEyOSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewog CiAgICAgU3RvcExvYWRpbmdGcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogICAgIAotICAgIFJlc3Rv cmVTZXNzaW9uKFdlYktpdDo6TGVnYWN5U2Vzc2lvblN0YXRlIHN0YXRlKQotICAgIFJlc3RvcmVT ZXNzaW9uQW5kTmF2aWdhdGVUb0N1cnJlbnRJdGVtKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2Vi S2l0OjpMZWdhY3lTZXNzaW9uU3RhdGUgc3RhdGUpCisgICAgUmVzdG9yZVNlc3Npb24oVmVjdG9y PFdlYktpdDo6QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlPiBpdGVtU3RhdGVzKQogCiAgICAgRGlk UmVtb3ZlQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQogCg==