39320 2010-05-18 14:17:48 -0700 FrameLoader: modify urlSelected() to accept a String or KURL instead of ResourceRequest 2010-05-20 04:49:06 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek abarth cjerdonek oldest_to_newest 227496 0 cjerdonek 2010-05-18 14:17:48 -0700 FrameLoader::urlSelected() currently accepts a ResourceRequest for the url. Since ResourceRequest has non-explicit single-parameter constructors for String and KURL, the FrameLoader API isn't as clear as it could be. See also this e-mail: https://lists.webkit.org/pipermail/webkit-dev/2010-May/012880.html Out of the 5 or so urlSelected() call sites (if I remember right), only one of them actually passes a ResourceRequest, and it's done there in an inessential way. So the API is broader than it needs to be. Changing urlSelected() not to accept a ResourceRequest will make the API tighter, more explicit, and easier to refactor. 227734 1 56472 cjerdonek 2010-05-19 00:52:06 -0700 Created attachment 56472 Proposed patch 228240 2 56472 eric 2010-05-20 00:55:38 -0700 Comment on attachment 56472 Proposed patch OK. 228321 3 56472 cjerdonek 2010-05-20 04:49:01 -0700 Comment on attachment 56472 Proposed patch Clearing flags on attachment: 56472 Committed r59829: <http://trac.webkit.org/changeset/59829> 228322 4 cjerdonek 2010-05-20 04:49:06 -0700 All reviewed patches have been landed. Closing bug. 56472 2010-05-19 00:52:06 -0700 2010-05-20 04:49:00 -0700 Proposed patch _patch-39320-1.diff text/plain 6513 cjerdonek ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmFhZGUyNy4uMjgxMDk4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0wNS0xOSAgQ2hyaXMgSmVyZG9u ZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNb2RpZmllZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoKSB0 byBhY2NlcHQgYSBLVVJMIGluc3RlYWQgb2YgYQorICAgICAgICBSZXNvdXJjZVJlcXVlc3QuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MzIwCisK KyAgICAgICAgU2luY2UgUmVzb3VyY2VSZXF1ZXN0IGhhcyBub24tZXhwbGljaXQgc2luZ2xlLXBh cmFtZXRlciBjb25zdHJ1Y3RvcnMgZm9yCisgICAgICAgIFN0cmluZyBhbmQgS1VSTCwgdXJsU2Vs ZWN0ZWQoKSBwcmV2aW91c2x5IGFjY2VwdGVkIGFueSBvZiBTdHJpbmcsIEtVUkwsCisgICAgICAg IGFuZCBSZXNvdXJjZVJlcXVlc3QuICBUaGlzIHJldmlzaW9uIGNoYW5nZXMgdXJsU2VsZWN0ZWQo KSB0byBhY2NlcHQgb25seQorICAgICAgICBhIEtVUkwgdG8gbWFrZSB0aGUgQVBJIHRpZ2h0ZXIg YW5kIGVhc2llciB0byByZWZhY3Rvci4KKworICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSwg c28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZCk6CisgICAgICAgICAgLSBD aGFuZ2VkIHRoZSBwdWJsaWMgb3ZlcmxvYWQgdG8gYWNjZXB0IGEgS1VSTCBpbnN0ZWFkIG9mIGEg UmVzb3VyY2VSZXF1ZXN0LgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAg ICAgIC0gQ2hhbmdlZCB0aGUgcHVibGljIG92ZXJsb2FkIHRvIGFjY2VwdCBhIEtVUkwgaW5zdGVh ZCBvZiBhIFJlc291cmNlUmVxdWVzdC4KKyAgICAgICAgKiB3bWwvV01MQUVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V01MQUVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAg ICAgICAgIC0gVXBkYXRlZCB0aGUgY2FsbCB0byB1cmxTZWxlY3RlZCgpLgorCiAyMDEwLTA1LTE4 ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2phbiBWYWZhaS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBi L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAzNmIzOGU4Li5mYzk5MjFmIDEw MDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0zNDksMTMgKzM0OSwxMyBAQCB2b2lkIEZyYW1lTG9h ZGVyOjpjaGFuZ2VMb2NhdGlvbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJy ZXIsIGJvb2wgbAogICAgIHVybFNlbGVjdGVkKHJlcXVlc3QsICJfc2VsZiIsIDAsIGxvY2tIaXN0 b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCB1c2VyR2VzdHVyZSwgU2VuZFJlZmVycmVyLCBSZXBs YWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpOwogfQogCi12b2lkIEZyYW1lTG9hZGVyOjp1cmxT ZWxlY3RlZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcGFz c2VkVGFyZ2V0LCBQYXNzUmVmUHRyPEV2ZW50PiB0cmlnZ2VyaW5nRXZlbnQsIGJvb2wgbG9ja0hp c3RvcnksIGJvb2wgbG9ja0JhY2tGb3J3YXJkTGlzdCwgYm9vbCB1c2VyR2VzdHVyZSwgUmVmZXJy ZXJQb2xpY3kgcmVmZXJyZXJQb2xpY3kpCit2b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChj b25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcGFzc2VkVGFyZ2V0LCBQYXNzUmVmUHRyPEV2 ZW50PiB0cmlnZ2VyaW5nRXZlbnQsIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0JhY2tGb3J3 YXJkTGlzdCwgYm9vbCB1c2VyR2VzdHVyZSwgUmVmZXJyZXJQb2xpY3kgcmVmZXJyZXJQb2xpY3kp CiB7Ci0gICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgcGFzc2VkVGFyZ2V0LCB0cmlnZ2VyaW5nRXZl bnQsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCB1c2VyR2VzdHVyZSwgcmVmZXJy ZXJQb2xpY3ksIERvTm90UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsKKyAgICB1cmxT ZWxlY3RlZChSZXNvdXJjZVJlcXVlc3QodXJsKSwgcGFzc2VkVGFyZ2V0LCB0cmlnZ2VyaW5nRXZl bnQsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCB1c2VyR2VzdHVyZSwgcmVmZXJy ZXJQb2xpY3ksIERvTm90UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsKIH0KIAotLy8g VGhpcyBvdmVybG9hZCB3aWxsIGdvIGF3YXkgd2hlbiB0aGUgRklYTUUgdG8gZWxpbWluYXRlIHRo ZSBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwKLS8vIHBhcmFtZXRlciBmcm9t IFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwoKSBpcyBhZGRyZXNzZWQu CisvLyBUaGUgc2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMIHBhcmFtZXRlciB3 aWxsIGdvIGF3YXkgd2hlbiB0aGUgRklYTUUgdG8gZWxpbWluYXRlIHRoZQorLy8gY29ycmVzcG9u ZGluZyBwYXJhbWV0ZXIgZnJvbSBTY3JpcHRDb250cm9sbGVyOjpleGVjdXRlSWZKYXZhU2NyaXB0 VVJMKCkgaXMgYWRkcmVzc2VkLgogdm9pZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHBhc3NlZFRhcmdldCwgUGFz c1JlZlB0cjxFdmVudD4gdHJpZ2dlcmluZ0V2ZW50LCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxv Y2tCYWNrRm9yd2FyZExpc3QsIGJvb2wgdXNlckdlc3R1cmUsIFJlZmVycmVyUG9saWN5IHJlZmVy cmVyUG9saWN5LCBTaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgc2hvdWxkUmVw bGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKQogewogICAgIEFTU0VSVCghbV9zdXBwcmVzc09w ZW5lckluTmV3RnJhbWUpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu aCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggY2VkYjI5NS4uNDk3NzIzYSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5oCkBAIC0yMjEsNyArMjIxLDcgQEAgcHVibGljOgogICAgIHZvaWQg c2V0RGVmZXJzTG9hZGluZyhib29sKTsKIAogICAgIHZvaWQgY2hhbmdlTG9jYXRpb24oY29uc3Qg S1VSTCYsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGJvb2wgbG9ja0hpc3RvcnkgPSB0cnVlLCBi b29sIGxvY2tCYWNrRm9yd2FyZExpc3QgPSB0cnVlLCBib29sIHVzZXJHZXN0dXJlID0gZmFsc2Us IGJvb2wgcmVmcmVzaCA9IGZhbHNlKTsKLSAgICB2b2lkIHVybFNlbGVjdGVkKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBQYXNzUmVmUHRyPEV2ZW50PiwgYm9v bCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0LCBib29sIHVzZXJHZXN0dXJl LCBSZWZlcnJlclBvbGljeSk7CisgICAgdm9pZCB1cmxTZWxlY3RlZChjb25zdCBLVVJMJiwgY29u c3QgU3RyaW5nJiB0YXJnZXQsIFBhc3NSZWZQdHI8RXZlbnQ+LCBib29sIGxvY2tIaXN0b3J5LCBi b29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIGJvb2wgdXNlckdlc3R1cmUsIFJlZmVycmVyUG9saWN5 KTsKICAgICBib29sIHJlcXVlc3RGcmFtZShIVE1MRnJhbWVPd25lckVsZW1lbnQqLCBjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgQXRvbWljU3RyaW5nJiBmcmFtZU5hbWUsIGJvb2wgbG9ja0hpc3Rv cnkgPSB0cnVlLCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QgPSB0cnVlKTsKIAogICAgIHZvaWQg c3VibWl0Rm9ybShjb25zdCBjaGFyKiBhY3Rpb24sIGNvbnN0IFN0cmluZyYgdXJsLApkaWZmIC0t Z2l0IGEvV2ViQ29yZS93bWwvV01MQUVsZW1lbnQuY3BwIGIvV2ViQ29yZS93bWwvV01MQUVsZW1l bnQuY3BwCmluZGV4IDU1YjI2OTguLmJhM2ViZGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvd21sL1dN TEFFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL3dtbC9XTUxBRWxlbWVudC5jcHAKQEAgLTE0MCw3 ICsxNDAsNyBAQCB2b2lkIFdNTEFFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBl dmVudCkKICAgICAgICAgfQogIAogICAgICAgICBpZiAoIWV2ZW50LT5kZWZhdWx0UHJldmVudGVk KCkgJiYgZG9jdW1lbnQoKS0+ZnJhbWUoKSkgewotICAgICAgICAgICAgU3RyaW5nIHVybCA9IGRv Y3VtZW50KCktPmNvbXBsZXRlVVJMKGRlcHJlY2F0ZWRQYXJzZVVSTChnZXRBdHRyaWJ1dGUoSFRN TE5hbWVzOjpocmVmQXR0cikpKTsKKyAgICAgICAgICAgIEtVUkwgdXJsID0gZG9jdW1lbnQoKS0+ Y29tcGxldGVVUkwoZGVwcmVjYXRlZFBhcnNlVVJMKGdldEF0dHJpYnV0ZShIVE1MTmFtZXM6Omhy ZWZBdHRyKSkpOwogICAgICAgICAgICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+bG9hZGVyKCktPnVy bFNlbGVjdGVkKHVybCwgdGFyZ2V0KCksIGV2ZW50LCBmYWxzZSwgZmFsc2UsIHRydWUsIFNlbmRS ZWZlcnJlcik7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cg Yi9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBhNjdlMTBmLi4zYzQ3N2RkIDEwMDY0NAotLS0g YS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIxIEBACisyMDEwLTA1LTE5ICBDaHJpcyBKZXJkb25layAgPGNqZXJkb25la0B3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v ZGlmaWVkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZCgpIHRvIGFjY2VwdCBhIEtVUkwgaW5zdGVh ZCBvZiBhCisgICAgICAgIFJlc291cmNlUmVxdWVzdC4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMjAKKworICAgICAgICBTaW5jZSBSZXNvdXJj ZVJlcXVlc3QgaGFzIG5vbi1leHBsaWNpdCBzaW5nbGUtcGFyYW1ldGVyIGNvbnN0cnVjdG9ycyBm b3IKKyAgICAgICAgU3RyaW5nIGFuZCBLVVJMLCB1cmxTZWxlY3RlZCgpIHByZXZpb3VzbHkgYWNj ZXB0ZWQgYW55IG9mIFN0cmluZywgS1VSTCwKKyAgICAgICAgYW5kIFJlc291cmNlUmVxdWVzdC4g IFRoaXMgcmV2aXNpb24gY2hhbmdlcyB1cmxTZWxlY3RlZCgpIHRvIGFjY2VwdCBvbmx5CisgICAg ICAgIGEgS1VSTCB0byBtYWtlIHRoZSBBUEkgdGlnaHRlciBhbmQgZWFzaWVyIHRvIHJlZmFjdG9y LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwOgor ICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29nbGUpOgorICAgICAg ICAgIC0gVXBkYXRlZCB0aGUgY2FsbCB0byB1cmxTZWxlY3RlZCgpLgorCiAyMDEwLTA1LTEzICBC cmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBUaW0gSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQv V2ViQ29udGV4dE1lbnVDbGllbnQuY3BwIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJD b250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggMjQxYzM1ZC4uMDc4YjcyNSAxMDA2NDQKLS0tIGEv V2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKKysrIGIv V2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKQEAgLTE0 MCw5ICsxNDAsOCBAQCB2b2lkIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xl KGNvbnN0IEZyYW1lKiBmcmFtZSkKICAgICB1cmwuYXBwZW5kKGVuY29kZWQpOwogICAgIHVybC5h cHBlbmQoIiZpZT1VVEYtOCZvZT1VVEYtOCIpOwogCi0gICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QgPSBSZXNvdXJjZVJlcXVlc3QodXJsKTsKICAgICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lLT5w YWdlKCkpCi0gICAgICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+dXJsU2VsZWN0ZWQo cmVxdWVzdCwgU3RyaW5nKCksIDAsIGZhbHNlLCBmYWxzZSwgdHJ1ZSwgU2VuZFJlZmVycmVyKTsK KyAgICAgICAgcGFnZS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT51cmxTZWxlY3RlZChLVVJMKFBh cnNlZFVSTFN0cmluZywgdXJsKSwgU3RyaW5nKCksIDAsIGZhbHNlLCBmYWxzZSwgdHJ1ZSwgU2Vu ZFJlZmVycmVyKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0TWVudUNsaWVudDo6bG9va1VwSW5EaWN0 aW9uYXJ5KEZyYW1lKikK