32251 2009-12-07 15:13:03 -0800 To avoid potential crash in Android history item 2009-12-11 04:21:49 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 klobag webkit-unassigned android-webkit-unforking beidson benm commit-queue darin eric oldest_to_newest 169493 0 klobag 2009-12-07 15:13:03 -0800 As AndroidWebHistoryBridge holds a dumb pointer of HistoryItem and HistoryItem holds a RefPtr of AndroidWebHistoryBridge, the dumb pointer needs to be cleared when HistoryItem is deleted to avoid potential crash. 169495 1 44436 klobag 2009-12-07 15:16:10 -0800 Created attachment 44436 proposed patch 169534 2 44436 eric 2009-12-07 16:44:27 -0800 Comment on attachment 44436 proposed patch The tab in AndroidWebHistoryBridge.h will prevent this from being landed as is. Although WebKit has no explicit wrapping rule, it mgiht make sense to wrap the txt in the ChangeLog at some point. It feels strange that HistoryItem.cpp has to have an ANDROID ifdef, but maybe that's the design that you and Brady agreed on? r- for the tab. 169537 3 44448 klobag 2009-12-07 16:53:31 -0800 Created attachment 44448 new patch according to the comment. Fix the tab. Add line break in the ChangeLog. The pattern used in HistoryItem is following the existing model. 170659 4 44448 commit-queue 2009-12-11 02:24:00 -0800 Comment on attachment 44448 new patch according to the comment. Rejecting patch 44448 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Darin Adler', '--force']" exit_code: 1 patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/history/HistoryItem.cpp Hunk #1 FAILED at 102. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/history/HistoryItem.cpp.rej patching file WebCore/history/android/AndroidWebHistoryBridge.h 170661 5 benm 2009-12-11 02:38:07 -0800 This is a straightforward merge fix, I'll land manually. 170683 6 benm 2009-12-11 04:21:49 -0800 Landed as r51980. 44436 2009-12-07 15:16:10 -0800 2009-12-07 16:53:31 -0800 proposed patch history.txt text/plain 2621 klobag SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTc5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMTItMDcgIEdyYWNlIEtsb2JhICA8a2xvYmFnQGdtYWlsLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQW5k cm9pZF0gQWRkIGRldGFjaEhpc3RvcnlJdGVtKCkgdG8gQW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2Uu IEFuZCB0aGUgY29uc3RydWN0b3IgdGFrZXMgSGlzdG9yeUl0ZW0qIG5vdy4gQXMgQW5kcm9pZFdl Ykhpc3RvcnlCcmlkZ2UgaG9sZHMgYSBkdW1iIHBvaW50ZXIgb2YgSGlzdG9yeUl0ZW0gYW5kIEhp c3RvcnlJdGVtIGhvbGRzIGEgUmVmUHRyIG9mIEFuZHJvaWRXZWJIaXN0b3J5QnJpZGdlLCB0aGUg ZHVtYiBwb2ludGVyIG5lZWRzIHRvIGJlIGNsZWFyZWQgd2hlbiBIaXN0b3J5SXRlbSBpcyBkZWxl dGVkIHRvIGF2b2lkIHBvdGVudGlhbCBjcmFzaC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjUxCisKKyAgICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJ dGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjp+SGlzdG9yeUl0ZW0pOgor ICAgICAgICAqIGhpc3RvcnkvYW5kcm9pZC9BbmRyb2lkV2ViSGlzdG9yeUJyaWRnZS5oOgorICAg ICAgICAoV2ViQ29yZTo6QW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2U6OkFuZHJvaWRXZWJIaXN0b3J5 QnJpZGdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuZHJvaWRXZWJIaXN0b3J5QnJpZGdlOjpkZXRh Y2hIaXN0b3J5SXRlbSk6CisKIDIwMDktMTItMDcgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29y ZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2hpc3Rvcnkv SGlzdG9yeUl0ZW0uY3BwCShyZXZpc2lvbiA1MTc5NSkKKysrIFdlYkNvcmUvaGlzdG9yeS9IaXN0 b3J5SXRlbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsMTAgQEAgSGlzdG9yeUl0 ZW06On5IaXN0b3J5SXRlbSgpCiAgICAgQVNTRVJUKCFtX2NhY2hlZFBhZ2UpOwogICAgIGljb25E YXRhYmFzZSgpLT5yZWxlYXNlSWNvbkZvclBhZ2VVUkwobV91cmxTdHJpbmcpOwogICAgIHNldERv Y3VtZW50KDApOworI2lmIFBMQVRGT1JNKEFORFJPSUQpCisgICAgaWYgKG1fYnJpZGdlKQorICAg ICAgICBtX2JyaWRnZS0+ZGV0YWNoSGlzdG9yeUl0ZW0oKTsKKyNlbmRpZgogfQogCiBpbmxpbmUg SGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKGNvbnN0IEhpc3RvcnlJdGVtJiBpdGVtKQpJbmRleDog V2ViQ29yZS9oaXN0b3J5L2FuZHJvaWQvQW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2hpc3RvcnkvYW5kcm9pZC9BbmRyb2lkV2ViSGlzdG9yeUJyaWRnZS5o CShyZXZpc2lvbiA1MTc5NSkKKysrIFdlYkNvcmUvaGlzdG9yeS9hbmRyb2lkL0FuZHJvaWRXZWJI aXN0b3J5QnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDExICszNCwxMSBAQCBjbGFzcyBI aXN0b3J5SXRlbTsKIAogY2xhc3MgQW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2UgOiBwdWJsaWMgUmVm Q291bnRlZDxBbmRyb2lkV2ViSGlzdG9yeUJyaWRnZT4gewogcHVibGljOgotICAgIEFuZHJvaWRX ZWJIaXN0b3J5QnJpZGdlKCkKKyAgICBBbmRyb2lkV2ViSGlzdG9yeUJyaWRnZShIaXN0b3J5SXRl bSogaXRlbSkKICAgICAgICAgOiBtX3NjYWxlKDEwMCkKICAgICAgICAgLCBtX3NjcmVlbldpZHRo U2NhbGUoMTAwKQogICAgICAgICAsIG1fYWN0aXZlKGZhbHNlKQotICAgICAgICAsIG1faGlzdG9y eUl0ZW0oMCkgeyB9CisgICAgICAgICwgbV9oaXN0b3J5SXRlbShpdGVtKSB7IH0KICAgICB2aXJ0 dWFsIH5BbmRyb2lkV2ViSGlzdG9yeUJyaWRnZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCB1cGRh dGVIaXN0b3J5SXRlbShIaXN0b3J5SXRlbSogaXRlbSkgPSAwOwogCkBAIC00Niw2ICs0Niw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldFNjcmVlbldpZHRoU2NhbGUoaW50IHMpIHsgbV9zY3JlZW5X aWR0aFNjYWxlID0gczsgfQogICAgIGludCBzY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2NhbGU7 IH0KICAgICBpbnQgc2NyZWVuV2lkdGhTY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2NyZWVuV2lk dGhTY2FsZTsgfQorCXZvaWQgZGV0YWNoSGlzdG9yeUl0ZW0oKSB7IG1faGlzdG9yeUl0ZW0gPSAw OyB9CiAgICAgSGlzdG9yeUl0ZW0qIGhpc3RvcnlJdGVtKCkgY29uc3QgeyByZXR1cm4gbV9oaXN0 b3J5SXRlbTsgfQogICAgIHZvaWQgc2V0QWN0aXZlKCkgeyBtX2FjdGl2ZSA9IHRydWU7IH0KIAo= 44448 2009-12-07 16:53:31 -0800 2009-12-11 02:24:00 -0800 new patch according to the comment. history.txt text/plain 2727 klobag SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTgxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMTItMDcgIEdyYWNlIEtsb2JhICA8a2xvYmFnQGdtYWlsLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQW5k cm9pZF0gQWRkIGRldGFjaEhpc3RvcnlJdGVtKCkgdG8gQW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2Uu IEFuZCB0aGUgY29uc3RydWN0b3IgdGFrZXMKKyAgICAgICAgSGlzdG9yeUl0ZW0qIG5vdy4gQXMg QW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2UgaG9sZHMgYSBkdW1iIHBvaW50ZXIgb2YgSGlzdG9yeUl0 ZW0gYW5kCisgICAgICAgIEhpc3RvcnlJdGVtIGhvbGRzIGEgUmVmUHRyIG9mIEFuZHJvaWRXZWJI aXN0b3J5QnJpZGdlLCB0aGUgZHVtYiBwb2ludGVyIG5lZWRzIHRvIGJlIGNsZWFyZWQKKyAgICAg ICAgd2hlbiBIaXN0b3J5SXRlbSBpcyBkZWxldGVkIHRvIGF2b2lkIHBvdGVudGlhbCBjcmFzaC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMjUxCisK KyAgICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhp c3RvcnlJdGVtOjp+SGlzdG9yeUl0ZW0pOgorICAgICAgICAqIGhpc3RvcnkvYW5kcm9pZC9BbmRy b2lkV2ViSGlzdG9yeUJyaWRnZS5oOgorICAgICAgICAoV2ViQ29yZTo6QW5kcm9pZFdlYkhpc3Rv cnlCcmlkZ2U6OkFuZHJvaWRXZWJIaXN0b3J5QnJpZGdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFu ZHJvaWRXZWJIaXN0b3J5QnJpZGdlOjpkZXRhY2hIaXN0b3J5SXRlbSk6CisKIDIwMDktMTItMDcg IE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgTm90 IHJldmlld2VkLiBGb3JjZSBKUyBiaW5kaW5nIHJlZ2VuZXJhdGlvbiwgZXZlbnR1YWxseSBmaXhp bmcgdGhlIGJyb2tlbiB0ZXN0cyBvbiB0aGUgYm90cy4KSW5kZXg6IFdlYkNvcmUvaGlzdG9yeS9I aXN0b3J5SXRlbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVt LmNwcAkocmV2aXNpb24gNTE3OTUpCisrKyBXZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDEwIEBAIEhpc3RvcnlJdGVtOjp+SGlzdG9y eUl0ZW0oKQogICAgIEFTU0VSVCghbV9jYWNoZWRQYWdlKTsKICAgICBpY29uRGF0YWJhc2UoKS0+ cmVsZWFzZUljb25Gb3JQYWdlVVJMKG1fdXJsU3RyaW5nKTsKICAgICBzZXREb2N1bWVudCgwKTsK KyNpZiBQTEFURk9STShBTkRST0lEKQorICAgIGlmIChtX2JyaWRnZSkKKyAgICAgICAgbV9icmlk Z2UtPmRldGFjaEhpc3RvcnlJdGVtKCk7CisjZW5kaWYKIH0KIAogaW5saW5lIEhpc3RvcnlJdGVt OjpIaXN0b3J5SXRlbShjb25zdCBIaXN0b3J5SXRlbSYgaXRlbSkKSW5kZXg6IFdlYkNvcmUvaGlz dG9yeS9hbmRyb2lkL0FuZHJvaWRXZWJIaXN0b3J5QnJpZGdlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9oaXN0b3J5L2FuZHJvaWQvQW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2UuaAkocmV2aXNpb24g NTE3OTUpCisrKyBXZWJDb3JlL2hpc3RvcnkvYW5kcm9pZC9BbmRyb2lkV2ViSGlzdG9yeUJyaWRn ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxMSArMzQsMTEgQEAgY2xhc3MgSGlzdG9yeUl0ZW07 CiAKIGNsYXNzIEFuZHJvaWRXZWJIaXN0b3J5QnJpZGdlIDogcHVibGljIFJlZkNvdW50ZWQ8QW5k cm9pZFdlYkhpc3RvcnlCcmlkZ2U+IHsKIHB1YmxpYzoKLSAgICBBbmRyb2lkV2ViSGlzdG9yeUJy aWRnZSgpCisgICAgQW5kcm9pZFdlYkhpc3RvcnlCcmlkZ2UoSGlzdG9yeUl0ZW0qIGl0ZW0pCiAg ICAgICAgIDogbV9zY2FsZSgxMDApCiAgICAgICAgICwgbV9zY3JlZW5XaWR0aFNjYWxlKDEwMCkK ICAgICAgICAgLCBtX2FjdGl2ZShmYWxzZSkKLSAgICAgICAgLCBtX2hpc3RvcnlJdGVtKDApIHsg fQorICAgICAgICAsIG1faGlzdG9yeUl0ZW0oaXRlbSkgeyB9CiAgICAgdmlydHVhbCB+QW5kcm9p ZFdlYkhpc3RvcnlCcmlkZ2UoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlSGlzdG9yeUl0 ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0pID0gMDsKIApAQCAtNDYsNiArNDYsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzZXRTY3JlZW5XaWR0aFNjYWxlKGludCBzKSB7IG1fc2NyZWVuV2lkdGhTY2FsZSA9 IHM7IH0KICAgICBpbnQgc2NhbGUoKSBjb25zdCB7IHJldHVybiBtX3NjYWxlOyB9CiAgICAgaW50 IHNjcmVlbldpZHRoU2NhbGUoKSBjb25zdCB7IHJldHVybiBtX3NjcmVlbldpZHRoU2NhbGU7IH0K KyAgICB2b2lkIGRldGFjaEhpc3RvcnlJdGVtKCkgeyBtX2hpc3RvcnlJdGVtID0gMDsgfQogICAg IEhpc3RvcnlJdGVtKiBoaXN0b3J5SXRlbSgpIGNvbnN0IHsgcmV0dXJuIG1faGlzdG9yeUl0ZW07 IH0KICAgICB2b2lkIHNldEFjdGl2ZSgpIHsgbV9hY3RpdmUgPSB0cnVlOyB9CiAK