134064 2014-06-19 10:22:06 -0700 Simplify two HistoryController member functions 2014-06-19 10:29:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 1016690 0 andersca 2014-06-19 10:22:06 -0700 Simplify two HistoryController member functions 1016691 1 233365 andersca 2014-06-19 10:23:58 -0700 Created attachment 233365 Patch 1016693 2 andersca 2014-06-19 10:29:39 -0700 Committed r170148: <http://trac.webkit.org/changeset/170148> 233365 2014-06-19 10:23:58 -0700 2014-06-19 10:28:27 -0700 Patch bug-134064-20140619102336.patch text/plain 6640 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYxMDY5ZjQxODJmNTVj NzhkMmYwNzY0MjFlNmU2OTAzYWRiNzc4My4uZjhmYWE2N2RhZWY1ZTQzZDU2YjI0OWIwYTVmNWZi MmRjZTEwMjBkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA2LTE5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgdHdv IEhpc3RvcnlDb250cm9sbGVyIG1lbWJlciBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDA2NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgRnJhbWVMb2FkVHlwZSBwYXJh bWV0ZXIgZnJvbSByZWN1cnNpdmVTZXRQcm92aXNpb25hbEl0ZW0sCisgICAgICAgIHVzZSBlYXJs eSByZXR1cm5zIGFuZCBtb2Rlcm4gbG9vcHMuCisKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OmdvVG9J dGVtKToKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpyZWN1cnNpdmVTZXRQ cm92aXNpb25hbEl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnJl Y3Vyc2l2ZUdvVG9JdGVtKToKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuaDoK KwogMjAxNC0wNi0xOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtjdXJsXSBVbnJldmlld2VkIHNwZWN1bGF0aXZlIGJ1aWxkIGZpeCBhZnRl ciByMTcwMDIxLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250 cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAK aW5kZXggNDI2Y2NlN2U3YmUyMGVmOTI3Njc2NmIzMzYxY2I2M2ZhZjNhNjJiYi4uYTE3NzQwOGNh NmZiMGJjMmM0ZGVhMDg2YWY5NWI4MGE0N2E2MDQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCkBAIC0yODMsNyArMjgzLDcgQEAgdm9pZCBIaXN0b3J5 Q29udHJvbGxlcjo6Z29Ub0l0ZW0oSGlzdG9yeUl0ZW0qIHRhcmdldEl0ZW0sIEZyYW1lTG9hZFR5 cGUgdHlwZSkKICAgICB9CiAKICAgICAvLyBTZXQgdGhlIEJGIGN1cnNvciBiZWZvcmUgY29tbWl0 LCB3aGljaCBsZXRzIHRoZSB1c2VyIHF1aWNrbHkgY2xpY2sgYmFjay9mb3J3YXJkIGFnYWluLgot ICAgIC8vIC0gcGx1cywgaXQgb25seSBtYWtlcyBzZW5zZSBmb3IgdGhlIHRvcCBsZXZlbCBvZiB0 aGUgb3BlcmF0aW9uIHRocm91Z2ggdGhlIGZyYW1ldHJlZSwKKyAgICAvLyAtIHBsdXMsIGl0IG9u bHkgbWFrZXMgc2Vuc2UgZm9yIHRoZSB0b3AgbGV2ZWwgb2YgdGhlIG9wZXJhdGlvbiB0aHJvdWdo IHRoZSBmcmFtZSB0cmVlLAogICAgIC8vIGFzIG9wcG9zZWQgdG8gaGFwcGVuaW5nIGZvciBzb21l L29uZSBvZiB0aGUgcGFnZSBjb21taXRzIHRoYXQgbWlnaHQgaGFwcGVuIHNvb24KICAgICBSZWZQ dHI8SGlzdG9yeUl0ZW0+IGN1cnJlbnRJdGVtID0gcGFnZS0+YmFja0ZvcndhcmQoKS5jdXJyZW50 SXRlbSgpOwogICAgIHBhZ2UtPmJhY2tGb3J3YXJkKCkuc2V0Q3VycmVudEl0ZW0odGFyZ2V0SXRl bSk7CkBAIC0yOTMsNyArMjkzLDggQEAgdm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6Z29Ub0l0ZW0o SGlzdG9yeUl0ZW0qIHRhcmdldEl0ZW0sIEZyYW1lTG9hZFR5cGUgdHlwZSkKICAgICAvLyBUaGlz IG11c3QgYmUgZG9uZSBiZWZvcmUgdHJ5aW5nIHRvIG5hdmlnYXRlIHRoZSBkZXNpcmVkIGZyYW1l LCBiZWNhdXNlIHNvbWUKICAgICAvLyBuYXZpZ2F0aW9ucyBjYW4gY29tbWl0IGltbWVkaWF0ZWx5 IChzdWNoIGFzIGFib3V0OmJsYW5rKS4gIFdlIG11c3QgYmUgc3VyZSB0aGF0CiAgICAgLy8gYWxs IGZyYW1lcyBoYXZlIHByb3Zpc2lvbmFsIGl0ZW1zIHNldCBiZWZvcmUgdGhlIGNvbW1pdC4KLSAg ICByZWN1cnNpdmVTZXRQcm92aXNpb25hbEl0ZW0odGFyZ2V0SXRlbSwgY3VycmVudEl0ZW0uZ2V0 KCksIHR5cGUpOworICAgIHJlY3Vyc2l2ZVNldFByb3Zpc2lvbmFsSXRlbSh0YXJnZXRJdGVtLCBj dXJyZW50SXRlbS5nZXQoKSk7CisKICAgICAvLyBOb3cgdGhhdCBhbGwgb3RoZXIgZnJhbWVzIGhh dmUgcHJvdmlzaW9uYWwgaXRlbXMsIGRvIHRoZSBhY3R1YWwgbmF2aWdhdGlvbi4KICAgICByZWN1 cnNpdmVHb1RvSXRlbSh0YXJnZXRJdGVtLCBjdXJyZW50SXRlbS5nZXQoKSwgdHlwZSk7CiB9CkBA IC03MDUsMjYgKzcwNiwyNSBAQCBQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPiBIaXN0b3J5Q29udHJv bGxlcjo6Y3JlYXRlSXRlbVRyZWUoRnJhbWUmIHRhcmdldEZyYW1lLCBibwogLy8gdHJhY2tpbmcg d2hldGhlciBlYWNoIGZyYW1lIGFscmVhZHkgaGFzIHRoZSBjb250ZW50IHRoZSBpdGVtIHJlcXVl c3RzLiAgSWYgdGhlcmUgaXMKIC8vIGEgbWF0Y2gsIHdlIHNldCB0aGUgcHJvdmlzaW9uYWwgaXRl bSBhbmQgcmVjdXJzZS4gIE90aGVyd2lzZSB3ZSB3aWxsIHJlbG9hZCB0aGF0CiAvLyBmcmFtZSBh bmQgYWxsIGl0cyBraWRzIGluIHJlY3Vyc2l2ZUdvVG9JdGVtLgotdm9pZCBIaXN0b3J5Q29udHJv bGxlcjo6cmVjdXJzaXZlU2V0UHJvdmlzaW9uYWxJdGVtKEhpc3RvcnlJdGVtKiBpdGVtLCBIaXN0 b3J5SXRlbSogZnJvbUl0ZW0sIEZyYW1lTG9hZFR5cGUgdHlwZSkKK3ZvaWQgSGlzdG9yeUNvbnRy b2xsZXI6OnJlY3Vyc2l2ZVNldFByb3Zpc2lvbmFsSXRlbShIaXN0b3J5SXRlbSogaXRlbSwgSGlz dG9yeUl0ZW0qIGZyb21JdGVtKQogewogICAgIEFTU0VSVChpdGVtKTsKIAotICAgIGlmIChpdGVt c0FyZUNsb25lcyhpdGVtLCBmcm9tSXRlbSkpIHsKLSAgICAgICAgLy8gU2V0IHByb3Zpc2lvbmFs IGl0ZW0sIHdoaWNoIHdpbGwgYmUgY29tbWl0dGVkIGluIHJlY3Vyc2l2ZVVwZGF0ZUZvckNvbW1p dC4KLSAgICAgICAgbV9wcm92aXNpb25hbEl0ZW0gPSBpdGVtOworICAgIGlmICghaXRlbXNBcmVD bG9uZXMoaXRlbSwgZnJvbUl0ZW0pKQorICAgICAgICByZXR1cm47CiAKLSAgICAgICAgY29uc3Qg SGlzdG9yeUl0ZW1WZWN0b3ImIGNoaWxkSXRlbXMgPSBpdGVtLT5jaGlsZHJlbigpOworICAgIC8v IFNldCBwcm92aXNpb25hbCBpdGVtLCB3aGljaCB3aWxsIGJlIGNvbW1pdHRlZCBpbiByZWN1cnNp dmVVcGRhdGVGb3JDb21taXQuCisgICAgbV9wcm92aXNpb25hbEl0ZW0gPSBpdGVtOwogCi0gICAg ICAgIGludCBzaXplID0gY2hpbGRJdGVtcy5zaXplKCk7CisgICAgZm9yIChjb25zdCBhdXRvJiBj aGlsZEl0ZW0gOiBpdGVtLT5jaGlsZHJlbigpKSB7CisgICAgICAgIGNvbnN0IFN0cmluZyYgY2hp bGRGcmFtZU5hbWUgPSBjaGlsZEl0ZW0tPnRhcmdldCgpOwogCi0gICAgICAgIGZvciAoaW50IGkg PSAwOyBpIDwgc2l6ZTsgKytpKSB7Ci0gICAgICAgICAgICBTdHJpbmcgY2hpbGRGcmFtZU5hbWUg PSBjaGlsZEl0ZW1zW2ldLT50YXJnZXQoKTsKLSAgICAgICAgICAgIEhpc3RvcnlJdGVtKiBmcm9t Q2hpbGRJdGVtID0gZnJvbUl0ZW0tPmNoaWxkSXRlbVdpdGhUYXJnZXQoY2hpbGRGcmFtZU5hbWUp OwotICAgICAgICAgICAgQVNTRVJUKGZyb21DaGlsZEl0ZW0pOwotICAgICAgICAgICAgRnJhbWUq IGNoaWxkRnJhbWUgPSBtX2ZyYW1lLnRyZWUoKS5jaGlsZChjaGlsZEZyYW1lTmFtZSk7Ci0gICAg ICAgICAgICBBU1NFUlQoY2hpbGRGcmFtZSk7Ci0gICAgICAgICAgICBjaGlsZEZyYW1lLT5sb2Fk ZXIoKS5oaXN0b3J5KCkucmVjdXJzaXZlU2V0UHJvdmlzaW9uYWxJdGVtKGNoaWxkSXRlbXNbaV0u Z2V0KCksIGZyb21DaGlsZEl0ZW0sIHR5cGUpOwotICAgICAgICB9CisgICAgICAgIEhpc3RvcnlJ dGVtKiBmcm9tQ2hpbGRJdGVtID0gZnJvbUl0ZW0tPmNoaWxkSXRlbVdpdGhUYXJnZXQoY2hpbGRG cmFtZU5hbWUpOworICAgICAgICBBU1NFUlQoZnJvbUNoaWxkSXRlbSk7CisgICAgICAgIEZyYW1l KiBjaGlsZEZyYW1lID0gbV9mcmFtZS50cmVlKCkuY2hpbGQoY2hpbGRGcmFtZU5hbWUpOworICAg ICAgICBBU1NFUlQoY2hpbGRGcmFtZSk7CisKKyAgICAgICAgY2hpbGRGcmFtZS0+bG9hZGVyKCku aGlzdG9yeSgpLnJlY3Vyc2l2ZVNldFByb3Zpc2lvbmFsSXRlbShjaGlsZEl0ZW0uZ2V0KCksIGZy b21DaGlsZEl0ZW0pOwogICAgIH0KIH0KIApAQCAtNzM0LDIxICs3MzQsMjAgQEAgdm9pZCBIaXN0 b3J5Q29udHJvbGxlcjo6cmVjdXJzaXZlR29Ub0l0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0sIEhpc3Rv cnlJdGVtKiBmcm9tSXQKIHsKICAgICBBU1NFUlQoaXRlbSk7CiAKLSAgICBpZiAoaXRlbXNBcmVD bG9uZXMoaXRlbSwgZnJvbUl0ZW0pKSB7Ci0gICAgICAgIC8vIEp1c3QgaXRlcmF0ZSBvdmVyIHRo ZSByZXN0LCBsb29raW5nIGZvciBmcmFtZXMgdG8gbmF2aWdhdGUuCi0gICAgICAgIGNvbnN0IEhp c3RvcnlJdGVtVmVjdG9yJiBjaGlsZEl0ZW1zID0gaXRlbS0+Y2hpbGRyZW4oKTsKLQotICAgICAg ICBpbnQgc2l6ZSA9IGNoaWxkSXRlbXMuc2l6ZSgpOwotICAgICAgICBmb3IgKGludCBpID0gMDsg aSA8IHNpemU7ICsraSkgewotICAgICAgICAgICAgU3RyaW5nIGNoaWxkRnJhbWVOYW1lID0gY2hp bGRJdGVtc1tpXS0+dGFyZ2V0KCk7Ci0gICAgICAgICAgICBIaXN0b3J5SXRlbSogZnJvbUNoaWxk SXRlbSA9IGZyb21JdGVtLT5jaGlsZEl0ZW1XaXRoVGFyZ2V0KGNoaWxkRnJhbWVOYW1lKTsKLSAg ICAgICAgICAgIEFTU0VSVChmcm9tQ2hpbGRJdGVtKTsKLSAgICAgICAgICAgIEZyYW1lKiBjaGls ZEZyYW1lID0gbV9mcmFtZS50cmVlKCkuY2hpbGQoY2hpbGRGcmFtZU5hbWUpOwotICAgICAgICAg ICAgQVNTRVJUKGNoaWxkRnJhbWUpOwotICAgICAgICAgICAgY2hpbGRGcmFtZS0+bG9hZGVyKCku aGlzdG9yeSgpLnJlY3Vyc2l2ZUdvVG9JdGVtKGNoaWxkSXRlbXNbaV0uZ2V0KCksIGZyb21DaGls ZEl0ZW0sIHR5cGUpOwotICAgICAgICB9Ci0gICAgfSBlbHNlIHsKKyAgICBpZiAoIWl0ZW1zQXJl Q2xvbmVzKGl0ZW0sIGZyb21JdGVtKSkgewogICAgICAgICBtX2ZyYW1lLmxvYWRlcigpLmxvYWRJ dGVtKGl0ZW0sIHR5cGUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gSnVzdCBp dGVyYXRlIG92ZXIgdGhlIHJlc3QsIGxvb2tpbmcgZm9yIGZyYW1lcyB0byBuYXZpZ2F0ZS4KKyAg ICBmb3IgKGNvbnN0IGF1dG8mIGNoaWxkSXRlbSA6IGl0ZW0tPmNoaWxkcmVuKCkpIHsKKyAgICAg ICAgY29uc3QgU3RyaW5nJiBjaGlsZEZyYW1lTmFtZSA9IGNoaWxkSXRlbS0+dGFyZ2V0KCk7CisK KyAgICAgICAgSGlzdG9yeUl0ZW0qIGZyb21DaGlsZEl0ZW0gPSBmcm9tSXRlbS0+Y2hpbGRJdGVt V2l0aFRhcmdldChjaGlsZEZyYW1lTmFtZSk7CisgICAgICAgIEFTU0VSVChmcm9tQ2hpbGRJdGVt KTsKKyAgICAgICAgRnJhbWUqIGNoaWxkRnJhbWUgPSBtX2ZyYW1lLnRyZWUoKS5jaGlsZChjaGls ZEZyYW1lTmFtZSk7CisgICAgICAgIEFTU0VSVChjaGlsZEZyYW1lKTsKKyAgICAgICAgY2hpbGRG cmFtZS0+bG9hZGVyKCkuaGlzdG9yeSgpLnJlY3Vyc2l2ZUdvVG9JdGVtKGNoaWxkSXRlbS5nZXQo KSwgZnJvbUNoaWxkSXRlbSwgdHlwZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9IaXN0b3J5Q29udHJvbGxlci5oCmluZGV4IDRmNjk0YzMzMjg1MzI5NmZmODRjZDM1NzdiNzc4 OWM4MmM1ZTUyMTguLjE5NjRlMzc0N2UxMTliNmFmNmVhM2Q4MzYzNTMwZjI0MWI1YjYzODYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5oCkBAIC05OCw3ICs5OCw3 IEBAIHByaXZhdGU6CiAgICAgUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gY3JlYXRlSXRlbSgpOwog ICAgIFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IGNyZWF0ZUl0ZW1UcmVlKEZyYW1lJiB0YXJnZXRG cmFtZSwgYm9vbCBjbGlwQXRUYXJnZXQpOwogCi0gICAgdm9pZCByZWN1cnNpdmVTZXRQcm92aXNp b25hbEl0ZW0oSGlzdG9yeUl0ZW0qLCBIaXN0b3J5SXRlbSosIEZyYW1lTG9hZFR5cGUpOworICAg IHZvaWQgcmVjdXJzaXZlU2V0UHJvdmlzaW9uYWxJdGVtKEhpc3RvcnlJdGVtKiwgSGlzdG9yeUl0 ZW0qKTsKICAgICB2b2lkIHJlY3Vyc2l2ZUdvVG9JdGVtKEhpc3RvcnlJdGVtKiwgSGlzdG9yeUl0 ZW0qLCBGcmFtZUxvYWRUeXBlKTsKICAgICBib29sIGlzUmVwbGFjZUxvYWRUeXBlV2l0aFByb3Zp c2lvbmFsSXRlbShGcmFtZUxvYWRUeXBlKTsKICAgICBib29sIGlzUmVsb2FkVHlwZVdpdGhQcm92 aXNpb25hbEl0ZW0oRnJhbWVMb2FkVHlwZSk7Cg==