163623 2016-10-18 14:55:38 -0700 Get rid of more WebHistoryItem cruft 2016-10-18 15:31:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca cdumez commit-queue oldest_to_newest 1241629 0 andersca 2016-10-18 14:55:38 -0700 Get rid of more WebHistoryItem cruft 1241630 1 291990 andersca 2016-10-18 14:56:03 -0700 Created attachment 291990 Patch 1241646 2 andersca 2016-10-18 15:31:17 -0700 Committed r207493: <http://trac.webkit.org/changeset/207493> 291990 2016-10-18 14:56:03 -0700 2016-10-18 15:02:34 -0700 Patch bug-163623-20161018145231.patch text/plain 7134 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIyYmRkZjUwNzg5YWY4 ODhlMzhmNmNlOTkzNWUwNDJmNDEzYmQ4OS4uNjIxMWUxY2ZjMDVjOGQwOTEyNTQ0ODI5N2E3YWE5 YmMxNGM2NmVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTEwLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBt b3JlIFdlYkhpc3RvcnlJdGVtIGNydWZ0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjM2MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKToKKyAgICAgICAgKiBoaXN0b3J5L0hpc3Rv cnlJdGVtLmg6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0Vmlld3BvcnRBcmd1 bWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OmJvb2ttYXJrSUQpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnNldEJvb2ttYXJrSUQpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnNoYXJlZExpbmtVbmlxdWVJZGVu dGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjpzZXRTaGFy ZWRMaW5rVW5pcXVlSWRlbnRpZmllcik6IERlbGV0ZWQuCisKIDIwMTYtMTAtMTcgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHNvbWUgaGlzdG9y eSBzcGVjaWZpYyBIaXN0b3J5SXRlbSBjb2RlIHRvIFdlYkhpc3RvcnlJdGVtCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKaW5kZXggNDJhNmFhMjdiOGIxYmIyNDAyMzhjMTk3ZmVmYTgxYjk3ZTYwZGM0MS4uYzBkM2I3 YzhjZmExNGI2MDA2ODMwZDdhMzk0YmViNmY4Y2Y0NzI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDE2LTEwLTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBtb3JlIFdlYkhpc3RvcnlJdGVtIGNydWZ0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjM2MjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEhpc3Rvcnkv V2ViSGlzdG9yeUl0ZW0ubW06CisgICAgICAgICgtW1dlYkhpc3RvcnlJdGVtIGluaXRGcm9tRGlj dGlvbmFyeVJlcHJlc2VudGF0aW9uOl0pOgorICAgICAgICAqIEhpc3RvcnkvV2ViSGlzdG9yeUl0 ZW1Qcml2YXRlLmg6CisKIDIwMTYtMTAtMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHNvbWUgaGlzdG9yeSBzcGVjaWZpYyBIaXN0b3J5SXRl bSBjb2RlIHRvIFdlYkhpc3RvcnlJdGVtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0 b3J5L0hpc3RvcnlJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0u Y3BwCmluZGV4IDkxMThmOGEyNzZmNzliMDA2M2EwZDA1NTVjM2M5MjNkMGM5NmM4MzIuLjMyMDc5 OGU5OTEwYzViODQ3YjBiMjg4ZDE5ODc4ODJkODViYzNkZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3Rv cnkvSGlzdG9yeUl0ZW0uY3BwCkBAIC0xMjAsOCArMTIwLDYgQEAgaW5saW5lIEhpc3RvcnlJdGVt OjpIaXN0b3J5SXRlbShjb25zdCBIaXN0b3J5SXRlbSYgaXRlbSkKICAgICAsIG1fb2JzY3VyZWRJ bnNldChpdGVtLm1fb2JzY3VyZWRJbnNldCkKICAgICAsIG1fc2NhbGUoaXRlbS5tX3NjYWxlKQog ICAgICwgbV9zY2FsZUlzSW5pdGlhbChpdGVtLm1fc2NhbGVJc0luaXRpYWwpCi0gICAgLCBtX2Jv b2ttYXJrSUQoaXRlbS5tX2Jvb2ttYXJrSUQpCi0gICAgLCBtX3NoYXJlZExpbmtVbmlxdWVJZGVu dGlmaWVyKGl0ZW0ubV9zaGFyZWRMaW5rVW5pcXVlSWRlbnRpZmllcikKICNlbmRpZgogewogICAg IGlmIChpdGVtLm1fZm9ybURhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5 L0hpc3RvcnlJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKaW5k ZXggOWI0MmQ4ODllMWExMTU2YmQ4OWYxZWNlMTA5YzY5MmZmOTE5NTJhOS4uMzQ0ZDUzNmZlYTQy NDU1ZDU0YTQ1NDA3NTFhMmYwZjhjOGUzYjE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9IaXN0b3J5SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9y eUl0ZW0uaApAQCAtMTkyLDExICsxOTIsNiBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBWaWV3cG9y dEFyZ3VtZW50cyYgdmlld3BvcnRBcmd1bWVudHMoKSBjb25zdCB7IHJldHVybiBtX3ZpZXdwb3J0 QXJndW1lbnRzOyB9CiAgICAgdm9pZCBzZXRWaWV3cG9ydEFyZ3VtZW50cyhjb25zdCBWaWV3cG9y dEFyZ3VtZW50cyYgdmlld3BvcnRBcmd1bWVudHMpIHsgbV92aWV3cG9ydEFyZ3VtZW50cyA9IHZp ZXdwb3J0QXJndW1lbnRzOyB9Ci0KLSAgICB1aW50MzJfdCBib29rbWFya0lEKCkgY29uc3QgeyBy ZXR1cm4gbV9ib29rbWFya0lEOyB9Ci0gICAgdm9pZCBzZXRCb29rbWFya0lEKHVpbnQzMl90IGJv b2ttYXJrSUQpIHsgbV9ib29rbWFya0lEID0gYm9va21hcmtJRDsgfQotICAgIFN0cmluZyBzaGFy ZWRMaW5rVW5pcXVlSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fc2hhcmVkTGlua1VuaXF1 ZUlkZW50aWZpZXI7IH0KLSAgICB2b2lkIHNldFNoYXJlZExpbmtVbmlxdWVJZGVudGlmaWVyKGNv bnN0IFN0cmluZyYgc2hhcmVkTGlua1VuaXF1ZWlkZW50aWZpZXIpIHsgbV9zaGFyZWRMaW5rVW5p cXVlSWRlbnRpZmllciA9IHNoYXJlZExpbmtVbmlxdWVpZGVudGlmaWVyOyB9CiAjZW5kaWYKIAog ICAgIHZvaWQgbm90aWZ5Q2hhbmdlZCgpOwpAQCAtMjY1LDkgKzI2MCw2IEBAIHByaXZhdGU6CiAg ICAgZmxvYXQgbV9zY2FsZSB7IDAgfTsgLy8gTm90ZSB0aGF0IFVJV2ViVmlldyBsb29rcyBmb3Ig YSBub24temVybyB2YWx1ZSwgc28gdGhpcyBoYXMgdG8gc3RhcnQgYXMgMC4KICAgICBib29sIG1f c2NhbGVJc0luaXRpYWwgeyBmYWxzZSB9OwogICAgIFZpZXdwb3J0QXJndW1lbnRzIG1fdmlld3Bv cnRBcmd1bWVudHM7Ci0KLSAgICB1aW50MzJfdCBtX2Jvb2ttYXJrSUQgeyAwIH07Ci0gICAgU3Ry aW5nIG1fc2hhcmVkTGlua1VuaXF1ZUlkZW50aWZpZXI7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JN KENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5 SXRlbS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0KaW5k ZXggM2RmN2RmZTM1NTQ4YTQzOTlmODZhYjJjMWFkZDUwYzUwNjdjMjlmYS4uMjVhNDMzMjA3YTBl MzJmMTRjYTRiOTllYjU1OGRhOTk3ODE0NTUxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9t YWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0 b3J5L1dlYkhpc3RvcnlJdGVtLm1tCkBAIC03MSw5ICs3MSw2IEBAIHN0YXRpYyBOU1N0cmluZyAq c2NhbGVLZXkgPSBAInNjYWxlIjsKIHN0YXRpYyBOU1N0cmluZyAqc2NhbGVJc0luaXRpYWxLZXkg PSBAInNjYWxlSXNJbml0aWFsIjsKIHN0YXRpYyBOU1N0cmluZyAqc2Nyb2xsUG9pbnRYS2V5ID0g QCJzY3JvbGxQb2ludFgiOwogc3RhdGljIE5TU3RyaW5nICpzY3JvbGxQb2ludFlLZXkgPSBAInNj cm9sbFBvaW50WSI7Ci0KLXN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJvb2ttYXJrSURLZXkgPSBA ImJvb2ttYXJrSUQiOwotc3RhdGljIE5TU3RyaW5nICogY29uc3Qgc2hhcmVkTGlua1VuaXF1ZUlk ZW50aWZpZXJLZXkgPSBAInNoYXJlZExpbmtVbmlxdWVJZGVudGlmaWVyIjsKICNlbmRpZgogCiAv LyBQcml2YXRlIGtleXMgdXNlZCBpbiB0aGUgV2ViSGlzdG9yeUl0ZW0ncyBkaWN0aW9uYXJ5IHJl cHJlc2VudGF0aW9uLgpAQCAtMzc5LDE0ICszNzYsNiBAQCBXZWJIaXN0b3J5SXRlbSAqa2l0KEhp c3RvcnlJdGVtKiBpdGVtKQogICAgIE5TTnVtYmVyICpzY3JvbGxQb2ludFlWYWx1ZSA9IFtkaWN0 IG9iamVjdEZvcktleTpzY3JvbGxQb2ludFlLZXldOwogICAgIGlmIChzY3JvbGxQb2ludFhWYWx1 ZSAmJiBzY3JvbGxQb2ludFlWYWx1ZSkKICAgICAgICAgY29yZShfcHJpdmF0ZSktPnNldFNjcm9s bFBvc2l0aW9uKEludFBvaW50KFtzY3JvbGxQb2ludFhWYWx1ZSBpbnRWYWx1ZV0sIFtzY3JvbGxQ b2ludFlWYWx1ZSBpbnRWYWx1ZV0pKTsKLQotICAgIHVpbnQzMl90IGJvb2ttYXJrSURWYWx1ZSA9 IFtbZGljdCBvYmplY3RGb3JLZXk6Ym9va21hcmtJREtleV0gdW5zaWduZWRJbnRWYWx1ZV07Ci0g ICAgaWYgKGJvb2ttYXJrSURWYWx1ZSkKLSAgICAgICAgY29yZShfcHJpdmF0ZSktPnNldEJvb2tt YXJrSUQoYm9va21hcmtJRFZhbHVlKTsKLQotICAgIE5TU3RyaW5nICpzaGFyZWRMaW5rVW5pcXVl SWRlbnRpZmllclZhbHVlID0gW2RpY3Qgb2JqZWN0Rm9yS2V5OnNoYXJlZExpbmtVbmlxdWVJZGVu dGlmaWVyS2V5XTsKLSAgICBpZiAoc2hhcmVkTGlua1VuaXF1ZUlkZW50aWZpZXJWYWx1ZSkKLSAg ICAgICAgY29yZShfcHJpdmF0ZSktPnNldFNoYXJlZExpbmtVbmlxdWVJZGVudGlmaWVyKHNoYXJl ZExpbmtVbmlxdWVJZGVudGlmaWVyVmFsdWUpOwogI2VuZGlmCiAKICAgICByZXR1cm4gc2VsZjsK QEAgLTQ3NSwxNCArNDY0LDYgQEAgV2ViSGlzdG9yeUl0ZW0gKmtpdChIaXN0b3J5SXRlbSogaXRl bSkKICAgICBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbiA9IGNvcmUoX3ByaXZhdGUpLT5zY3JvbGxQ b3NpdGlvbigpOwogICAgIFtkaWN0IHNldE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEludDpz Y3JvbGxQb3NpdGlvbi54KCldIGZvcktleTpzY3JvbGxQb2ludFhLZXldOwogICAgIFtkaWN0IHNl dE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEludDpzY3JvbGxQb3NpdGlvbi55KCldIGZvcktl eTpzY3JvbGxQb2ludFlLZXldOwotCi0gICAgdWludDMyX3QgYm9va21hcmtJRCA9IGNvcmUoX3By aXZhdGUpLT5ib29rbWFya0lEKCk7Ci0gICAgaWYgKGJvb2ttYXJrSUQpCi0gICAgICAgIFtkaWN0 IHNldE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aFVuc2lnbmVkSW50OmJvb2ttYXJrSURdIGZv cktleTpib29rbWFya0lES2V5XTsKLQotICAgIE5TU3RyaW5nICpzaGFyZWRMaW5rVW5pcXVlSWRl bnRpZmllciA9IFtzZWxmIF9zaGFyZWRMaW5rVW5pcXVlSWRlbnRpZmllcl07Ci0gICAgaWYgKHNo YXJlZExpbmtVbmlxdWVJZGVudGlmaWVyKQotICAgICAgICBbZGljdCBzZXRPYmplY3Q6c2hhcmVk TGlua1VuaXF1ZUlkZW50aWZpZXIgZm9yS2V5OnNoYXJlZExpbmtVbmlxdWVJZGVudGlmaWVyS2V5 XTsKICNlbmRpZgogCiAgICAgcmV0dXJuIGRpY3Q7CkBAIC02MTksMjUgKzYwMCw2IEBAIFdlYkhp c3RvcnlJdGVtICpraXQoSGlzdG9yeUl0ZW0qIGl0ZW0pCiAgICAgY29yZShfcHJpdmF0ZSktPnNl dFNjcm9sbFBvc2l0aW9uKEludFBvaW50KHNjcm9sbFBvaW50KSk7CiB9CiAKLS0gKHVpbnQzMl90 KV9ib29rbWFya0lECi17Ci0gICAgcmV0dXJuIGNvcmUoX3ByaXZhdGUpLT5ib29rbWFya0lEKCk7 Ci19Ci0KLS0gKHZvaWQpX3NldEJvb2ttYXJrSUQ6KHVpbnQzMl90KWJvb2ttYXJrSUQKLXsKLSAg ICBjb3JlKF9wcml2YXRlKS0+c2V0Qm9va21hcmtJRChib29rbWFya0lEKTsKLX0KLQotLSAoTlNT dHJpbmcgKilfc2hhcmVkTGlua1VuaXF1ZUlkZW50aWZpZXIKLXsKLSAgICByZXR1cm4gbnNTdHJp bmdOaWxJZkVtcHR5KGNvcmUoX3ByaXZhdGUpLT5zaGFyZWRMaW5rVW5pcXVlSWRlbnRpZmllcigp KTsKLX0KLQotLSAodm9pZClfc2V0U2hhcmVkTGlua1VuaXF1ZUlkZW50aWZpZXI6KE5TU3RyaW5n ICopaWRlbnRpZmllcgotewotICAgIGNvcmUoX3ByaXZhdGUpLT5zZXRTaGFyZWRMaW5rVW5pcXVl SWRlbnRpZmllcihpZGVudGlmaWVyKTsKLX0KICNlbmRpZiAvLyBQTEFURk9STShJT1MpCiAKIC0g KEJPT0wpX2lzSW5QYWdlQ2FjaGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rv cnkvV2ViSGlzdG9yeUl0ZW1Qcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dl Ykhpc3RvcnlJdGVtUHJpdmF0ZS5oCmluZGV4IGI0ZmJmNmMwOTQzNWExZmQzYWExYTUxOTRhNTQ4 MzJhYmJjMWI1NjcuLmY4ZTYzMzFjOTljZmNmZjgwZTMyNDk0NWNkMWFhMTFkYWMyZWM0MjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW1Qcml2YXRl LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbVByaXZhdGUu aApAQCAtNzUsMTEgKzc1LDYgQEAgZXh0ZXJuIE5TU3RyaW5nICpXZWJWaWV3cG9ydEhlaWdodEtl eTsKIC0gKHZvaWQpX3NldFZpZXdwb3J0QXJndW1lbnRzOihOU0RpY3Rpb25hcnkgKilhcmd1bWVu dHM7CiAtIChDR1BvaW50KV9zY3JvbGxQb2ludDsKIC0gKHZvaWQpX3NldFNjcm9sbFBvaW50OihD R1BvaW50KXNjcm9sbFBvaW50OwotCi0tICh1aW50MzJfdClfYm9va21hcmtJRDsKLS0gKHZvaWQp X3NldEJvb2ttYXJrSUQ6KHVpbnQzMl90KWJvb2ttYXJrSUQ7Ci0tIChOU1N0cmluZyAqKV9zaGFy ZWRMaW5rVW5pcXVlSWRlbnRpZmllcjsKLS0gKHZvaWQpX3NldFNoYXJlZExpbmtVbmlxdWVJZGVu dGlmaWVyOihOU1N0cmluZyAqKWlkZW50aWZpZXI7CiAjZW5kaWYKIAogLSAoQk9PTClfaXNJblBh Z2VDYWNoZTsK