134526 2014-07-01 16:58:15 -0700 WKPageRestoreFromSessionState should use the new session state restore code path 2014-07-01 17:08:35 -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 1019834 0 andersca 2014-07-01 16:58:15 -0700 WKPageRestoreFromSessionState should use the new session state restore code path 1019838 1 234221 andersca 2014-07-01 17:00:09 -0700 Created attachment 234221 Patch 1019845 2 234221 thorton 2014-07-01 17:04:31 -0700 Comment on attachment 234221 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234221&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:1884 > + if (hasBackForwardList) { early return? 1019846 3 andersca 2014-07-01 17:08:35 -0700 Committed r170679: <http://trac.webkit.org/changeset/170679> 234221 2014-07-01 17:00:09 -0700 2014-07-01 17:04:30 -0700 Patch bug-134526-20140701165950.patch text/plain 5529 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWI4M2Y4ZmNlYTY1MDg0 ZmQyNTljMDliMjc3OWM2NWVmNjQwM2UwZi4uMTNiYmM0OGVjZTlmMWM4MDQ2NTQ3NmNlMzdhZThh ZmY0YmE2ZWZhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA3LTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgV0tQYWdlUmVzdG9y ZUZyb21TZXNzaW9uU3RhdGUgc2hvdWxkIHVzZSB0aGUgbmV3IHNlc3Npb24gc3RhdGUgcmVzdG9y ZSBjb2RlIHBhdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDUyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VSZXN0b3Jl RnJvbVNlc3Npb25TdGF0ZSk6CisgICAgICAgIFVzZSB0aGUgbmV3IGNvZGUgcGF0aC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnJlc3RvcmVGcm9tU3RhdGUpOgorICAgICAgICBPbmx5IHJlc3RvcmUgdGhlIGJh Y2stZm9yd2FyZCBzdGF0ZSBpZiB3ZSBoYXZlIGEgYmFjay1mb3J3YXJkIGxpc3QuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHA6CisgICAgICAg IChXZWJLaXQ6OmVuY29kZVNlc3Npb25IaXN0b3J5KToKKyAgICAgICAgU2F2ZSB0aGUgb3JpZ2lu YWwgVVJMIHN0cmluZyBhcyB3ZWxsLgorCisgICAgICAgIChXZWJLaXQ6OmRlY29kZVYxU2Vzc2lv bkhpc3RvcnkpOgorICAgICAgICBJZiB3ZSBkb24ndCBoYXZlIGEgY3VycmVudCBpbmRleCwgc2V0 IGl0IHRvIE51bGxvcHQgaW5zdGVhZCBvZiAwLgorCiAyMDE0LTA3LTAxICBEYW4gQmVybnN0ZWlu ICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gV2ViRG9jdW1lbnRMb2FkZXI6 OnNldE5hdmlnYXRpb25JRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNw cAppbmRleCAzMjE2NjAyZmMzZGZiODAxNjg3OTM4OGFjZDM5YzhjMjllNDAwNjM2Li45YmMxMzBm NTQ5MzNiMmI5MzA2NDhjZTQ1ZTQ3ZWYxOGVlZTAxNmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcApAQCAtMzY5LDcgKzM2OSwxMSBAQCBXS0RhdGFSZWYgV0tQ YWdlQ29weVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZVJlZiwgdm9pZCAqY29udGV4dCwgV0tQ YWdlU2Vzc2lvbgogCiB2b2lkIFdLUGFnZVJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFdLUGFnZVJl ZiBwYWdlUmVmLCBXS0RhdGFSZWYgc2Vzc2lvblN0YXRlRGF0YSkKIHsKLSAgICB0b0ltcGwocGFn ZVJlZiktPnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlRGF0YSh0b0ltcGwoc2Vzc2lvblN0YXRlRGF0 YSkpOworICAgIFNlc3Npb25TdGF0ZSBzZXNzaW9uU3RhdGU7CisgICAgaWYgKCFkZWNvZGVMZWdh Y3lTZXNzaW9uU3RhdGUoKnRvSW1wbChzZXNzaW9uU3RhdGVEYXRhKSwgc2Vzc2lvblN0YXRlKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgdG9JbXBsKHBhZ2VSZWYpLT5yZXN0b3JlRnJvbVN0YXRl KHN0ZDo6bW92ZShzZXNzaW9uU3RhdGUpKTsKIH0KIAogZG91YmxlIFdLUGFnZUdldFRleHRab29t RmFjdG9yKFdLUGFnZVJlZiBwYWdlUmVmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAppbmRleCAwODM2ZTc2NTY4ZDk2OTBhODhkZDU1MTQ0MDU1ZmY1YTU2MGJlMTQ0 Li5lYTM0YTIyNDBkNmIxMGQ3ZjM2MjE0OGIzZGI3YzYwNzVhNWJiODRkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTg2NSwxOCArMTg2NSwyNiBAQCBT ZXNzaW9uU3RhdGUgV2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGUoY29uc3Qgc3RkOjpmdW5jdGlv bjxib29sIChXZWJCYWNrRm9yd2FyZAogCiB1aW50NjRfdCBXZWJQYWdlUHJveHk6OnJlc3RvcmVG cm9tU3RhdGUoU2Vzc2lvblN0YXRlIHNlc3Npb25TdGF0ZSkKIHsKLSAgICBtX2JhY2tGb3J3YXJk TGlzdC0+cmVzdG9yZUZyb21TdGF0ZShzdGQ6Om1vdmUoc2Vzc2lvblN0YXRlLmJhY2tGb3J3YXJk TGlzdFN0YXRlKSk7CisgICAgYm9vbCBoYXNCYWNrRm9yd2FyZExpc3QgPSAhIXNlc3Npb25TdGF0 ZS5iYWNrRm9yd2FyZExpc3RTdGF0ZS5jdXJyZW50SW5kZXg7CiAKLSAgICBMZWdhY3lTZXNzaW9u U3RhdGUgc3RhdGUobV9iYWNrRm9yd2FyZExpc3QtPmVudHJpZXMoKSwgbV9iYWNrRm9yd2FyZExp c3QtPmN1cnJlbnRJbmRleCgpKTsKLSAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6UmVzdG9yZVNlc3Npb24oc3RhdGUpLCBtX3BhZ2VJRCk7CisgICAgaWYgKGhhc0JhY2tGb3J3 YXJkTGlzdCkgeworICAgICAgICBtX2JhY2tGb3J3YXJkTGlzdC0+cmVzdG9yZUZyb21TdGF0ZShz dGQ6Om1vdmUoc2Vzc2lvblN0YXRlLmJhY2tGb3J3YXJkTGlzdFN0YXRlKSk7CisgICAgICAgIGZv ciAoY29uc3QgYXV0byYgZW50cnkgOiBtX2JhY2tGb3J3YXJkTGlzdC0+ZW50cmllcygpKQorICAg ICAgICAgICAgcHJvY2VzcygpLnJlZ2lzdGVyTmV3V2ViQmFja0ZvcndhcmRMaXN0SXRlbShlbnRy eS5nZXQoKSk7CisKKyAgICAgICAgTGVnYWN5U2Vzc2lvblN0YXRlIHN0YXRlKG1fYmFja0Zvcndh cmRMaXN0LT5lbnRyaWVzKCksIG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SW5kZXgoKSk7Cisg ICAgICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpSZXN0b3JlU2Vzc2lvbihz dGF0ZSksIG1fcGFnZUlEKTsKKyAgICB9CiAKICAgICAvLyBGSVhNRTogTmF2aWdhdGluZyBzaG91 bGQgYmUgc2VwYXJhdGUgZnJvbSBzdGF0ZSByZXN0b3JhdGlvbi4KIAogICAgIGlmICghc2Vzc2lv blN0YXRlLnByb3Zpc2lvbmFsVVJMLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gbG9hZFJlcXVl c3Qoc2Vzc2lvblN0YXRlLnByb3Zpc2lvbmFsVVJMKTsKIAotICAgIGlmIChXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtKiBpdGVtID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpCi0gICAg ICAgIHJldHVybiBnb1RvQmFja0ZvcndhcmRJdGVtKGl0ZW0pOworICAgIGlmIChoYXNCYWNrRm9y d2FyZExpc3QpIHsKKyAgICAgICAgaWYgKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIGl0ZW0gPSBt X2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKKyAgICAgICAgICAgIHJldHVybiBnb1Rv QmFja0ZvcndhcmRJdGVtKGl0ZW0pOworICAgIH0KIAogICAgIHJldHVybiAwOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2Rp bmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVD b2RpbmcuY3BwCmluZGV4IGM3ZWQ3OWIxODM1NDFkYWQ0ZmM5YzdiOTZlZTg3ZTRiMTE1YzM1MWMu Ljg5MDU1N2E3NWU1NzRmZWJlYTE1ZjI2MjAxYjkxNzFjNGJkNjhlYzQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGlu Zy5jcHAKQEAgLTQzNyw3ICs0MzcsNyBAQCBzdGF0aWMgUmV0YWluUHRyPENGRGljdGlvbmFyeVJl Zj4gZW5jb2RlU2Vzc2lvbkhpc3RvcnkoY29uc3QgQmFja0ZvcndhcmRMaXN0U3RhdAogICAgICAg ICBhdXRvIG9yaWdpbmFsVVJMID0gaXRlbS5wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUub3JpZ2lu YWxVUkxTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsKICAgICAgICAgYXV0byBkYXRhID0gZW5jb2Rl U2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoaXRlbS5wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUpOwog Ci0gICAgICAgIGF1dG8gZW50cnlEaWN0aW9uYXJ5ID0gY3JlYXRlRGljdGlvbmFyeSh7IHsgc2Vz c2lvbkhpc3RvcnlFbnRyeVVSTEtleSwgdXJsLmdldCgpIH0sIHsgc2Vzc2lvbkhpc3RvcnlFbnRy eVRpdGxlS2V5LCB0aXRsZS5nZXQoKSB9LCB7IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5LCBk YXRhLmdldCgpIH0sIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVNuYXBzaG90VVVJREtleSwgaXRlbS5z bmFwc2hvdFVVSUQuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSB9fSk7CisgICAgICAgIGF1dG8gZW50 cnlEaWN0aW9uYXJ5ID0gY3JlYXRlRGljdGlvbmFyeSh7IHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVVS TEtleSwgdXJsLmdldCgpIH0sIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVRpdGxlS2V5LCB0aXRsZS5n ZXQoKSB9LCB7IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtleSwgb3JpZ2luYWxVUkwu Z2V0KCkgfSwgeyBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YUtleSwgZGF0YS5nZXQoKSB9LCB7IHNl c3Npb25IaXN0b3J5RW50cnlTbmFwc2hvdFVVSURLZXksIGl0ZW0uc25hcHNob3RVVUlELmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCkgfX0pOwogCiAgICAgICAgIENGQXJyYXlBcHBlbmRWYWx1ZShlbnRy aWVzLmdldCgpLCBlbnRyeURpY3Rpb25hcnkuZ2V0KCkpOwogICAgIH0KQEAgLTEwMjIsNyArMTAy Miw3IEBAIHN0YXRpYyBib29sIGRlY29kZVYxU2Vzc2lvbkhpc3RvcnkoQ0ZEaWN0aW9uYXJ5UmVm IHNlc3Npb25IaXN0b3J5RGljdGlvbmFyeSwgQmFjCiAgICAgYXV0byBjdXJyZW50SW5kZXhOdW1i ZXIgPSBkeW5hbWljX2NmX2Nhc3Q8Q0ZOdW1iZXJSZWY+KENGRGljdGlvbmFyeUdldFZhbHVlKHNl c3Npb25IaXN0b3J5RGljdGlvbmFyeSwgc2Vzc2lvbkhpc3RvcnlDdXJyZW50SW5kZXhLZXkpKTsK ICAgICBpZiAoIWN1cnJlbnRJbmRleE51bWJlcikgewogICAgICAgICAvLyBObyBjdXJyZW50IGlu ZGV4IG1lYW5zIHRoZSBkaWN0aW9uYXJ5IHJlcHJlc2VudHMgYW4gZW1wdHkgc2Vzc2lvbi4KLSAg ICAgICAgYmFja0ZvcndhcmRMaXN0U3RhdGUuY3VycmVudEluZGV4ID0gMDsKKyAgICAgICAgYmFj a0ZvcndhcmRMaXN0U3RhdGUuY3VycmVudEluZGV4ID0gTnVsbG9wdDsKICAgICAgICAgYmFja0Zv cndhcmRMaXN0U3RhdGUuaXRlbXMgPSB7IH07CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K