134041 2014-06-18 14:41:55 -0700 Simplify WebPageProxy::saveRecentSearches and WebPageProxy::loadRecentSearches 2014-06-18 15:32:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1016542 0 andersca 2014-06-18 14:41:55 -0700 Simplify WebPageProxy::saveRecentSearches and WebPageProxy::loadRecentSearches 1016545 1 233328 andersca 2014-06-18 14:42:29 -0700 Created attachment 233328 Patch 1016560 2 andersca 2014-06-18 15:32:39 -0700 Committed r170123: <http://trac.webkit.org/changeset/170123> 233328 2014-06-18 14:42:29 -0700 2014-06-18 14:44:31 -0700 Patch bug-134041-20140618144211.patch text/plain 3751 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDM4ZDg3ZjAzNDhkZTI5 MTU4NDY1ZWE5ODVhNDJlMDYzNWQ0YmE2Ni4uYzU4ZWI4MTUzZDAwMjMwZDYzMDcwZTc5YWVkMDVk MjIxZjFlNTVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE0LTA2LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgV2Vi UGFnZVByb3h5OjpzYXZlUmVjZW50U2VhcmNoZXMgYW5kIFdlYlBhZ2VQcm94eTo6bG9hZFJlY2Vu dFNlYXJjaGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzQwNDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6c2F2ZVJlY2VudFNlYXJjaGVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5Ojpsb2FkUmVjZW50U2VhcmNoZXMpOgorCisyMDE0LTA2LTE4ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgU2ltcGxpZnkgV2ViQ3JlZGVudGlh bAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0MDM2 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlD Ri5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5Q0YuY3BwCmlu ZGV4IGQwNTE5YTZkN2ZiYjZiYzVhZjJhZmM0OTQyNzU0ZWM0ZjIyNDMyYzEuLjM3Mjk3ZWFjNTEx YmI4ZmQyMzJiM2M1MGJhZjJlYmFkNWQxNDFmYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcApAQCAtMzMsOSArMzMsOSBAQAogI2luY2x1ZGUg IldlYkJhY2tGb3J3YXJkTGlzdC5oIgogI2luY2x1ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgogI2lu Y2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgotCi0jaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgog I2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NGUHJvcGVydHlMaXN0Lmg+CisjaW5jbHVkZSA8d3Rm L1JldGFpblB0ci5oPgorI2luY2x1ZGUgPHd0Zi9jZi9UeXBlQ2FzdHMuaD4KIAogdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTE4NiwxNSArMTg2LDE4IEBAIHN0YXRpYyBSZXRhaW5QdHI8 Q0ZTdHJpbmdSZWY+IGF1dG9zYXZlS2V5KGNvbnN0IFN0cmluZyYgbmFtZSkKIAogdm9pZCBXZWJQ YWdlUHJveHk6OnNhdmVSZWNlbnRTZWFyY2hlcyhjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBzZWFyY2hJdGVtcykKIHsKLSAgICAvLyBUaGUgV2ViUHJvY2VzcyBzaG91 bGRuJ3QgaGF2ZSBib3RoZXJlZCB0byBzZW5kIHRoaXMgbWVzc2FnZSBpZiB0aGUgbmFtZSB3YXMg ZW1wdHkuCi0gICAgQVNTRVJUKCFuYW1lLmlzRW1wdHkoKSk7CisgICAgaWYgKCFuYW1lKSB7Cisg ICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCisgICAgICAg IHJldHVybjsKKyAgICB9CiAKICAgICBSZXRhaW5QdHI8Q0ZNdXRhYmxlQXJyYXlSZWY+IGl0ZW1z OwogCi0gICAgaWYgKHNpemVfdCBzaXplID0gc2VhcmNoSXRlbXMuc2l6ZSgpKSB7Ci0gICAgICAg IGl0ZW1zID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZSgwLCBzaXplLCAma0NGVHlwZUFy cmF5Q2FsbEJhY2tzKSk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytp KQotICAgICAgICAgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGl0ZW1zLmdldCgpLCBzZWFyY2hJdGVt c1tpXS5jcmVhdGVDRlN0cmluZygpLmdldCgpKTsKKyAgICBpZiAoIXNlYXJjaEl0ZW1zLmlzRW1w dHkoKSkgeworICAgICAgICBpdGVtcyA9IGFkb3B0Q0YoQ0ZBcnJheUNyZWF0ZU11dGFibGUoMCwg c2VhcmNoSXRlbXMuc2l6ZSgpLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7CisKKyAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBzZWFyY2hJdGVtIDogc2VhcmNoSXRlbXMpCisgICAgICAgICAgICBD RkFycmF5QXBwZW5kVmFsdWUoaXRlbXMuZ2V0KCksIHNlYXJjaEl0ZW0uY3JlYXRlQ0ZTdHJpbmco KS5nZXQoKSk7CiAgICAgfQogCiAgICAgQ0ZQcmVmZXJlbmNlc1NldEFwcFZhbHVlKGF1dG9zYXZl S2V5KG5hbWUpLmdldCgpLCBpdGVtcy5nZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50QXBwbGlj YXRpb24pOwpAQCAtMjAzLDE5ICsyMDYsMTcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNhdmVSZWNl bnRTZWFyY2hlcyhjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JgogCiB2 b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlY2VudFNlYXJjaGVzKGNvbnN0IFN0cmluZyYgbmFtZSwg VmVjdG9yPFN0cmluZz4mIHNlYXJjaEl0ZW1zKQogewotICAgIC8vIFRoZSBXZWJQcm9jZXNzIHNo b3VsZG4ndCBoYXZlIGJvdGhlcmVkIHRvIHNlbmQgdGhpcyBtZXNzYWdlIGlmIHRoZSBuYW1lIHdh cyBlbXB0eS4KLSAgICBBU1NFUlQoIW5hbWUuaXNFbXB0eSgpKTsKLQotICAgIHNlYXJjaEl0ZW1z LmNsZWFyKCk7Ci0gICAgUmV0YWluUHRyPENGQXJyYXlSZWY+IGl0ZW1zID0gYWRvcHRDRihyZWlu dGVycHJldF9jYXN0PENGQXJyYXlSZWY+KENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUoYXV0b3Nh dmVLZXkobmFtZSkuZ2V0KCksIGtDRlByZWZlcmVuY2VzQ3VycmVudEFwcGxpY2F0aW9uKSkpOwor ICAgIGlmICghbmFtZSkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNz YWdlIGNoZWNrLgorICAgICAgICByZXR1cm47CisgICAgfQogCi0gICAgaWYgKCFpdGVtcyB8fCBD RkdldFR5cGVJRChpdGVtcy5nZXQoKSkgIT0gQ0ZBcnJheUdldFR5cGVJRCgpKQorICAgIGF1dG8g aXRlbXMgPSBhZG9wdENGKGR5bmFtaWNfY2ZfY2FzdDxDRkFycmF5UmVmPihDRlByZWZlcmVuY2Vz Q29weUFwcFZhbHVlKGF1dG9zYXZlS2V5KG5hbWUpLmdldCgpLCBrQ0ZQcmVmZXJlbmNlc0N1cnJl bnRBcHBsaWNhdGlvbikpKTsKKyAgICBpZiAoIWl0ZW1zKQogICAgICAgICByZXR1cm47CiAKLSAg ICBzaXplX3Qgc2l6ZSA9IENGQXJyYXlHZXRDb3VudChpdGVtcy5nZXQoKSk7Ci0gICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKLSAgICAgICAgQ0ZTdHJpbmdSZWYgaXRlbSA9 IChDRlN0cmluZ1JlZilDRkFycmF5R2V0VmFsdWVBdEluZGV4KGl0ZW1zLmdldCgpLCBpKTsKLSAg ICAgICAgaWYgKENGR2V0VHlwZUlEKGl0ZW0pID09IENGU3RyaW5nR2V0VHlwZUlEKCkpCisgICAg Zm9yIChzaXplX3QgaSA9IDAsIHNpemUgPSBDRkFycmF5R2V0Q291bnQoaXRlbXMuZ2V0KCkpOyBp IDwgc2l6ZTsgKytpKSB7CisgICAgICAgIGlmIChhdXRvIGl0ZW0gPSBkeW5hbWljX2NmX2Nhc3Q8 Q0ZTdHJpbmdSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoaXRlbXMuZ2V0KCksIGkpKSkKICAg ICAgICAgICAgIHNlYXJjaEl0ZW1zLmFwcGVuZChpdGVtKTsKICAgICB9CiB9Cg==