48362 2010-10-26 12:31:36 -0700 GTK: Update resource tracking when moving a frame between documents 2010-11-01 18:36:59 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 44713 1 jennb jennb commit-queue dimich mrobinson oldest_to_newest 299708 0 jennb 2010-10-26 12:31:36 -0700 GTK fix for bug reported in 44713. That patch provides the framework for the fix and fixes the Mac platform. Separate patches will be submitted for other platforms, thus this separate bug. 299884 1 71961 jennb 2010-10-26 16:33:11 -0700 Created attachment 71961 patch This patch does not add ASSERTs in FrameLoaderClient::dispatchDid{Finish/Fail}Loading to ensure that the test case for bug 44713 would fail without this fix, because there are comments allowing that a resource may not always be found by webkit_web_view_get_resource(). However, to test this change, I did put in the ASSERTs locally to verify the test crashes without the fix, and passes with the fix. 300044 2 71961 mrobinson 2010-10-27 00:28:34 -0700 Comment on attachment 71961 patch View in context: https://bugs.webkit.org/attachment.cgi?id=71961&action=review Looks great. Thanks for fixing this for GTK+. There is one small style issue. > WebKit/gtk/webkit/webkitwebview.cpp:4584 > + } else { > + g_hash_table_remove(priv->subResources.get(), identifier); > + } I think that WebKit style requires this last block to go without the curly braces (since it's only one line). 300320 3 72051 jennb 2010-10-27 10:11:08 -0700 Created attachment 72051 updated patch to fix style issue 302731 4 72051 mrobinson 2010-11-01 09:08:27 -0700 Comment on attachment 72051 updated patch to fix style issue Looks sane to me. 303146 5 commit-queue 2010-11-01 18:36:07 -0700 The commit-queue encountered the following flaky tests while processing attachment 72051: java/lc3/JSObject/ToObject-001.html Please file bugs against the tests. These tests were authored by ap@webkit.org. The commit-queue is continuing to process your patch. 303147 6 72051 commit-queue 2010-11-01 18:36:53 -0700 Comment on attachment 72051 updated patch to fix style issue Clearing flags on attachment: 72051 Committed r71090: <http://trac.webkit.org/changeset/71090> 303148 7 commit-queue 2010-11-01 18:36:59 -0700 All reviewed patches have been landed. Closing bug. 71961 2010-10-26 16:33:11 -0700 2010-10-27 10:11:08 -0700 patch patch48362.txt text/plain 3410 jennb ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNzA0OTA0Yi4uMTc0NWNmNyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0yNiAg SmVubmlmZXIgQnJhaXRod2FpdGUgIDxqZW5uYkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdUSzogVXBkYXRlIHJlc291cmNlIHRy YWNraW5nIHdoZW4gbW92aW5nIGEgZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzYyCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToKKyAg ICAgICAgQXNzaWduIHJlc291cmNlIGlkIHRvIGN1cnJlbnQgd2ViIHZpZXcgYW5kIHJlbW92ZSBm cm9tIGZvcm1lciB3ZWIgdmlldy4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5oOgor ICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJf dmlld19yZW1vdmVfcmVzb3VyY2UpOgorICAgICAgICBBZGRlZC4KKwogMjAxMC0xMC0yNiAgSmVu biBCcmFpdGh3YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEbWl0cnkgVGl0b3YuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGEwZDUzYTAuLjllY2NjNzEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC02MTks OCArNjE5LDE2IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpZFRyYW5zZmVyQ2hpbGRGcmFt ZVRvTmV3RG9jdW1lbnQoV2ViQ29yZTo6UGFnZSopCiAgICAgQVNTRVJUKGNvcmUoZ2V0Vmlld0Zy b21GcmFtZShtX2ZyYW1lKSkgPT0gY29yZUZyYW1lLT5wYWdlKCkpOwogfQogCi12b2lkIEZyYW1l TG9hZGVyQ2xpZW50Ojp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxv bmcsIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyKiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiwgV2ViQ29yZTo6UGFnZSopCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2Zlckxv YWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgV2ViQ29yZTo6 RG9jdW1lbnRMb2FkZXIqIGRvY0xvYWRlciwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBXZWJDb3JlOjpQYWdlKiBvbGRQYWdlKQogeworICAgIEFTU0VSVChvbGRQYWdl ICE9IGNvcmUobV9mcmFtZSktPnBhZ2UoKSk7CisKKyAgICBHT3duUHRyPGdjaGFyPiBpZGVudGlm aWVyU3RyaW5nKHRvU3RyaW5nKGlkZW50aWZpZXIpKTsKKyAgICBBU1NFUlQoIXdlYmtpdF93ZWJf dmlld19nZXRfcmVzb3VyY2UoZ2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKSwgaWRlbnRpZmllclN0 cmluZy5nZXQoKSkpOworCisgICAgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QoaWRl bnRpZmllciwgZG9jTG9hZGVyLCByZXF1ZXN0KTsKKworICAgIHdlYmtpdF93ZWJfdmlld19yZW1v dmVfcmVzb3VyY2Uoa2l0KG9sZFBhZ2UpLCBpZGVudGlmaWVyU3RyaW5nLmdldCgpKTsKIH0KIAog dm9pZCBGcmFtZUxvYWRlckNsaWVudDo6cmVkaXJlY3REYXRhVG9QbHVnaW4oV2lkZ2V0KiBwbHVn aW5XaWRnZXQpCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKaW5kZXggNjE2ZWU2Yi4uMGNmYjNj NyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCisrKyBiL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaApAQCAtMjcxLDYgKzI3MSw5IEBAIGV4dGVy biAiQyIgewogICAgIHZvaWQKICAgICB3ZWJraXRfd2ViX3ZpZXdfYWRkX3Jlc291cmNlKFdlYktp dFdlYlZpZXcqLCBjb25zdCBjaGFyKiwgV2ViS2l0V2ViUmVzb3VyY2UqKTsKIAorICAgIHZvaWQK KyAgICB3ZWJraXRfd2ViX3ZpZXdfcmVtb3ZlX3Jlc291cmNlKFdlYktpdFdlYlZpZXcqLCBjb25z dCBjaGFyKik7CisKICAgICBXZWJLaXRXZWJSZXNvdXJjZSoKICAgICB3ZWJraXRfd2ViX3ZpZXdf Z2V0X3Jlc291cmNlKFdlYktpdFdlYlZpZXcqLCBjaGFyKik7CiAKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAKaW5kZXggOTc0YjUzZi4uOTliNjQ4YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAKQEAgLTQ1NzMsNiArNDU3MywxNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19h ZGRfcmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogaWRlbnRpZmll cgogICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocHJpdi0+c3ViUmVzb3VyY2VzLmdldCgpLCBnX3N0 cmR1cChpZGVudGlmaWVyKSwgd2ViUmVzb3VyY2UpOwogfQogCit2b2lkIHdlYmtpdF93ZWJfdmll d19yZW1vdmVfcmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogaWRl bnRpZmllcikKK3sKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnBy aXY7CisgICAgaWYgKGdfc3RyX2VxdWFsKGlkZW50aWZpZXIsIHByaXYtPm1haW5SZXNvdXJjZUlk ZW50aWZpZXIuZGF0YSgpKSkgeworICAgICAgICBwcml2LT5tYWluUmVzb3VyY2VJZGVudGlmaWVy ID0gIiI7CisgICAgICAgIHByaXYtPm1haW5SZXNvdXJjZSA9IDA7CisgICAgfSBlbHNlIHsKKyAg ICAgIGdfaGFzaF90YWJsZV9yZW1vdmUocHJpdi0+c3ViUmVzb3VyY2VzLmdldCgpLCBpZGVudGlm aWVyKTsKKyAgICB9Cit9CisKIFdlYktpdFdlYlJlc291cmNlKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3Jlc291cmNlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNoYXIqIGlkZW50aWZpZXIpCiB7CiAg ICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2Owo= 72051 2010-10-27 10:11:08 -0700 2010-11-01 18:36:53 -0700 updated patch to fix style issue patch48362-2.txt text/plain 3401 jennb ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNzA0OTA0Yi4uMTc0NWNmNyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0yNiAg SmVubmlmZXIgQnJhaXRod2FpdGUgIDxqZW5uYkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdUSzogVXBkYXRlIHJlc291cmNlIHRy YWNraW5nIHdoZW4gbW92aW5nIGEgZnJhbWUgYmV0d2VlbiBkb2N1bWVudHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzYyCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKToKKyAg ICAgICAgQXNzaWduIHJlc291cmNlIGlkIHRvIGN1cnJlbnQgd2ViIHZpZXcgYW5kIHJlbW92ZSBm cm9tIGZvcm1lciB3ZWIgdmlldy4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5oOgor ICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJf dmlld19yZW1vdmVfcmVzb3VyY2UpOgorICAgICAgICBBZGRlZC4KKwogMjAxMC0xMC0yNiAgSmVu biBCcmFpdGh3YWl0ZSAgPGplbm5iQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEbWl0cnkgVGl0b3YuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGEwZDUzYTAuLjllY2NjNzEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC02MTks OCArNjE5LDE2IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpZFRyYW5zZmVyQ2hpbGRGcmFt ZVRvTmV3RG9jdW1lbnQoV2ViQ29yZTo6UGFnZSopCiAgICAgQVNTRVJUKGNvcmUoZ2V0Vmlld0Zy b21GcmFtZShtX2ZyYW1lKSkgPT0gY29yZUZyYW1lLT5wYWdlKCkpOwogfQogCi12b2lkIEZyYW1l TG9hZGVyQ2xpZW50Ojp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxv bmcsIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyKiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiwgV2ViQ29yZTo6UGFnZSopCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2Zlckxv YWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgV2ViQ29yZTo6 RG9jdW1lbnRMb2FkZXIqIGRvY0xvYWRlciwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBXZWJDb3JlOjpQYWdlKiBvbGRQYWdlKQogeworICAgIEFTU0VSVChvbGRQYWdl ICE9IGNvcmUobV9mcmFtZSktPnBhZ2UoKSk7CisKKyAgICBHT3duUHRyPGdjaGFyPiBpZGVudGlm aWVyU3RyaW5nKHRvU3RyaW5nKGlkZW50aWZpZXIpKTsKKyAgICBBU1NFUlQoIXdlYmtpdF93ZWJf dmlld19nZXRfcmVzb3VyY2UoZ2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKSwgaWRlbnRpZmllclN0 cmluZy5nZXQoKSkpOworCisgICAgYXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QoaWRl bnRpZmllciwgZG9jTG9hZGVyLCByZXF1ZXN0KTsKKworICAgIHdlYmtpdF93ZWJfdmlld19yZW1v dmVfcmVzb3VyY2Uoa2l0KG9sZFBhZ2UpLCBpZGVudGlmaWVyU3RyaW5nLmdldCgpKTsKIH0KIAog dm9pZCBGcmFtZUxvYWRlckNsaWVudDo6cmVkaXJlY3REYXRhVG9QbHVnaW4oV2lkZ2V0KiBwbHVn aW5XaWRnZXQpCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKaW5kZXggNjE2ZWU2Yi4uMGNmYjNj NyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCisrKyBiL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaApAQCAtMjcxLDYgKzI3MSw5IEBAIGV4dGVy biAiQyIgewogICAgIHZvaWQKICAgICB3ZWJraXRfd2ViX3ZpZXdfYWRkX3Jlc291cmNlKFdlYktp dFdlYlZpZXcqLCBjb25zdCBjaGFyKiwgV2ViS2l0V2ViUmVzb3VyY2UqKTsKIAorICAgIHZvaWQK KyAgICB3ZWJraXRfd2ViX3ZpZXdfcmVtb3ZlX3Jlc291cmNlKFdlYktpdFdlYlZpZXcqLCBjb25z dCBjaGFyKik7CisKICAgICBXZWJLaXRXZWJSZXNvdXJjZSoKICAgICB3ZWJraXRfd2ViX3ZpZXdf Z2V0X3Jlc291cmNlKFdlYktpdFdlYlZpZXcqLCBjaGFyKik7CiAKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAKaW5kZXggOTc0YjUzZi4uYjRiZDRlMSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAKQEAgLTQ1NzMsNiArNDU3MywxNiBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19h ZGRfcmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogaWRlbnRpZmll cgogICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocHJpdi0+c3ViUmVzb3VyY2VzLmdldCgpLCBnX3N0 cmR1cChpZGVudGlmaWVyKSwgd2ViUmVzb3VyY2UpOwogfQogCit2b2lkIHdlYmtpdF93ZWJfdmll d19yZW1vdmVfcmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogaWRl bnRpZmllcikKK3sKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnBy aXY7CisgICAgaWYgKGdfc3RyX2VxdWFsKGlkZW50aWZpZXIsIHByaXYtPm1haW5SZXNvdXJjZUlk ZW50aWZpZXIuZGF0YSgpKSkgeworICAgICAgICBwcml2LT5tYWluUmVzb3VyY2VJZGVudGlmaWVy ID0gIiI7CisgICAgICAgIHByaXYtPm1haW5SZXNvdXJjZSA9IDA7CisgICAgfSBlbHNlCisgICAg ICBnX2hhc2hfdGFibGVfcmVtb3ZlKHByaXYtPnN1YlJlc291cmNlcy5nZXQoKSwgaWRlbnRpZmll cik7Cit9CisKIFdlYktpdFdlYlJlc291cmNlKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Jlc291cmNl KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNoYXIqIGlkZW50aWZpZXIpCiB7CiAgICAgV2ViS2l0 V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2Owo=