25132 2009-04-10 13:19:40 -0700 help prevent crash in chromium event handling 2009-04-14 12:00:34 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 asargent dimich oldest_to_newest 117169 0 asargent 2009-04-10 13:19:40 -0700 This is some cleanup motivated by the crash in http://crbug.com/9775 , which happens because of calling window.open inside a window.onload handler. These changes are just part of the fix, along with some asserts to help prevent breakage on future changes. Patch forthcoming. (I will also be adding a layout test for this in a separate patch.) 117171 1 29395 asargent 2009-04-10 13:25:00 -0700 Created attachment 29395 patch 117173 2 29395 dglazkov 2009-04-10 13:37:26 -0700 Comment on attachment 29395 patch Just some styling nits. > +This is some cleanup motivated by the crash in http://crbug.com/9775 , which > +happens because of calling window.open inside a window.onload handler. > + > +These changes are just part of the fix, along with some asserts to help prevent > +breakage on future changes. We usually indent these to the same col as "Reviewed By". > + // TODO(asargent) this check for hidden value being !empty is a workaround for TODO(asargent) -> FIXME:in WebKit world. > + // Once the fix for that is pulled into chromium we can remove the check here. > + if (!object->GetHiddenValue(key).IsEmpty()) { > + object->DeleteHiddenValue(getKey(listener->isInline())); > + } no brackets around one-liners. 117175 3 29396 asargent 2009-04-10 13:57:38 -0700 Created attachment 29396 patch v2 new patch addressing styling issues (good catches, thx!) 117498 4 dimich 2009-04-14 11:31:05 -0700 assignign to me for landing 117503 5 dimich 2009-04-14 12:00:34 -0700 landed: http://trac.webkit.org/changeset/42510 29395 2009-04-10 13:25:00 -0700 2009-04-10 14:09:32 -0700 patch patch.txt text/plain 3352 asargent SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQyNDAz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDQt MTAgIEFudG9ueSBTYXJnZW50ICA8YXNhcmdlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCitUaGlzIGlzIHNvbWUgY2xlYW51cCBtb3RpdmF0 ZWQgYnkgdGhlICBjcmFzaCBpbiBodHRwOi8vY3JidWcuY29tLzk3NzUgLCB3aGljaAoraGFwcGVu cyBiZWNhdXNlIG9mIGNhbGxpbmcgd2luZG93Lm9wZW4gaW5zaWRlIGEgd2luZG93Lm9ubG9hZCBo YW5kbGVyLiAKKworVGhlc2UgY2hhbmdlcyBhcmUganVzdCBwYXJ0IG9mIHRoZSBmaXgsIGFsb25n IHdpdGggc29tZSBhc3NlcnRzIHRvIGhlbHAgcHJldmVudAorYnJlYWthZ2Ugb24gZnV0dXJlIGNo YW5nZXMuIAorCisJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1MTMy CisJCisgICAgICAgICogYmluZGluZ3MvdjgvVjhFdmVudExpc3RlbmVyTGlzdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOEV2ZW50TGlzdGVuZXJMaXN0OjphZGQpOgorICAgICAgICAoV2ViQ29y ZTo6VjhFdmVudExpc3RlbmVyTGlzdDo6cmVtb3ZlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RXZl bnRMaXN0ZW5lckxpc3Q6OmNsZWFyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEV2ZW50TGlz dGVuZXJMaXN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpWOEV2ZW50TGlzdGVuZXJMaXN0OjpzaXpl KToKKwogMjAwOS0wNC0xMCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAg ICAgR2l2ZSBXaW5kb3dzJ3MgPHNlbGVjdD4gcG9wdXAgbWVudXMgZHJvcCBzaGFkb3dzCkluZGV4 OiBiaW5kaW5ncy92OC9WOEV2ZW50TGlzdGVuZXJMaXN0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBiaW5k aW5ncy92OC9WOEV2ZW50TGlzdGVuZXJMaXN0LmNwcAkocmV2aXNpb24gNDIzOTQpCisrKyBiaW5k aW5ncy92OC9WOEV2ZW50TGlzdGVuZXJMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzQsNiAr NzQsNyBAQCB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IFY4RXZlbnRMaXN0ZW5lckxpCiAvLyBTZWUg Y29tbWVudCBpbiAuaCBmaWxlIGZvciB0aGlzIGZ1bmN0aW9uLCBhbmQgdXBkYXRlIGFjY29yZGlu Z2x5IGlmIGltcGxlbWVudGF0aW9uIGRldGFpbHMgY2hhbmdlIGhlcmUuCiB2b2lkIFY4RXZlbnRM aXN0ZW5lckxpc3Q6OmFkZChWOEV2ZW50TGlzdGVuZXIqIGxpc3RlbmVyKQogeworICAgIEFTU0VS VCh2ODo6Q29udGV4dDo6SW5Db250ZXh0KCkpOwogICAgIG1fbGlzdC5hcHBlbmQobGlzdGVuZXIp OwogCiAgICAgdjg6OkhhbmRsZVNjb3BlIGhhbmRsZVNjb3BlOwpAQCAtODQsMTIgKzg1LDIwIEBA IHZvaWQgVjhFdmVudExpc3RlbmVyTGlzdDo6YWRkKFY4RXZlbnRMaXMKIAogdm9pZCBWOEV2ZW50 TGlzdGVuZXJMaXN0OjpyZW1vdmUoVjhFdmVudExpc3RlbmVyKiBsaXN0ZW5lcikKIHsKKyAgICBB U1NFUlQodjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKTsKICAgICB2ODo6SGFuZGxlU2NvcGUgaGFu ZGxlU2NvcGU7CisgICAgdjg6OkhhbmRsZTx2ODo6U3RyaW5nPiBrZXkgPSBnZXRLZXkobGlzdGVu ZXItPmlzSW5saW5lKCkpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9saXN0LnNpemUo KTsgaSsrKSB7CiAgICAgICAgIFY4RXZlbnRMaXN0ZW5lciogZWxlbWVudCA9IG1fbGlzdC5hdChp KTsKICAgICAgICAgaWYgKGVsZW1lbnQtPmlzSW5saW5lKCkgPT0gbGlzdGVuZXItPmlzSW5saW5l KCkgJiYgZWxlbWVudCA9PSBsaXN0ZW5lcikgewogICAgICAgICAgICAgdjg6OkxvY2FsPHY4OjpP YmplY3Q+IG9iamVjdCA9IGxpc3RlbmVyLT5nZXRMaXN0ZW5lck9iamVjdCgpOwotICAgICAgICAg ICAgb2JqZWN0LT5EZWxldGVIaWRkZW5WYWx1ZShnZXRLZXkobGlzdGVuZXItPmlzSW5saW5lKCkp KTsKKworICAgICAgICAgICAgLy8gVE9ETyhhc2FyZ2VudCkgdGhpcyBjaGVjayBmb3IgaGlkZGVu IHZhbHVlIGJlaW5nICFlbXB0eSBpcyBhIHdvcmthcm91bmQgZm9yCisgICAgICAgICAgICAvLyBo dHRwOi8vY29kZS5nb29nbGUuY29tL3AvdjgvaXNzdWVzL2RldGFpbD9pZD0zMDAKKyAgICAgICAg ICAgIC8vIE9uY2UgdGhlIGZpeCBmb3IgdGhhdCBpcyBwdWxsZWQgaW50byBjaHJvbWl1bSB3ZSBj YW4gcmVtb3ZlIHRoZSBjaGVjayBoZXJlLgorICAgICAgICAgICAgaWYgKCFvYmplY3QtPkdldEhp ZGRlblZhbHVlKGtleSkuSXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgIG9iamVjdC0+RGVsZXRl SGlkZGVuVmFsdWUoZ2V0S2V5KGxpc3RlbmVyLT5pc0lubGluZSgpKSk7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICBtX2xpc3QucmVtb3ZlKGkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KQEAgLTk4LDYgKzEwNyw3IEBAIHZvaWQgVjhFdmVudExpc3RlbmVyTGlzdDo6cmVtb3Zl KFY4RXZlbnQKIAogdm9pZCBWOEV2ZW50TGlzdGVuZXJMaXN0OjpjbGVhcigpCiB7CisgICAgQVNT RVJUKHY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSk7CiAgICAgdjg6OkhhbmRsZVNjb3BlIGhhbmRs ZVNjb3BlOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9saXN0LnNpemUoKTsgaSsrKSB7 CiAgICAgICAgIFY4RXZlbnRMaXN0ZW5lciogZWxlbWVudCA9IG1fbGlzdC5hdChpKTsKSW5kZXg6 IGJpbmRpbmdzL3Y4L1Y4RXZlbnRMaXN0ZW5lckxpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBiaW5kaW5n cy92OC9WOEV2ZW50TGlzdGVuZXJMaXN0LmgJKHJldmlzaW9uIDQyMzk0KQorKysgYmluZGluZ3Mv djgvVjhFdmVudExpc3RlbmVyTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Niw2ICs1Niw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCByZW1vdmUoVjhFdmVudExpc3RlbmVy Kik7CiAgICAgICAgIFY4RXZlbnRMaXN0ZW5lciogZmluZCh2ODo6TG9jYWw8djg6Ok9iamVjdD4s IGJvb2wgaXNJbmxpbmUpOwogICAgICAgICB2b2lkIGNsZWFyKCk7CisgICAgICAgIHNpemVfdCBz aXplKCkgeyByZXR1cm4gbV9saXN0LnNpemUoKTsgfQogCiAgICAgcHJpdmF0ZToKICAgICAgICAg djg6OkhhbmRsZTx2ODo6U3RyaW5nPiBnZXRLZXkoYm9vbCBpc0lubGluZSk7Cg== 29396 2009-04-10 13:57:38 -0700 2009-04-10 14:10:15 -0700 patch v2 patch2_1.txt text/plain 3374 asargent SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQyNDAz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDQt MTAgIEFudG9ueSBTYXJnZW50ICA8YXNhcmdlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgc29tZSBjbGVhbnVw IG1vdGl2YXRlZCBieSB0aGUgY3Jhc2ggaW4gaHR0cDovL2NyYnVnLmNvbS85Nzc1ICwgd2hpY2gg CisgICAgICAgIGhhcHBlbnMgYmVjYXVzZSBvZiBjYWxsaW5nIHdpbmRvdy5vcGVuIGluc2lkZSBh IHdpbmRvdy5vbmxvYWQgaGFuZGxlci4gCisKKyAgICAgICAgVGhlc2UgY2hhbmdlcyBhcmUganVz dCBwYXJ0IG9mIHRoZSBmaXgsIGFsb25nIHdpdGggc29tZSBhc3NlcnRzIHRvIGhlbHAgcHJldmVu dAorICAgICAgICBicmVha2FnZSBvbiBmdXR1cmUgY2hhbmdlcy4gCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1MTMyCisKKyAgICAgICAgKiBiaW5k aW5ncy92OC9WOEV2ZW50TGlzdGVuZXJMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RXZl bnRMaXN0ZW5lckxpc3Q6OmFkZCk6CisgICAgICAgIChXZWJDb3JlOjpWOEV2ZW50TGlzdGVuZXJM aXN0OjpyZW1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6VjhFdmVudExpc3RlbmVyTGlzdDo6Y2xl YXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4RXZlbnRMaXN0ZW5lckxpc3QuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlY4RXZlbnRMaXN0ZW5lckxpc3Q6OnNpemUpOgorCiAyMDA5LTA0LTEwICBB ZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBHaXZlIFdpbmRvd3MncyA8 c2VsZWN0PiBwb3B1cCBtZW51cyBkcm9wIHNoYWRvd3MKSW5kZXg6IGJpbmRpbmdzL3Y4L1Y4RXZl bnRMaXN0ZW5lckxpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGJpbmRpbmdzL3Y4L1Y4RXZlbnRMaXN0 ZW5lckxpc3QuY3BwCShyZXZpc2lvbiA0MjM5NCkKKysrIGJpbmRpbmdzL3Y4L1Y4RXZlbnRMaXN0 ZW5lckxpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCw2ICs3NCw3IEBAIHY4OjpIYW5kbGU8 djg6OlN0cmluZz4gVjhFdmVudExpc3RlbmVyTGkKIC8vIFNlZSBjb21tZW50IGluIC5oIGZpbGUg Zm9yIHRoaXMgZnVuY3Rpb24sIGFuZCB1cGRhdGUgYWNjb3JkaW5nbHkgaWYgaW1wbGVtZW50YXRp b24gZGV0YWlscyBjaGFuZ2UgaGVyZS4KIHZvaWQgVjhFdmVudExpc3RlbmVyTGlzdDo6YWRkKFY4 RXZlbnRMaXN0ZW5lciogbGlzdGVuZXIpCiB7CisgICAgQVNTRVJUKHY4OjpDb250ZXh0OjpJbkNv bnRleHQoKSk7CiAgICAgbV9saXN0LmFwcGVuZChsaXN0ZW5lcik7CiAKICAgICB2ODo6SGFuZGxl U2NvcGUgaGFuZGxlU2NvcGU7CkBAIC04NCwxMiArODUsMTkgQEAgdm9pZCBWOEV2ZW50TGlzdGVu ZXJMaXN0OjphZGQoVjhFdmVudExpcwogCiB2b2lkIFY4RXZlbnRMaXN0ZW5lckxpc3Q6OnJlbW92 ZShWOEV2ZW50TGlzdGVuZXIqIGxpc3RlbmVyKQogeworICAgIEFTU0VSVCh2ODo6Q29udGV4dDo6 SW5Db250ZXh0KCkpOwogICAgIHY4OjpIYW5kbGVTY29wZSBoYW5kbGVTY29wZTsKKyAgICB2ODo6 SGFuZGxlPHY4OjpTdHJpbmc+IGtleSA9IGdldEtleShsaXN0ZW5lci0+aXNJbmxpbmUoKSk7CiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2xpc3Quc2l6ZSgpOyBpKyspIHsKICAgICAgICAg VjhFdmVudExpc3RlbmVyKiBlbGVtZW50ID0gbV9saXN0LmF0KGkpOwogICAgICAgICBpZiAoZWxl bWVudC0+aXNJbmxpbmUoKSA9PSBsaXN0ZW5lci0+aXNJbmxpbmUoKSAmJiBlbGVtZW50ID09IGxp c3RlbmVyKSB7CiAgICAgICAgICAgICB2ODo6TG9jYWw8djg6Ok9iamVjdD4gb2JqZWN0ID0gbGlz dGVuZXItPmdldExpc3RlbmVyT2JqZWN0KCk7Ci0gICAgICAgICAgICBvYmplY3QtPkRlbGV0ZUhp ZGRlblZhbHVlKGdldEtleShsaXN0ZW5lci0+aXNJbmxpbmUoKSkpOworCisgICAgICAgICAgICAv LyBGSVhNRShhc2FyZ2VudCkgdGhpcyBjaGVjayBmb3IgaGlkZGVuIHZhbHVlIGJlaW5nICFlbXB0 eSBpcyBhIHdvcmthcm91bmQgZm9yCisgICAgICAgICAgICAvLyBodHRwOi8vY29kZS5nb29nbGUu Y29tL3AvdjgvaXNzdWVzL2RldGFpbD9pZD0zMDAKKyAgICAgICAgICAgIC8vIE9uY2UgdGhlIGZp eCBmb3IgdGhhdCBpcyBwdWxsZWQgaW50byBjaHJvbWl1bSB3ZSBjYW4gcmVtb3ZlIHRoZSBjaGVj ayBoZXJlLgorICAgICAgICAgICAgaWYgKCFvYmplY3QtPkdldEhpZGRlblZhbHVlKGtleSkuSXNF bXB0eSgpKQorICAgICAgICAgICAgICBvYmplY3QtPkRlbGV0ZUhpZGRlblZhbHVlKGdldEtleShs aXN0ZW5lci0+aXNJbmxpbmUoKSkpOwogICAgICAgICAgICAgbV9saXN0LnJlbW92ZShpKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CkBAIC05OCw2ICsxMDYsNyBAQCB2b2lkIFY4RXZl bnRMaXN0ZW5lckxpc3Q6OnJlbW92ZShWOEV2ZW50CiAKIHZvaWQgVjhFdmVudExpc3RlbmVyTGlz dDo6Y2xlYXIoKQogeworICAgIEFTU0VSVCh2ODo6Q29udGV4dDo6SW5Db250ZXh0KCkpOwogICAg IHY4OjpIYW5kbGVTY29wZSBoYW5kbGVTY29wZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG1fbGlzdC5zaXplKCk7IGkrKykgewogICAgICAgICBWOEV2ZW50TGlzdGVuZXIqIGVsZW1lbnQg PSBtX2xpc3QuYXQoaSk7CkluZGV4OiBiaW5kaW5ncy92OC9WOEV2ZW50TGlzdGVuZXJMaXN0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gYmluZGluZ3MvdjgvVjhFdmVudExpc3RlbmVyTGlzdC5oCShyZXZpc2lv biA0MjM5NCkKKysrIGJpbmRpbmdzL3Y4L1Y4RXZlbnRMaXN0ZW5lckxpc3QuaAkod29ya2luZyBj b3B5KQpAQCAtNTYsNiArNTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQg cmVtb3ZlKFY4RXZlbnRMaXN0ZW5lciopOwogICAgICAgICBWOEV2ZW50TGlzdGVuZXIqIGZpbmQo djg6OkxvY2FsPHY4OjpPYmplY3Q+LCBib29sIGlzSW5saW5lKTsKICAgICAgICAgdm9pZCBjbGVh cigpOworICAgICAgICBzaXplX3Qgc2l6ZSgpIHsgcmV0dXJuIG1fbGlzdC5zaXplKCk7IH0KIAog ICAgIHByaXZhdGU6CiAgICAgICAgIHY4OjpIYW5kbGU8djg6OlN0cmluZz4gZ2V0S2V5KGJvb2wg aXNJbmxpbmUpOwo=