134509 2014-07-01 13:54:17 -0700 Add a function for restoring page state given a SessionState object 2014-07-01 14:08:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1019746 0 andersca 2014-07-01 13:54:17 -0700 Add a function for restoring page state given a SessionState object 1019747 1 234194 andersca 2014-07-01 13:54:48 -0700 Created attachment 234194 Patch 1019749 2 andersca 2014-07-01 14:08:02 -0700 Committed r170664: <http://trac.webkit.org/changeset/170664> 234194 2014-07-01 13:54:48 -0700 2014-07-01 13:58:50 -0700 Patch bug-134509-20140701135428.patch text/plain 5186 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTNjMDQ4ZDM3NGMwYzk4 YjgxMGM4NjVlYmQwYWEyZGEzYjYzOTI2NS4uMTJkNjM5OTc1MmNkMTlmMWIzMjhkODljZTdhZWFj MDI5N2YxODliZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTA3LTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgZnVuY3Rp b24gZm9yIHJlc3RvcmluZyBwYWdlIHN0YXRlIGdpdmVuIGEgU2Vzc2lvblN0YXRlIG9iamVjdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTA5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQv V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjppdGVtU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJCYWNrRm9yd2Fy ZExpc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3Q6OnNhdmVTdGF0 ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNhdmVTdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCisy MDE0LTA3LTAxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAg ICAgRml4IGJ1aWxkLgogCiAgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlz dEl0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgK aW5kZXggZWFlNTA0MDEzM2FhMjEzYmI0MzJhYWU1NGFjMDUwYTViODJjZDViZC4uZjBkM2ZmZjE4 YjczMmRkM2I5OGZiM2RjNjI3ZDlkY2E4MDFmZjhhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCkBAIC01NCw2ICs1NCw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIH5XZWJCYWNrRm9yd2FyZExpc3RJdGVtKCk7CiAKICAgICB1aW50NjRfdCBp dGVtSUQoKSBjb25zdCB7IHJldHVybiBtX2l0ZW1JRDsgfQorICAgIGNvbnN0IEJhY2tGb3J3YXJk TGlzdEl0ZW1TdGF0ZSYgaXRlbVN0YXRlKCkgeyByZXR1cm4gbV9pdGVtU3RhdGU7IH0KIAogICAg IHZvaWQgc2V0UGFnZVN0YXRlKFBhZ2VTdGF0ZSBwYWdlU3RhdGUpIHsgbV9pdGVtU3RhdGUucGFn ZVN0YXRlID0gc3RkOjptb3ZlKHBhZ2VTdGF0ZSk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcAppbmRleCA2MzY4MzhiMDViM2M2ZGVjOTRh Y2U4ZjVhYzE2OTVjZWU2Y2E3YTY0Li5lMzFhZDlkMmMzMzE1NmE5NWFhM2RlZmM5N2ViNzI5NjZl OGEwZGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0Zvcndh cmRMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRM aXN0LmNwcApAQCAtMzgwLDYgKzM4MCwzMCBAQCB2b2lkIFdlYkJhY2tGb3J3YXJkTGlzdDo6Y2xl YXIoKQogICAgIG1fcGFnZS0+ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KG51bGxwdHIsIHN0ZDo6 bW92ZShyZW1vdmVkSXRlbXMpKTsKIH0KIAorQmFja0ZvcndhcmRMaXN0U3RhdGUgV2ViQmFja0Zv cndhcmRMaXN0OjpzYXZlU3RhdGUoY29uc3Qgc3RkOjpmdW5jdGlvbjxib29sIChXZWJCYWNrRm9y d2FyZExpc3RJdGVtJik+JiBmaWx0ZXIpIGNvbnN0Cit7CisgICAgQVNTRVJUKCFtX2hhc0N1cnJl bnRJbmRleCB8fCBtX2N1cnJlbnRJbmRleCA8IG1fZW50cmllcy5zaXplKCkpOworCisgICAgQmFj a0ZvcndhcmRMaXN0U3RhdGUgYmFja0ZvcndhcmRMaXN0U3RhdGU7CisgICAgaWYgKG1faGFzQ3Vy cmVudEluZGV4KQorICAgICAgICBiYWNrRm9yd2FyZExpc3RTdGF0ZS5jdXJyZW50SW5kZXggPSBt X2N1cnJlbnRJbmRleDsKKworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9lbnRyaWVzLnNp emUoKTsgKytpKSB7CisgICAgICAgIGF1dG8mIGVudHJ5ID0gKm1fZW50cmllc1tpXTsKKworICAg ICAgICBpZiAoZmlsdGVyICYmICFmaWx0ZXIoZW50cnkpKSB7CisgICAgICAgICAgICBpZiAoYmFj a0ZvcndhcmRMaXN0U3RhdGUuY3VycmVudEluZGV4ICYmIGkgPD0gYmFja0ZvcndhcmRMaXN0U3Rh dGUuY3VycmVudEluZGV4LnZhbHVlKCkpCisgICAgICAgICAgICAgICAgLS1iYWNrRm9yd2FyZExp c3RTdGF0ZS5jdXJyZW50SW5kZXgudmFsdWUoKTsKKworICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgIH0KKworICAgICAgICBiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcy5hcHBlbmQoZW50 cnkuaXRlbVN0YXRlKCkpOworICAgIH0KKworICAgIHJldHVybiBiYWNrRm9yd2FyZExpc3RTdGF0 ZTsKK30KKwogdm9pZCBXZWJCYWNrRm9yd2FyZExpc3Q6OnJlc3RvcmVGcm9tU3RhdGUoQmFja0Zv cndhcmRMaXN0U3RhdGUgYmFja0ZvcndhcmRMaXN0U3RhdGUpCiB7CiAgICAgVmVjdG9yPFJlZlB0 cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPj4gaXRlbXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmgKaW5kZXggNjZmMTE1ZTk2Y2VhMjExNDVkMGViOWUw ODQ0OTQwNjRiMGU5NTJhYS4uZTkwMWFkYzc0ZjZhOWE3NTA0ZTgxMzVjZDY2ZGIyNWE3ZTM5ZmQy NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlz dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuaApA QCAtNzksNiArNzksNyBAQCBwdWJsaWM6CiAgICAgYm9vbCByZXN0b3JlRnJvbVYxQ0ZEaWN0aW9u YXJ5UmVwcmVzZW50YXRpb24oQ0ZEaWN0aW9uYXJ5UmVmKTsKICNlbmRpZgogCisgICAgQmFja0Zv cndhcmRMaXN0U3RhdGUgc2F2ZVN0YXRlKGNvbnN0IHN0ZDo6ZnVuY3Rpb248Ym9vbCAoV2ViQmFj a0ZvcndhcmRMaXN0SXRlbSYpPiYpIGNvbnN0OwogICAgIHZvaWQgcmVzdG9yZUZyb21TdGF0ZShC YWNrRm9yd2FyZExpc3RTdGF0ZSk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGYwMGM0OTA3NGY1NDMyNGU3YjRhYTNiZTg1NzJjYTJm M2U0YzE1OGMuLmJjOWJkNGNjNjk2ZTI4NTJjNGM4MTI1NzJlMDE5ZDA0MDI1OTJiNmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xODQ2LDYgKzE4NDYs MjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlRGF0YShBUEk6 OkRhdGEqKQogfQogI2VuZGlmCiAKK1Nlc3Npb25TdGF0ZSBXZWJQYWdlUHJveHk6OnNhdmVTdGF0 ZShjb25zdCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKT4mIGZp bHRlcikgY29uc3QKK3sKKyAgICBTZXNzaW9uU3RhdGUgc2Vzc2lvblN0YXRlOworCisgICAgc2Vz c2lvblN0YXRlLmJhY2tGb3J3YXJkTGlzdFN0YXRlID0gbV9iYWNrRm9yd2FyZExpc3QtPnNhdmVT dGF0ZShmaWx0ZXIpOworCisgICAgU3RyaW5nIHByb3Zpc2lvbmFsVVJMU3RyaW5nID0gbV9wYWdl TG9hZFN0YXRlLnBlbmRpbmdBUElSZXF1ZXN0VVJMKCk7CisgICAgaWYgKHByb3Zpc2lvbmFsVVJM U3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcHJvdmlzaW9uYWxVUkxTdHJpbmcgPSBtX3BhZ2VM b2FkU3RhdGUucHJvdmlzaW9uYWxVUkwoKTsKKworICAgIHNlc3Npb25TdGF0ZS5wcm92aXNpb25h bFVSTCA9IFVSTChVUkwoKSwgcHJvdmlzaW9uYWxVUkxTdHJpbmcpOworCisgICAgcmV0dXJuIHNl c3Npb25TdGF0ZTsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU3RhdGUoU2Vz c2lvblN0YXRlIHNlc3Npb25TdGF0ZSkKIHsKICAgICBtX2JhY2tGb3J3YXJkTGlzdC0+cmVzdG9y ZUZyb21TdGF0ZShzdGQ6Om1vdmUoc2Vzc2lvblN0YXRlLmJhY2tGb3J3YXJkTGlzdFN0YXRlKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggYTVkZGU5MjZjOTUw MDU2NDY1N2MwZmNhMzIyZTVlZDY1YTZjYjk4YS4uZGQ0ZmVjMjQ1NjhkNGZiNTEwMWNiZGIwYjBh Yzc4MmQzY2ZmOGFlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApA QCAtNTUwLDYgKzU1MCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgdGVybWluYXRlUHJvY2Vzcygp OwogCisgICAgU2Vzc2lvblN0YXRlIHNhdmVTdGF0ZShjb25zdCBzdGQ6OmZ1bmN0aW9uPGJvb2wg KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKT4mKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEFQSTo6 RGF0YT4gc2Vzc2lvblN0YXRlRGF0YShzdGQ6OmZ1bmN0aW9uPGJvb2wgKFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mKT4pIGNvbnN0OwogICAgIHZvaWQgcmVzdG9yZUZyb21TZXNzaW9uU3RhdGVEYXRh KEFQSTo6RGF0YSopOwogICAgIHZvaWQgcmVzdG9yZUZyb21TdGF0ZShTZXNzaW9uU3RhdGUpOwo=