97028 2012-09-18 10:58:27 -0700 [BlackBerry] Popup page should reference the client with a weak pointer 2012-09-18 12:26:25 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yong.li.webkit webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 722905 0 yong.li.webkit 2012-09-18 10:58:27 -0700 so it won't crash when the client is destroyed earlier. 722937 1 164592 yong.li.webkit 2012-09-18 11:39:50 -0700 Created attachment 164592 the patch 722953 2 164592 rwlbuis 2012-09-18 11:52:55 -0700 Comment on attachment 164592 the patch Looks good. 722979 3 yong.li.webkit 2012-09-18 12:26:25 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebKit/blackberry/ChangeLog M Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp M Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.h Committed r128921 164592 2012-09-18 11:39:50 -0700 2012-09-18 11:52:55 -0700 the patch 97028.patch text/plain 6494 yong.li.webkit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDYyNGFjZjcuLjUyYzZiODEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA5LTE4ICBZ b25nIExpICA8eW9saUByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBQb3B1cCBwYWdl IHNob3VsZCByZWZlcmVuY2UgdGhlIGNsaWVudCB3aXRoIGEgd2VhayBwb2ludGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzAyOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJJTSBQUiMgMjA5ODQ3Lgor ICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IE1pa2UgRmVudG9uLgorCisgICAgICAgIFN0 b3JlIHRoZSBwb2ludGVyIGluIGEgcmVmLWNvdXRuZWQgc2hhcmVkIG9iamVjdCwgYW5kIGNsZWFy IHRoZSBwb2ludGVyIAorICAgICAgICB3aGVuIHRoZSBjbGllbnQgaXMgZ29pbmcgdG8gYmUgZGVz dHJveWVkLCBzbyBpdCB3b24ndCBiZSBhY2Nlc3NlZCBieQorICAgICAgICB0aGUgSlMgZnVuY3Rp b24gYWZ0ZXJ3YXJkcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNr QmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVBvcHVwQmxhY2tCZXJyeTo6UGFnZVBv cHVwQmxhY2tCZXJyeSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5Ojp+ UGFnZVBvcHVwQmxhY2tCZXJyeSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlUG9wdXBCbGFja0Jl cnJ5Ojppbml0KToKKyAgICAgICAgKFdlYkNvcmU6OnNldFZhbHVlQW5kQ2xvc2VQb3B1cENhbGxi YWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnBvcFVwRXh0ZW5zaW9uRmluYWxpemUpOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZVBvcHVwQmxhY2tCZXJyeTo6aW5zdGFsbERPTUZ1bmN0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VQb3B1cEJsYWNrQmVycnk6OmNsb3NlUG9wdXApOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaDoKKyAgICAgICAgKFBhZ2VQ b3B1cEJsYWNrQmVycnkpOgorICAgICAgICAoU2hhcmVkQ2xpZW50UG9pbnRlcik6CisgICAgICAg IChXZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5OjpTaGFyZWRDbGllbnRQb2ludGVyOjpTaGFy ZWRDbGllbnRQb2ludGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VQb3B1cEJsYWNrQmVycnk6 OlNoYXJlZENsaWVudFBvaW50ZXI6OmNsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VQb3B1 cEJsYWNrQmVycnk6OlNoYXJlZENsaWVudFBvaW50ZXI6OmdldCk6CisKIDIwMTItMDktMTggIEFy dmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQ cmV2ZW50IHNjcm9sbCBhZGp1c3RtZW50IG9mIGlucHV0IGZpZWxkcyB3aGVuIHJlZ2lvbiBvZiBp bnRlcmVzdCBtZWNoYW5pc20gYWN0aXZlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAKaW5k ZXggZTAwZmI1OC4uMzhhZWY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNwcApAQCAt NTAsMTIgKzUwLDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIFBhZ2VQb3B1cEJsYWNrQmVycnk6 OlBhZ2VQb3B1cEJsYWNrQmVycnkoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZSog d2ViUGFnZSwgUGFnZVBvcHVwQ2xpZW50KiBjbGllbnQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAg ICAgOiBtX3dlYlBhZ2VQcml2YXRlKHdlYlBhZ2UpCiAgICAgLCBtX2NsaWVudChhZG9wdFB0cihj bGllbnQpKQorICAgICwgbV9zaGFyZWRDbGllbnRQb2ludGVyKGFkb3B0UmVmKG5ldyBQYWdlUG9w dXBCbGFja0JlcnJ5OjpTaGFyZWRDbGllbnRQb2ludGVyKGNsaWVudCkpKQogewogICAgIG1fcmVj dCA9IEludFJlY3QocmVjdC54KCksIHJlY3QueSgpIC0gVVJMX0JBUl9IRUlHSFQsIGNsaWVudC0+ Y29udGVudFNpemUoKS53aWR0aCgpLCBjbGllbnQtPmNvbnRlbnRTaXplKCkuaGVpZ2h0KCkpOwog fQogCiBQYWdlUG9wdXBCbGFja0JlcnJ5Ojp+UGFnZVBvcHVwQmxhY2tCZXJyeSgpCiB7CisgICAg bV9zaGFyZWRDbGllbnRQb2ludGVyLT5jbGVhcigpOwogfQogCiBib29sIFBhZ2VQb3B1cEJsYWNr QmVycnk6OnNlbmRDcmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0KCkKQEAgLTY3LDcgKzY5LDcgQEAg Ym9vbCBQYWdlUG9wdXBCbGFja0JlcnJ5Ojppbml0KFdlYlBhZ2UqIHdlYnBhZ2UpCiB7CiAgICAg Z2VuZXJhdGVIVE1MKHdlYnBhZ2UpOwogCi0gICAgaW5zdGFsbERvbUZ1bmN0aW9uKHdlYnBhZ2Ut PmQtPm1haW5GcmFtZSgpKTsKKyAgICBpbnN0YWxsRE9NRnVuY3Rpb24od2VicGFnZS0+ZC0+bWFp bkZyYW1lKCkpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC0xMDcsMTEgKzEwOSwxMSBAQCBz dGF0aWMgSlNWYWx1ZVJlZiBzZXRWYWx1ZUFuZENsb3NlUG9wdXBDYWxsYmFjayhKU0NvbnRleHRS ZWYgY29udGV4dCwKICAgICBKU1N0cmluZ1JlbGVhc2Uoc3RyaW5nKTsKICAgICBKU09iamVjdFJl ZiBwb3BVcE9iamVjdCA9IEpTVmFsdWVUb09iamVjdChjb250ZXh0LAogICAgICAgICAgICAgYXJn dW1lbnRzW2FyZ3VtZW50Q291bnQgLSAxXSwgMCk7Ci0gICAgUGFnZVBvcHVwQ2xpZW50KiBjbGll bnQgPQotICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxQYWdlUG9wdXBDbGllbnQqPihKU09i amVjdEdldFByaXZhdGUocG9wVXBPYmplY3QpKTsKKyAgICBQYWdlUG9wdXBCbGFja0JlcnJ5OjpT aGFyZWRDbGllbnRQb2ludGVyKiBjbGllbnQgPSByZWludGVycHJldF9jYXN0PFBhZ2VQb3B1cEJs YWNrQmVycnk6OlNoYXJlZENsaWVudFBvaW50ZXIqPihKU09iamVjdEdldFByaXZhdGUocG9wVXBP YmplY3QpKTsKIAotICAgIEFTU0VSVChjbGllbnQpOwotICAgIGNsaWVudC0+c2V0VmFsdWVBbmRD bG9zZVBvcHVwKDAsIHN0ckFyZ3MuZGF0YSgpKTsKKyAgICAvLyBDaGVjayB0aGUgd2VhayBwb2lu dGVyIGFzIHRoZSBvd25lciBwYWdlIG1heSBoYXZlIGRlc3Ryb3llZCB0aGUgcG9wdXAuCisgICAg aWYgKGNsaWVudC0+Z2V0KCkpCisgICAgICAgIGNsaWVudC0+Z2V0KCktPnNldFZhbHVlQW5kQ2xv c2VQb3B1cCgwLCBzdHJBcmdzLmRhdGEoKSk7CiAKICAgICByZXR1cm4ganNSZXRWYWw7CiB9CkBA IC0xMjQsNyArMTI2LDkgQEAgc3RhdGljIHZvaWQgcG9wVXBFeHRlbnNpb25Jbml0aWFsaXplKEpT Q29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBvYmplY3QpCiAKIHN0YXRpYyB2b2lkIHBv cFVwRXh0ZW5zaW9uRmluYWxpemUoSlNPYmplY3RSZWYgb2JqZWN0KQogewotICAgIFVOVVNFRF9Q QVJBTShvYmplY3QpOworICAgIC8vIENsZWFyIHRoZSByZWZlcmVuY2UuIFNlZSBpbnN0YWxsRE9N RnVuY3Rpb24oKS4KKyAgICBQYWdlUG9wdXBCbGFja0JlcnJ5OjpTaGFyZWRDbGllbnRQb2ludGVy KiBjbGllbnQgPSByZWludGVycHJldF9jYXN0PFBhZ2VQb3B1cEJsYWNrQmVycnk6OlNoYXJlZENs aWVudFBvaW50ZXIqPihKU09iamVjdEdldFByaXZhdGUob2JqZWN0KSk7CisgICAgY2xpZW50LT5k ZXJlZigpOwogfQogCiBzdGF0aWMgSlNTdGF0aWNGdW5jdGlvbiBwb3BVcEV4dGVuc2lvblN0YXRp Y0Z1bmN0aW9uc1tdID0KQEAgLTEzOCw3ICsxNDIsNyBAQCBzdGF0aWMgSlNTdGF0aWNWYWx1ZSBw b3BVcEV4dGVuc2lvblN0YXRpY1ZhbHVlc1tdID0KIHsgMCwgMCwgMCwgMCB9CiB9OwogCi12b2lk IFBhZ2VQb3B1cEJsYWNrQmVycnk6Omluc3RhbGxEb21GdW5jdGlvbihGcmFtZSogZnJhbWUpCit2 b2lkIFBhZ2VQb3B1cEJsYWNrQmVycnk6Omluc3RhbGxET01GdW5jdGlvbihGcmFtZSogZnJhbWUp CiB7CiAgICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IHRvSlNET01XaW5kb3coZnJhbWUsIG1haW5U aHJlYWROb3JtYWxXb3JsZCgpKTsKICAgICBBU1NFUlQod2luZG93KTsKQEAgLTE2NSw3ICsxNjks MTAgQEAgdm9pZCBQYWdlUG9wdXBCbGFja0JlcnJ5OjppbnN0YWxsRG9tRnVuY3Rpb24oRnJhbWUq IGZyYW1lKQogICAgIEpTQ2xhc3NSZWYgY2xpZW50Q2xhc3MgPSBKU0NsYXNzQ3JlYXRlKCZkZWZp bml0aW9uKTsKIAogICAgIEpTT2JqZWN0UmVmIGNsaWVudENsYXNzT2JqZWN0ID0gSlNPYmplY3RN YWtlKGNvbnRleHQsIGNsaWVudENsYXNzLCAwKTsKLSAgICBKU09iamVjdFNldFByaXZhdGUoY2xp ZW50Q2xhc3NPYmplY3QsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KG1fY2xpZW50LmdldCgpKSk7 CisKKyAgICAvLyBBZGQgYSByZWZlcmVuY2UuIFNlZSBwb3BVcEV4dGVuc2lvbkZpbmFsaXplLgor ICAgIG1fc2hhcmVkQ2xpZW50UG9pbnRlci0+cmVmKCk7CisgICAgSlNPYmplY3RTZXRQcml2YXRl KGNsaWVudENsYXNzT2JqZWN0LCBtX3NoYXJlZENsaWVudFBvaW50ZXIuZ2V0KCkpOwogCiAgICAg U3RyaW5nIG5hbWUoInBvcFVwIik7CiAKQEAgLTE3OCw2ICsxODUsOSBAQCB2b2lkIFBhZ2VQb3B1 cEJsYWNrQmVycnk6Omluc3RhbGxEb21GdW5jdGlvbihGcmFtZSogZnJhbWUpCiAKIHZvaWQgUGFn ZVBvcHVwQmxhY2tCZXJyeTo6Y2xvc2VQb3B1cCgpCiB7CisgICAgLy8gUHJldmVudCB0aGUgcG9w dXAgcGFnZSBmcm9tIGFjY2Vzc2luZyB0aGUgY2xpZW50LgorICAgIG1fc2hhcmVkQ2xpZW50UG9p bnRlci0+Y2xlYXIoKTsKKwogICAgIG1fY2xpZW50LT5kaWRDbG9zZVBvcHVwKCk7CiAgICAgbV93 ZWJQYWdlUHJpdmF0ZS0+Y2xpZW50KCktPmNsb3NlUG9wdXBXZWJWaWV3KCk7CiAgICAgbV93ZWJQ YWdlUHJpdmF0ZS0+bV93ZWJQYWdlLT5wb3B1cENsb3NlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0Jl cnJ5LmgKaW5kZXggNWQ3MWU0Yy4uMDhjMzVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5o CkBAIC0yMSw2ICsyMSw4IEBACiAKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiUGFn ZVBvcHVwLmgiCisjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KKyNpbmNsdWRlIDx3dGYvUmVm UHRyLmg+CiAKIAogbmFtZXNwYWNlIEJsYWNrQmVycnkgewpAQCAtNDQsMTMgKzQ2LDI0IEBAIHB1 YmxpYzoKICAgICBib29sIHNlbmRDcmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0KCk7CiAgICAgYm9v bCBpbml0KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZSopOwogICAgIHZvaWQgY2xvc2VQb3B1 cCgpOwotICAgIHZvaWQgaW5zdGFsbERvbUZ1bmN0aW9uKEZyYW1lKik7CiAgICAgdm9pZCBzZXRS ZWN0KCk7Ci0gICAgdm9pZCBnZW5lcmF0ZUhUTUwoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdl Kik7CisKKyAgICBjbGFzcyBTaGFyZWRDbGllbnRQb2ludGVyIDogcHVibGljIFJlZkNvdW50ZWQ8 U2hhcmVkQ2xpZW50UG9pbnRlcj4geworICAgIHB1YmxpYzoKKyAgICAgICAgZXhwbGljaXQgU2hh cmVkQ2xpZW50UG9pbnRlcihQYWdlUG9wdXBDbGllbnQqIGNsaWVudCkgOiBtX2NsaWVudChjbGll bnQpIHsgfQorICAgICAgICB2b2lkIGNsZWFyKCkgeyBtX2NsaWVudCA9IDA7IH0KKyAgICAgICAg UGFnZVBvcHVwQ2xpZW50KiBnZXQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudDsgfQorICAgIHBy aXZhdGU6CisgICAgICAgIFBhZ2VQb3B1cENsaWVudCogbV9jbGllbnQ7CisgICAgfTsKIAogcHJp dmF0ZToKKyAgICB2b2lkIGdlbmVyYXRlSFRNTChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2Uq KTsKKyAgICB2b2lkIGluc3RhbGxET01GdW5jdGlvbihGcmFtZSopOworCiAgICAgQmxhY2tCZXJy eTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZSogbV93ZWJQYWdlUHJpdmF0ZTsKICAgICBPd25QdHI8 UGFnZVBvcHVwQ2xpZW50PiBtX2NsaWVudDsKKyAgICBSZWZQdHI8U2hhcmVkQ2xpZW50UG9pbnRl cj4gbV9zaGFyZWRDbGllbnRQb2ludGVyOwogICAgIEludFJlY3QgbV9yZWN0OwogfTsKIAo=