134263 2014-06-24 12:37:51 -0700 Add code to convert HistoryItem to PageState 2014-06-24 13:41:22 -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 1018053 0 andersca 2014-06-24 12:37:51 -0700 Add code to convert HistoryItem to PageState 1018056 1 233729 andersca 2014-06-24 12:39:31 -0700 Created attachment 233729 Patch 1018084 2 andersca 2014-06-24 13:41:22 -0700 Committed r170387: <http://trac.webkit.org/changeset/170387> 233729 2014-06-24 12:39:31 -0700 2014-06-24 13:39:41 -0700 Patch bug-134263-20140624123910.patch text/plain 4734 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODg5YWFiYjhhM2E0OTRm NDJhMjI3MmEwZmUzZjA5MTIwYWI1NzYxMy4uZGM5ZmQ0Mjg1YWQwNWMwNzRkYmVhNDI4NzFkZmI2 ZDY3MWE0MWY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE0LTA2LTI0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGNvZGUgdG8g Y29udmVydCBIaXN0b3J5SXRlbSB0byBQYWdlU3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9TZXNz aW9uU3RhdGVDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6dG9IVFRQQm9keSk6Cisg ICAgICAgIChXZWJLaXQ6OnRvRnJhbWVTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OnRvUGFnZVN0 YXRlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0ZUNv bnZlcnNpb24uaDoKKworMjAxNC0wNi0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgorCiAgICAgICAgIEFkZCBQYWdlU3RhdGUgdG8gSGlzdG9yeUl0ZW0gY29udmVyc2lv biBjb2RlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzQyNTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9TZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvU2Vzc2lvblN0YXRlQ29udmVyc2lvbi5jcHAKaW5kZXggNGVlOTlj N2ExYmEzZmVmMDE0MDdhYmMxMzljZGY4NTkwZWU1MTY3YS4uMjhhNDk3MGYzZmIzNDBhZDZmNjI4 YThkNjNkMDVlYjNjYzMxZDBmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9TZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0ZUNvbnZlcnNpb24u Y3BwCkBAIC0zNSw2ICszNSw4MyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKK3N0YXRpYyBIVFRQQm9keSB0b0hUVFBCb2R5KGNvbnN0IEZvcm1EYXRh JiBmb3JtRGF0YSkKK3sKKyAgICBIVFRQQm9keSBodHRwQm9keTsKKworICAgIGZvciAoY29uc3Qg YXV0byYgZm9ybURhdGFFbGVtZW50IDogZm9ybURhdGEuZWxlbWVudHMoKSkgeworICAgICAgICBI VFRQQm9keTo6RWxlbWVudCBlbGVtZW50OworCisgICAgICAgIHN3aXRjaCAoZm9ybURhdGFFbGVt ZW50Lm1fdHlwZSkgeworICAgICAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RGF0YToK KyAgICAgICAgICAgIGVsZW1lbnQudHlwZSA9IEhUVFBCb2R5OjpFbGVtZW50OjpUeXBlOjpEYXRh OworICAgICAgICAgICAgZWxlbWVudC5kYXRhID0gZm9ybURhdGFFbGVtZW50Lm1fZGF0YTsKKyAg ICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpF bmNvZGVkRmlsZToKKyAgICAgICAgICAgIGVsZW1lbnQuZmlsZVBhdGggPSBmb3JtRGF0YUVsZW1l bnQubV9maWxlbmFtZTsKKyAgICAgICAgICAgIGVsZW1lbnQuZmlsZVN0YXJ0ID0gZm9ybURhdGFF bGVtZW50Lm1fZmlsZVN0YXJ0OworICAgICAgICAgICAgaWYgKGZvcm1EYXRhRWxlbWVudC5tX2Zp bGVMZW5ndGggIT0gQmxvYkRhdGFJdGVtOjp0b0VuZE9mRmlsZSkKKyAgICAgICAgICAgICAgICBl bGVtZW50LmZpbGVMZW5ndGggPSBmb3JtRGF0YUVsZW1lbnQubV9maWxlTGVuZ3RoOworICAgICAg ICAgICAgaWYgKGZvcm1EYXRhRWxlbWVudC5tX2V4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWUg IT0gaW52YWxpZEZpbGVUaW1lKCkpCisgICAgICAgICAgICAgICAgZWxlbWVudC5leHBlY3RlZEZp bGVNb2RpZmljYXRpb25UaW1lID0gZm9ybURhdGFFbGVtZW50Lm1fZXhwZWN0ZWRGaWxlTW9kaWZp Y2F0aW9uVGltZTsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGNhc2UgRm9ybURhdGFF bGVtZW50OjpUeXBlOjpFbmNvZGVkQmxvYjoKKyAgICAgICAgICAgIGVsZW1lbnQuYmxvYlVSTFN0 cmluZyA9IGZvcm1EYXRhRWxlbWVudC5tX3VybC5zdHJpbmcoKTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisKKyAgICAgICAgaHR0cEJvZHkuZWxlbWVudHMuYXBwZW5kKHN0ZDo6bW92 ZShlbGVtZW50KSk7CisgICAgfQorCisgICAgcmV0dXJuIGh0dHBCb2R5OworfQorCitzdGF0aWMg RnJhbWVTdGF0ZSB0b0ZyYW1lU3RhdGUoY29uc3QgSGlzdG9yeUl0ZW0mIGhpc3RvcnlJdGVtKQor eworICAgIEZyYW1lU3RhdGUgZnJhbWVTdGF0ZTsKKworICAgIGZyYW1lU3RhdGUudXJsU3RyaW5n ID0gaGlzdG9yeUl0ZW0udXJsU3RyaW5nKCk7CisgICAgZnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0 cmluZyA9IGhpc3RvcnlJdGVtLm9yaWdpbmFsVVJMU3RyaW5nKCk7CisgICAgZnJhbWVTdGF0ZS5y ZWZlcnJlciA9IGhpc3RvcnlJdGVtLnJlZmVycmVyKCk7CisgICAgZnJhbWVTdGF0ZS50YXJnZXQg PSBoaXN0b3J5SXRlbS50YXJnZXQoKTsKKworICAgIGZyYW1lU3RhdGUuZG9jdW1lbnRTdGF0ZSA9 IGhpc3RvcnlJdGVtLmRvY3VtZW50U3RhdGUoKTsKKyAgICBpZiAoUmVmUHRyPFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZT4gc3RhdGVPYmplY3QgPSBoaXN0b3J5SXRlbS5zdGF0ZU9iamVjdCgpKQorICAg ICAgICBmcmFtZVN0YXRlLnN0YXRlT2JqZWN0RGF0YSA9IHN0YXRlT2JqZWN0LT5kYXRhKCk7CisK KyAgICBmcmFtZVN0YXRlLmRvY3VtZW50U2VxdWVuY2VOdW1iZXIgPSBoaXN0b3J5SXRlbS5kb2N1 bWVudFNlcXVlbmNlTnVtYmVyKCk7CisgICAgZnJhbWVTdGF0ZS5pdGVtU2VxdWVuY2VOdW1iZXIg PSBoaXN0b3J5SXRlbS5pdGVtU2VxdWVuY2VOdW1iZXIoKTsKKworICAgIGZyYW1lU3RhdGUuc2Ny b2xsUG9pbnQgPSBoaXN0b3J5SXRlbS5zY3JvbGxQb2ludCgpOworICAgIGZyYW1lU3RhdGUucGFn ZVNjYWxlRmFjdG9yID0gaGlzdG9yeUl0ZW0ucGFnZVNjYWxlRmFjdG9yKCk7CisKKyAgICBpZiAo Rm9ybURhdGEqIGZvcm1EYXRhID0gY29uc3RfY2FzdDxIaXN0b3J5SXRlbSY+KGhpc3RvcnlJdGVt KS5mb3JtRGF0YSgpKSB7CisgICAgICAgIEhUVFBCb2R5IGh0dHBCb2R5ID0gdG9IVFRQQm9keSgq Zm9ybURhdGEpOworICAgICAgICBodHRwQm9keS5jb250ZW50VHlwZSA9IGhpc3RvcnlJdGVtLmZv cm1Db250ZW50VHlwZSgpOworCisgICAgICAgIGZyYW1lU3RhdGUuaHR0cEJvZHkgPSBzdGQ6Om1v dmUoaHR0cEJvZHkpOworICAgIH0KKworICAgIGZvciAoYXV0byYgY2hpbGRIaXN0b3J5SXRlbSA6 IGhpc3RvcnlJdGVtLmNoaWxkcmVuKCkpIHsKKyAgICAgICAgRnJhbWVTdGF0ZSBjaGlsZEZyYW1l U3RhdGUgPSB0b0ZyYW1lU3RhdGUoKmNoaWxkSGlzdG9yeUl0ZW0pOworICAgICAgICBmcmFtZVN0 YXRlLmNoaWxkcmVuLmFwcGVuZChzdGQ6Om1vdmUoY2hpbGRGcmFtZVN0YXRlKSk7CisgICAgfQor CisgICAgcmV0dXJuIGZyYW1lU3RhdGU7Cit9CisKK1BhZ2VTdGF0ZSB0b1BhZ2VTdGF0ZShjb25z dCBXZWJDb3JlOjpIaXN0b3J5SXRlbSYgaGlzdG9yeUl0ZW0pCit7CisgICAgUGFnZVN0YXRlIHBh Z2VTdGF0ZTsKKworICAgIHBhZ2VTdGF0ZS50aXRsZSA9IGhpc3RvcnlJdGVtLnRpdGxlKCk7Cisg ICAgcGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlID0gdG9GcmFtZVN0YXRlKGhpc3RvcnlJdGVtKTsK KworICAgIHJldHVybiBwYWdlU3RhdGU7Cit9CisKIHN0YXRpYyBQYXNzUmVmUHRyPEZvcm1EYXRh PiB0b0Zvcm1EYXRhKGNvbnN0IEhUVFBCb2R5JiBodHRwQm9keSkKIHsKICAgICBSZWZQdHI8Rm9y bURhdGE+IGZvcm1EYXRhID0gRm9ybURhdGE6OmNyZWF0ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9TZXNzaW9uU3RhdGVDb252ZXJzaW9u LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0 ZUNvbnZlcnNpb24uaAppbmRleCAzMGM0NTQyNWU1Yzk0OWIxYmRkNDFkM2I0OTNhODkxMzcxYmY2 NmQwLi5lNDE1NDE1ZTE0ZTZmMzRkMmYwZWJiNTFjZTY2OGIzNDQwODNkMDU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0ZUNv bnZlcnNpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1Nlc3Npb25TdGF0ZUNvbnZlcnNpb24uaApAQCAtMzYsNiArMzYsNyBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKIAogc3RydWN0IFBhZ2VTdGF0ZTsKIAorUGFnZVN0YXRlIHRvUGFnZVN0YXRlKGNvbnN0 IFdlYkNvcmU6Okhpc3RvcnlJdGVtJik7CiBQYXNzUmVmUHRyPFdlYkNvcmU6Okhpc3RvcnlJdGVt PiB0b0hpc3RvcnlJdGVtKGNvbnN0IFBhZ2VTdGF0ZSYpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQK