134161 2014-06-21 12:26:52 -0700 Begin work on decoding the back/forward tree 2014-06-21 12:41:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1017318 0 andersca 2014-06-21 12:26:52 -0700 Begin work on decoding the back/forward tree 1017319 1 233541 andersca 2014-06-21 12:27:32 -0700 Created attachment 233541 Patch 1017320 2 andersca 2014-06-21 12:41:56 -0700 Committed r170250: <http://trac.webkit.org/changeset/170250> 233541 2014-06-21 12:27:32 -0700 2014-06-21 12:31:11 -0700 Patch bug-134161-20140621122710.patch text/plain 7178 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDc3ZjZkYTZmZDJlMjhm OWY3ZDQ1YmE1ODA5MGFlNzRlZTQ0ZjdmNC4uYTdjNzYyYzJiNjJlYTI4NGY1MTcxNTBkZjliY2E4 ZDY1YTgwZmI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA2LTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQmVnaW4gd29yayBv biBkZWNvZGluZyB0aGUgYmFjay9mb3J3YXJkIHRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDE2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3Rh dGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpMZWdhY3lTZXNzaW9uU3RhdGVEZWNvZGVy OjpkZWNvZGVTZXNzaW9uSGlzdG9yeUVudHJpZXMpOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5 RW50cnlEYXRhRGVjb2Rlcjo6b3BlcmF0b3I+Pik6CisgICAgICAgIChXZWJLaXQ6Okhpc3RvcnlF bnRyeURhdGFEZWNvZGVyOjpkZWNvZGVBcml0aG1ldGljVHlwZSk6CisgICAgICAgIChXZWJLaXQ6 Okhpc3RvcnlFbnRyeURhdGFEZWNvZGVyOjpidWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluKToK KyAgICAgICAgKFdlYktpdDo6ZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZSk6CisgICAgICAgIChX ZWJLaXQ6OkxlZ2FjeVNlc3Npb25TdGF0ZURlY29kZXI6OmRlY29kZVNlc3Npb25IaXN0b3J5RW50 cnlEYXRhKToKKyAgICAgICAgKFdlYktpdDo6SGlzdG9yeUVudHJ5RGF0YURlY29kZXI6OmRlY29k ZSk6IERlbGV0ZWQuCisKIDIwMTQtMDYtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgbW9yZSBvZiBIaXN0b3J5RW50cnlEYXRhRGVj b2RlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNz aW9uU3RhdGVDb2RpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lT ZXNzaW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IGM3NGQyYjBlMDMyY2E2NGU1OGQ2MTVmODAyNWEw ZGJjZmFmMzNkMTkuLmM2N2RiYTFlNWJkZGNhNWUzMTFhYmU0MjdlY2ZkOTM5ZTE4Mjg3OGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRl Q29kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Np b25TdGF0ZUNvZGluZy5jcHAKQEAgLTE2Nyw3ICsxNjcsNyBAQCBib29sIExlZ2FjeVNlc3Npb25T dGF0ZURlY29kZXI6OmRlY29kZVNlc3Npb25IaXN0b3J5RW50cmllcyhDRkFycmF5UmVmIGVudHJp ZXNBcgogICAgICAgICBlbnRyaWVzLmFwcGVuZChzdGQ6Om1vdmUoZW50cnkpKTsKICAgICB9CiAK LSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIGJvb2wgTGVnYWN5U2Vz c2lvblN0YXRlRGVjb2Rlcjo6ZGVjb2RlU2Vzc2lvbkhpc3RvcnlFbnRyeShDRkRpY3Rpb25hcnlS ZWYgZW50cnlEaWN0aW9uYXJ5LCBQYWdlU3RhdGUmIHBhZ2VTdGF0ZSkgY29uc3QKQEAgLTIwOSwy NCArMjA5LDc5IEBAIHB1YmxpYzoKICAgICAgICAgKnRoaXMgPj4gdmFsdWU7CiAgICAgfQogCi0g ICAgSGlzdG9yeUVudHJ5RGF0YURlY29kZXImIG9wZXJhdG9yPj4odWludDY0X3QmIHZhbHVlKQor ICAgIEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBvcGVyYXRvcj4+KGJvb2wmIHZhbHVlKQogICAg IHsKLSAgICAgICAgdmFsdWUgPSAwOwotICAgICAgICByZXR1cm4gZGVjb2RlKHZhbHVlKTsKKyAg ICAgICAgcmV0dXJuIGRlY29kZUFyaXRobWV0aWNUeXBlKHZhbHVlKTsKICAgICB9CiAKICAgICBI aXN0b3J5RW50cnlEYXRhRGVjb2RlciYgb3BlcmF0b3I+Pih1aW50MzJfdCYgdmFsdWUpCiAgICAg ewotICAgICAgICB2YWx1ZSA9IDA7Ci0gICAgICAgIHJldHVybiBkZWNvZGUodmFsdWUpOworICAg ICAgICByZXR1cm4gZGVjb2RlQXJpdGhtZXRpY1R5cGUodmFsdWUpOworICAgIH0KKworICAgIEhp c3RvcnlFbnRyeURhdGFEZWNvZGVyJiBvcGVyYXRvcj4+KGludDMyX3QmIHZhbHVlKQorICAgIHsK KyAgICAgICAgcmV0dXJuICp0aGlzID4+IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3QmPih2YWx1 ZSk7CisgICAgfQorCisgICAgSGlzdG9yeUVudHJ5RGF0YURlY29kZXImIG9wZXJhdG9yPj4odWlu dDY0X3QmIHZhbHVlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGRlY29kZUFyaXRobWV0aWNUeXBl KHZhbHVlKTsKKyAgICB9CisKKyAgICBIaXN0b3J5RW50cnlEYXRhRGVjb2RlciYgb3BlcmF0b3I+ PihpbnQ2NF90JiB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiAqdGhpcyA+PiByZWludGVy cHJldF9jYXN0PHVpbnQ2NF90Jj4odmFsdWUpOworICAgIH0KKworICAgIEhpc3RvcnlFbnRyeURh dGFEZWNvZGVyJiBvcGVyYXRvcj4+KGZsb2F0JiB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVy biBkZWNvZGVBcml0aG1ldGljVHlwZSh2YWx1ZSk7CisgICAgfQorCisgICAgSGlzdG9yeUVudHJ5 RGF0YURlY29kZXImIG9wZXJhdG9yPj4oU3RyaW5nJiB2YWx1ZSkKKyAgICB7CisgICAgICAgIHZh bHVlID0gU3RyaW5nKCk7CisKKyAgICAgICAgdWludDMyX3QgbGVuZ3RoOworICAgICAgICAqdGhp cyA+PiBsZW5ndGg7CisKKyAgICAgICAgaWYgKGxlbmd0aCA9PSBzdGQ6Om51bWVyaWNfbGltaXRz PHVpbnQzMl90Pjo6bWF4KCkpIHsKKyAgICAgICAgICAgIC8vIFRoaXMgaXMgdGhlIG51bGwgc3Ry aW5nLgorICAgICAgICAgICAgdmFsdWUgPSBTdHJpbmcoKTsKKyAgICAgICAgICAgIHJldHVybiAq dGhpczsKKyAgICAgICAgfQorCisgICAgICAgIHVpbnQ2NF90IGxlbmd0aEluQnl0ZXM7CisgICAg ICAgICp0aGlzID4+IGxlbmd0aEluQnl0ZXM7CisKKyAgICAgICAgaWYgKGxlbmd0aEluQnl0ZXMg JSBzaXplb2YoVUNoYXIpIHx8IGxlbmd0aEluQnl0ZXMgLyBzaXplb2YoVUNoYXIpICE9IGxlbmd0 aCkgeworICAgICAgICAgICAgbWFya0ludmFsaWQoKTsKKyAgICAgICAgICAgIHJldHVybiAqdGhp czsKKyAgICAgICAgfQorCisgICAgICAgIGlmICghYnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFp bjxVQ2hhcj4obGVuZ3RoKSkgeworICAgICAgICAgICAgbWFya0ludmFsaWQoKTsKKyAgICAgICAg ICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfQorCisgICAgICAgIFVDaGFyKiBidWZmZXI7Cisg ICAgICAgIGF1dG8gc3RyaW5nID0gU3RyaW5nOjpjcmVhdGVVbmluaXRpYWxpemVkKGxlbmd0aCwg YnVmZmVyKTsKKyAgICAgICAgZGVjb2RlRml4ZWRMZW5ndGhEYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8 dWludDhfdCo+KGJ1ZmZlciksIGxlbmd0aCAqIHNpemVvZihVQ2hhciksIGFsaWdub2YoVUNoYXIp KTsKKworICAgICAgICB2YWx1ZSA9IHN0cmluZzsKKyAgICAgICAgcmV0dXJuICp0aGlzOwogICAg IH0KIAogICAgIGJvb2wgZmluaXNoRGVjb2RpbmcoKSB7IHJldHVybiBtX2J1ZmZlciA9PSBtX2J1 ZmZlckVuZDsgfQogCiBwcml2YXRlOgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFR5cGU+Ci0gICAg SGlzdG9yeUVudHJ5RGF0YURlY29kZXImIGRlY29kZShUeXBlJiB2YWx1ZSkKKyAgICBIaXN0b3J5 RW50cnlEYXRhRGVjb2RlciYgZGVjb2RlQXJpdGhtZXRpY1R5cGUoVHlwZSYgdmFsdWUpCiAgICAg eworICAgICAgICBzdGF0aWNfYXNzZXJ0KHN0ZDo6aXNfYXJpdGhtZXRpYzxUeXBlPjo6dmFsdWUs ICIiKTsKKyAgICAgICAgdmFsdWUgPSBUeXBlKCk7CisKICAgICAgICAgZGVjb2RlRml4ZWRMZW5n dGhEYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KCZ2YWx1ZSksIHNpemVvZih2YWx1ZSks IHNpemVvZih2YWx1ZSkpOwogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQpAQCAtMjYxLDYg KzMxNiwyMiBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDx1aW50 OF90Kj4oKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihtX2J1ZmZlcikgKyBhbGlnbm1lbnRN YXNrKSAmIH5hbGlnbm1lbnRNYXNrKTsKICAgICB9CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBU PgorICAgIGJvb2wgYnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbihzaXplX3QgbnVtRWxlbWVu dHMpIGNvbnN0CisgICAgeworICAgICAgICBzdGF0aWNfYXNzZXJ0KHN0ZDo6aXNfYXJpdGhtZXRp YzxUPjo6dmFsdWUsICJUeXBlIFQgbXVzdCBoYXZlIGEgZml4ZWQsIGtub3duIGVuY29kZWQgc2l6 ZSEiKTsKKworICAgICAgICBpZiAobnVtRWxlbWVudHMgPiBzdGQ6Om51bWVyaWNfbGltaXRzPHNp emVfdD46Om1heCgpIC8gc2l6ZW9mKFQpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgICAgIHJldHVybiBidWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluKGFsaWdub2YoVCksIG51 bUVsZW1lbnRzICogc2l6ZW9mKFQpKTsKKyAgICB9CisKKyAgICBib29sIGJ1ZmZlcklzTGFyZ2VF bm91Z2hUb0NvbnRhaW4odW5zaWduZWQgYWxpZ25tZW50LCBzaXplX3Qgc2l6ZSkgY29uc3QKKyAg ICB7CisgICAgICAgIHJldHVybiBhbGlnbmVkQnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbihh bGlnbmVkQnVmZmVyKGFsaWdubWVudCksIHNpemUpOworICAgIH0KKwogICAgIGlubGluZSBib29s IGFsaWduZWRCdWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluKGNvbnN0IHVpbnQ4X3QqIGFsaWdu ZWRQb3NpdGlvbiwgc2l6ZV90IHNpemUpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9i dWZmZXJFbmQgPj0gYWxpZ25lZFBvc2l0aW9uICYmIHN0YXRpY19jYXN0PHNpemVfdD4obV9idWZm ZXJFbmQgLSBhbGlnbmVkUG9zaXRpb24pID49IHNpemU7CkBAIC0yNzIsNiArMzQzLDY2IEBAIHBy aXZhdGU6CiAgICAgY29uc3QgdWludDhfdCogbV9idWZmZXJFbmQ7CiB9OwogCitzdGF0aWMgdm9p ZCBkZWNvZGVCYWNrRm9yd2FyZFRyZWVOb2RlKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNv ZGVyLCBGcmFtZVN0YXRlJiBmcmFtZVN0YXRlKQoreworICAgIHVpbnQ2NF90IGNoaWxkQ291bnQ7 CisgICAgZGVjb2RlciA+PiBjaGlsZENvdW50OworCisgICAgZm9yICh1aW50NjRfdCBpID0gMDsg aSA8IGNoaWxkQ291bnQ7ICsraSkgeworICAgICAgICBGcmFtZVN0YXRlIGNoaWxkRnJhbWVTdGF0 ZTsKKyAgICAgICAgZGVjb2RlciA+PiBjaGlsZEZyYW1lU3RhdGUub3JpZ2luYWxVUkxTdHJpbmc7 CisgICAgICAgIGRlY29kZXIgPj4gY2hpbGRGcmFtZVN0YXRlLnVybFN0cmluZzsKKworICAgICAg ICBkZWNvZGVCYWNrRm9yd2FyZFRyZWVOb2RlKGRlY29kZXIsIGNoaWxkRnJhbWVTdGF0ZSk7Cisg ICAgICAgIGZyYW1lU3RhdGUuY2hpbGRyZW4uYXBwZW5kKHN0ZDo6bW92ZShjaGlsZEZyYW1lU3Rh dGUpKTsKKyAgICB9CisKKyAgICBkZWNvZGVyID4+IGZyYW1lU3RhdGUuZG9jdW1lbnRTZXF1ZW5j ZU51bWJlcjsKKworICAgIHVpbnQ2NF90IGRvY3VtZW50U3RhdGVWZWN0b3JTaXplOworICAgIGRl Y29kZXIgPj4gZG9jdW1lbnRTdGF0ZVZlY3RvclNpemU7CisKKyAgICBmb3IgKHVpbnQ2NF90IGkg PSAwOyBpIDwgZG9jdW1lbnRTdGF0ZVZlY3RvclNpemU7ICsraSkgeworICAgICAgICAvLyBGSVhN RTogSW1wbGVtZW50LgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9CisKKyAg ICBTdHJpbmcgZm9ybUNvbnRlbnRUeXBlOworICAgIGRlY29kZXIgPj4gZm9ybUNvbnRlbnRUeXBl OworCisgICAgYm9vbCBoYXNGb3JtRGF0YTsKKyAgICBkZWNvZGVyID4+IGhhc0Zvcm1EYXRhOwor CisgICAgaWYgKGhhc0Zvcm1EYXRhKSB7CisgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKworICAgIGRlY29kZXIgPj4gZnJh bWVTdGF0ZS5pdGVtU2VxdWVuY2VOdW1iZXI7CisKKyAgICBkZWNvZGVyID4+IGZyYW1lU3RhdGUu cmVmZXJyZXI7CisKKyAgICBpbnQzMl90IHNjcm9sbFBvaW50WDsKKyAgICBkZWNvZGVyID4+IHNj cm9sbFBvaW50WDsKKworICAgIGludDMyX3Qgc2Nyb2xsUG9pbnRZOworICAgIGRlY29kZXIgPj4g c2Nyb2xsUG9pbnRZOworCisgICAgZnJhbWVTdGF0ZS5zY3JvbGxQb2ludCA9IFdlYkNvcmU6Oklu dFBvaW50KHNjcm9sbFBvaW50WCwgc2Nyb2xsUG9pbnRZKTsKKworICAgIGRlY29kZXIgPj4gZnJh bWVTdGF0ZS5wYWdlU2NhbGVGYWN0b3I7CisKKyAgICBib29sIGhhc1N0YXRlT2JqZWN0OworICAg IGRlY29kZXIgPj4gaGFzU3RhdGVPYmplY3Q7CisKKyAgICBpZiAoaGFzU3RhdGVPYmplY3QpIHsK KyAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgfQorCisgICAgZGVjb2RlciA+PiBmcmFtZVN0YXRlLnRhcmdldDsKK30KKwogYm9v bCBMZWdhY3lTZXNzaW9uU3RhdGVEZWNvZGVyOjpkZWNvZGVTZXNzaW9uSGlzdG9yeUVudHJ5RGF0 YShDRkRhdGFSZWYgaGlzdG9yeUVudHJ5RGF0YSwgRnJhbWVTdGF0ZSYgbWFpbkZyYW1lU3RhdGUp IGNvbnN0CiB7CiAgICAgSGlzdG9yeUVudHJ5RGF0YURlY29kZXIgZGVjb2RlciB7IENGRGF0YUdl dEJ5dGVQdHIoaGlzdG9yeUVudHJ5RGF0YSksIHN0YXRpY19jYXN0PHNpemVfdD4oQ0ZEYXRhR2V0 TGVuZ3RoKGhpc3RvcnlFbnRyeURhdGEpKSB9OwpAQCAtMjgyLDcgKzQxMyw3IEBAIGJvb2wgTGVn YWN5U2Vzc2lvblN0YXRlRGVjb2Rlcjo6ZGVjb2RlU2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoQ0ZE YXRhUmVmIGhpc3RvcnlFCiAgICAgaWYgKHZlcnNpb24gIT0gc2Vzc2lvbkhpc3RvcnlFbnRyeURh dGFWZXJzaW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAvLyBGSVhNRTogSW1wbGVt ZW50IHRoaXMuCisgICAgZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZShkZWNvZGVyLCBtYWluRnJh bWVTdGF0ZSk7CiAKICAgICByZXR1cm4gZGVjb2Rlci5maW5pc2hEZWNvZGluZygpOwogfQo=