134146 2014-06-20 17:19:54 -0700 Implement more of HistoryEntryDataDecoder 2014-06-21 11:53:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1017141 0 andersca 2014-06-20 17:19:54 -0700 Implement more of HistoryEntryDataDecoder 1017142 1 233489 andersca 2014-06-20 17:21:15 -0700 Created attachment 233489 Patch 1017314 2 andersca 2014-06-21 11:53:03 -0700 Committed r170248: <http://trac.webkit.org/changeset/170248> 233489 2014-06-20 17:21:15 -0700 2014-06-20 19:56:42 -0700 Patch bug-134146-20140620172053.patch text/plain 4620 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzIzMDZhYzhjN2M1MDk3 ODgyNzk3NWIwNTI4ZjY2MjBlNzI3YzMwNy4uYjZlNmM1ZDE3MTYzMzZmZGNkMDk1ODRkOTQyMzg4 NThlYjRiNjI1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTA2LTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IG1v cmUgb2YgSGlzdG9yeUVudHJ5RGF0YURlY29kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVD b2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRhRGVjb2Rlcjo6SGlz dG9yeUVudHJ5RGF0YURlY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRh RGVjb2Rlcjo6b3BlcmF0b3I+Pik6CisgICAgICAgIChXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFE ZWNvZGVyOjpkZWNvZGUpOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRhRGVjb2Rl cjo6ZGVjb2RlRml4ZWRMZW5ndGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6SGlzdG9yeUVudHJ5 RGF0YURlY29kZXI6OmFsaWduQnVmZmVyUG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpIaXN0 b3J5RW50cnlEYXRhRGVjb2Rlcjo6YWxpZ25lZEJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6Okhp c3RvcnlFbnRyeURhdGFEZWNvZGVyOjphbGlnbmVkQnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFp bik6CisgICAgICAgIChXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFEZWNvZGVyOjptYXJrSW52YWxp ZCk6CisgICAgICAgIChXZWJLaXQ6OkxlZ2FjeVNlc3Npb25TdGF0ZURlY29kZXI6OmRlY29kZVNl c3Npb25IaXN0b3J5RW50cnlEYXRhKToKKworMjAxNC0wNi0yMCAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEltcGxlbWVudCBtb3JlIG9mIExlZ2FjeVNl c3Npb25TdGF0ZURlY29kZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDE0NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAKaW5kZXggNDU4ZjU0NDVhYmU5ZDJk MThlNTMzMjExNWIwNmI5ODVkZWZhY2NiZi4uYzc0ZDJiMGUwMzJjYTY0ZTU4ZDYxNWY4MDI1YTBk YmNmYWYzM2QxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdh Y3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcApAQCAtNTAsNiArNTAsOSBAQCBzdGF0aWMg Q0ZTdHJpbmdSZWYgc2Vzc2lvbkhpc3RvcnlFbnRyeU9yaWdpbmFsVVJMS2V5ID0gQ0ZTVFIoIlNl c3Npb25IaXN0b3J5RW50cgogc3RhdGljIENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlT bmFwc2hvdFVVSURLZXkgPSBDRlNUUigiU2Vzc2lvbkhpc3RvcnlFbnRyeVNuYXBzaG90VVVJRCIp Owogc3RhdGljIENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5ID0gQ0ZTVFIo IlNlc3Npb25IaXN0b3J5RW50cnlEYXRhIik7CiAKKy8vIFNlc3Npb24gaGlzdG9yeSBlbnRyeSBk YXRhLgorY29uc3QgdWludDMyX3Qgc2Vzc2lvbkhpc3RvcnlFbnRyeURhdGFWZXJzaW9uID0gMjsK KwogTGVnYWN5U2Vzc2lvblN0YXRlRGVjb2Rlcjo6TGVnYWN5U2Vzc2lvblN0YXRlRGVjb2RlcihB UEk6OkRhdGEqIGRhdGEpCiAgICAgOiBtX2RhdGEoZGF0YSkKIHsKQEAgLTIwMSwxMSArMjA0LDcw IEBAIHB1YmxpYzoKICAgICAgICAgOiBtX2J1ZmZlcihidWZmZXIpCiAgICAgICAgICwgbV9idWZm ZXJFbmQoYnVmZmVyICsgYnVmZmVyU2l6ZSkKICAgICB7CisgICAgICAgIC8vIEtlZXAgZm9ybWF0 IGNvbXBhdGliaWxpdHkgYnkgZGVjb2RpbmcgYW4gdW51c2VkIHVpbnQ2NF90IGhlcmUuCisgICAg ICAgIHVpbnQ2NF90IHZhbHVlOworICAgICAgICAqdGhpcyA+PiB2YWx1ZTsKKyAgICB9CisKKyAg ICBIaXN0b3J5RW50cnlEYXRhRGVjb2RlciYgb3BlcmF0b3I+Pih1aW50NjRfdCYgdmFsdWUpCisg ICAgeworICAgICAgICB2YWx1ZSA9IDA7CisgICAgICAgIHJldHVybiBkZWNvZGUodmFsdWUpOwor ICAgIH0KKworICAgIEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBvcGVyYXRvcj4+KHVpbnQzMl90 JiB2YWx1ZSkKKyAgICB7CisgICAgICAgIHZhbHVlID0gMDsKKyAgICAgICAgcmV0dXJuIGRlY29k ZSh2YWx1ZSk7CiAgICAgfQogCiAgICAgYm9vbCBmaW5pc2hEZWNvZGluZygpIHsgcmV0dXJuIG1f YnVmZmVyID09IG1fYnVmZmVyRW5kOyB9CiAKIHByaXZhdGU6CisgICAgdGVtcGxhdGU8dHlwZW5h bWUgVHlwZT4KKyAgICBIaXN0b3J5RW50cnlEYXRhRGVjb2RlciYgZGVjb2RlKFR5cGUmIHZhbHVl KQorICAgIHsKKyAgICAgICAgZGVjb2RlRml4ZWRMZW5ndGhEYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8 dWludDhfdCo+KCZ2YWx1ZSksIHNpemVvZih2YWx1ZSksIHNpemVvZih2YWx1ZSkpOworICAgICAg ICByZXR1cm4gKnRoaXM7CisgICAgfQorCisgICAgdm9pZCBkZWNvZGVGaXhlZExlbmd0aERhdGEo dWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUsIHVuc2lnbmVkIGFsaWdubWVudCkKKyAgICB7Cisg ICAgICAgIGlmICghYWxpZ25CdWZmZXJQb3NpdGlvbihhbGlnbm1lbnQsIHNpemUpKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIG1lbWNweShkYXRhLCBtX2J1ZmZlciwgc2l6ZSk7Cisg ICAgICAgIG1fYnVmZmVyICs9IHNpemU7CisgICAgfQorCisgICAgYm9vbCBhbGlnbkJ1ZmZlclBv c2l0aW9uKHVuc2lnbmVkIGFsaWdubWVudCwgc2l6ZV90IHNpemUpCisgICAgeworICAgICAgICBj b25zdCB1aW50OF90KiBhbGlnbmVkUG9zaXRpb24gPSBhbGlnbmVkQnVmZmVyKGFsaWdubWVudCk7 CisgICAgICAgIGlmICghYWxpZ25lZEJ1ZmZlcklzTGFyZ2VFbm91Z2hUb0NvbnRhaW4oYWxpZ25l ZFBvc2l0aW9uLCBzaXplKSkgeworICAgICAgICAgICAgLy8gV2UndmUgd2Fsa2VkIG9mZiB0aGUg ZW5kIG9mIHRoaXMgYnVmZmVyLgorICAgICAgICAgICAgbWFya0ludmFsaWQoKTsKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorCisgICAgICAgIG1fYnVmZmVyID0gYWxpZ25l ZFBvc2l0aW9uOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBjb25zdCB1aW50 OF90KiBhbGlnbmVkQnVmZmVyKHVuc2lnbmVkIGFsaWdubWVudCkgY29uc3QKKyAgICB7CisgICAg ICAgIEFTU0VSVChhbGlnbm1lbnQgJiYgIShhbGlnbm1lbnQgJiAoYWxpZ25tZW50IC0gMSkpKTsK KworICAgICAgICB1aW50cHRyX3QgYWxpZ25tZW50TWFzayA9IGFsaWdubWVudCAtIDE7CisgICAg ICAgIHJldHVybiByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPigocmVpbnRlcnByZXRfY2FzdDx1 aW50cHRyX3Q+KG1fYnVmZmVyKSArIGFsaWdubWVudE1hc2spICYgfmFsaWdubWVudE1hc2spOwor ICAgIH0KKworICAgIGlubGluZSBib29sIGFsaWduZWRCdWZmZXJJc0xhcmdlRW5vdWdoVG9Db250 YWluKGNvbnN0IHVpbnQ4X3QqIGFsaWduZWRQb3NpdGlvbiwgc2l6ZV90IHNpemUpIGNvbnN0Cisg ICAgeworICAgICAgICByZXR1cm4gbV9idWZmZXJFbmQgPj0gYWxpZ25lZFBvc2l0aW9uICYmIHN0 YXRpY19jYXN0PHNpemVfdD4obV9idWZmZXJFbmQgLSBhbGlnbmVkUG9zaXRpb24pID49IHNpemU7 CisgICAgfQorCisgICAgdm9pZCBtYXJrSW52YWxpZCgpIHsgbV9idWZmZXIgPSBtX2J1ZmZlckVu ZCArIDE7IH0KKwogICAgIGNvbnN0IHVpbnQ4X3QqIG1fYnVmZmVyOwogICAgIGNvbnN0IHVpbnQ4 X3QqIG1fYnVmZmVyRW5kOwogfTsKQEAgLTIxNCw2ICsyNzYsMTIgQEAgYm9vbCBMZWdhY3lTZXNz aW9uU3RhdGVEZWNvZGVyOjpkZWNvZGVTZXNzaW9uSGlzdG9yeUVudHJ5RGF0YShDRkRhdGFSZWYg aGlzdG9yeUUKIHsKICAgICBIaXN0b3J5RW50cnlEYXRhRGVjb2RlciBkZWNvZGVyIHsgQ0ZEYXRh R2V0Qnl0ZVB0cihoaXN0b3J5RW50cnlEYXRhKSwgc3RhdGljX2Nhc3Q8c2l6ZV90PihDRkRhdGFH ZXRMZW5ndGgoaGlzdG9yeUVudHJ5RGF0YSkpIH07CiAKKyAgICB1aW50MzJfdCB2ZXJzaW9uOwor ICAgIGRlY29kZXIgPj4gdmVyc2lvbjsKKworICAgIGlmICh2ZXJzaW9uICE9IHNlc3Npb25IaXN0 b3J5RW50cnlEYXRhVmVyc2lvbikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgLy8gRklY TUU6IEltcGxlbWVudCB0aGlzLgogCiAgICAgcmV0dXJuIGRlY29kZXIuZmluaXNoRGVjb2Rpbmco KTsK