103014 2012-11-21 20:37:12 -0800 Move URL-checking code into Frame 2012-11-22 03:59:52 -0800 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 0 ctruta webkit-unassigned ojan webkit.review.bot oldest_to_newest 773529 0 ctruta 2012-11-21 20:37:12 -0800 The common code logic of HTMLFrameElementBase::isURLAllowed and HTMLPlugInImageElement::allowedToLoadFrameURL can be moved into a single place. I think the best candidate is a new method named Frame::isURLAllowed. 773534 1 175579 ctruta 2012-11-21 20:49:57 -0800 Created attachment 175579 Patch 773819 2 175579 webkit.review.bot 2012-11-22 03:59:49 -0800 Comment on attachment 175579 Patch Clearing flags on attachment: 175579 Committed r135503: <http://trac.webkit.org/changeset/135503> 773820 3 webkit.review.bot 2012-11-22 03:59:52 -0800 All reviewed patches have been landed. Closing bug. 175579 2012-11-21 20:49:57 -0800 2012-11-22 03:59:49 -0800 Patch patch.diff text/plain 5177 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYWNlYjc2YzkuLjc5MWYwMTI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDI0IEBACisyMDEyLTExLTIxICBDb3NtaW4gVHJ1dGEgIDxjdHJ1dGFAcmltLmNvbT4KKworICAg ICAgICBNb3ZlIFVSTC1jaGVja2luZyBjb2RlIGludG8gRnJhbWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzAxNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIGNvbW1vbiBVUkwgY2hlY2tp bmcgbG9naWMgZnJvbSBIVE1MRnJhbWVFbGVtZW50QmFzZTo6aXNVUkxBbGxvd2VkCisgICAgICAg IGFuZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjphbGxvd2VkVG9Mb2FkRnJhbWVVUkwgaW50byBG cmFtZTo6aXNVUkxBbGxvd2VkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gUmVmYWN0b3Jpbmcu CisKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxGcmFtZUVsZW1lbnRCYXNlOjppc1VSTEFsbG93ZWQpOiBDYWxsIEZyYW1lOjpp c1VSTEFsbG93ZWQuCisgICAgICAgICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OmFsbG93ZWRUb0xvYWRG cmFtZVVSTCk6IENhbGwgRnJhbWU6OmlzVVJMQWxsb3dlZC4KKyAgICAgICAgKiBwYWdlL0ZyYW1l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjppc1VSTEFsbG93ZWQpOiBBZGRlZC4KKyAg ICAgICAgKiBwYWdlL0ZyYW1lLmg6CisgICAgICAgIChGcmFtZSk6IEFkZGVkIGlzVVJMQWxsb3dl ZC4KKwogMjAxMi0xMS0yMSAgS2FpIEtvZWhuZSAgPGthaS5rb2VobmVAZGlnaWEuY29tPgogCiAg ICAgICAgIFtRdF0gTWluR1c6IEV4cGxpY2l0bHkgYWRkIE9wZW5HTCBsaWJyYXJ5IGRlcGVuZGVu Y2llcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFz ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNwcAppbmRl eCA3YWRjOWM4ZmQuLjJjZmIyZmIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRnJhbWVFbGVtZW50QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJh bWVFbGVtZW50QmFzZS5jcHAKQEAgLTY2LDIyICs2NiwxMCBAQCBib29sIEhUTUxGcmFtZUVsZW1l bnRCYXNlOjppc1VSTEFsbG93ZWQoKSBjb25zdAogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KIAotICAgIGlmIChGcmFtZSogcGFyZW50RnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgp KSB7Ci0gICAgICAgIGlmIChwYXJlbnRGcmFtZS0+cGFnZSgpLT5zdWJmcmFtZUNvdW50KCkgPj0g UGFnZTo6bWF4TnVtYmVyT2ZGcmFtZXMpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg fQorICAgIEZyYW1lKiBwYXJlbnRGcmFtZSA9IGRvY3VtZW50KCktPmZyYW1lKCk7CisgICAgaWYg KHBhcmVudEZyYW1lKQorICAgICAgICByZXR1cm4gcGFyZW50RnJhbWUtPmlzVVJMQWxsb3dlZChj b21wbGV0ZVVSTCk7CiAKLSAgICAvLyBXZSBhbGxvdyBvbmUgbGV2ZWwgb2Ygc2VsZi1yZWZlcmVu Y2UgYmVjYXVzZSBzb21lIHNpdGVzIGRlcGVuZCBvbiB0aGF0LgotICAgIC8vIEJ1dCB3ZSBkb24n dCBhbGxvdyBtb3JlIHRoYW4gb25lLgotICAgIGJvb2wgZm91bmRTZWxmUmVmZXJlbmNlID0gZmFs c2U7Ci0gICAgZm9yIChGcmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgpOyBmcmFtZTsg ZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkgewotICAgICAgICBpZiAoZXF1YWxJZ25v cmluZ0ZyYWdtZW50SWRlbnRpZmllcihmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCksIGNvbXBsZXRl VVJMKSkgewotICAgICAgICAgICAgaWYgKGZvdW5kU2VsZlJlZmVyZW5jZSkKLSAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBmb3VuZFNlbGZSZWZlcmVuY2UgPSB0cnVl OwotICAgICAgICB9Ci0gICAgfQotICAgIAogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAppbmRleCBmMTcyMGI4 ZDUuLmI4MDlhMTM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0lu SW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFn ZUVsZW1lbnQuY3BwCkBAIC04OCwyOCArODgsMTMgQEAgYm9vbCBIVE1MUGx1Z0luSW1hZ2VFbGVt ZW50Ojppc0ltYWdlVHlwZSgpCiAvLyBkZXBlbmRpbmcgb24gPHBhcmFtPiB2YWx1ZXMuIAogYm9v bCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjphbGxvd2VkVG9Mb2FkRnJhbWVVUkwoY29uc3QgU3Ry aW5nJiB1cmwpCiB7Ci0gICAgQVNTRVJUKGRvY3VtZW50KCkpOwotICAgIEFTU0VSVChkb2N1bWVu dCgpLT5mcmFtZSgpKTsKLSAgICBpZiAoZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpLT5zdWJm cmFtZUNvdW50KCkgPj0gUGFnZTo6bWF4TnVtYmVyT2ZGcmFtZXMpCi0gICAgICAgIHJldHVybiBm YWxzZTsKLQogICAgIEtVUkwgY29tcGxldGVVUkwgPSBkb2N1bWVudCgpLT5jb21wbGV0ZVVSTCh1 cmwpOwotICAgIAorCiAgICAgaWYgKGNvbnRlbnRGcmFtZSgpICYmIHByb3RvY29sSXNKYXZhU2Ny aXB0KGNvbXBsZXRlVVJMKQogICAgICAgICAmJiAhZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4o KS0+Y2FuQWNjZXNzKGNvbnRlbnREb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgIAotICAgIC8vIFdlIGFsbG93IG9uZSBsZXZlbCBvZiBzZWxm LXJlZmVyZW5jZSBiZWNhdXNlIHNvbWUgc2l0ZXMgZGVwZW5kIG9uIHRoYXQuCi0gICAgLy8gQnV0 IHdlIGRvbid0IGFsbG93IG1vcmUgdGhhbiBvbmUuCi0gICAgYm9vbCBmb3VuZFNlbGZSZWZlcmVu Y2UgPSBmYWxzZTsKLSAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCktPmZyYW1lKCk7 IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnBhcmVudCgpKSB7Ci0gICAgICAgIGlmIChl cXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKGZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSwg Y29tcGxldGVVUkwpKSB7Ci0gICAgICAgICAgICBpZiAoZm91bmRTZWxmUmVmZXJlbmNlKQotICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIGZvdW5kU2VsZlJlZmVyZW5j ZSA9IHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1 cm4gZG9jdW1lbnQoKS0+ZnJhbWUoKS0+aXNVUkxBbGxvd2VkKGNvbXBsZXRlVVJMKTsKIH0KIAog Ly8gV2UgZG9uJ3QgdXNlIG1fdXJsLCBvciBtX3NlcnZpY2VUeXBlIGFzIHRoZXkgbWF5IG5vdCBi ZSB0aGUgZmluYWwgdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDRmNzNlNzg1YS4uMzk5 YzgzYjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTAxNyw2ICsxMDE3LDIzIEBAIHZvaWQg RnJhbWU6Om5vdGlmeUNocm9tZUNsaWVudFdoZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKCkg Y29uc3QKICAgICBtX3BhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+bnVtV2hlZWxFdmVudEhhbmRs ZXJzQ2hhbmdlZChjb3VudCk7CiB9CiAKK2Jvb2wgRnJhbWU6OmlzVVJMQWxsb3dlZChjb25zdCBL VVJMJiB1cmwpIGNvbnN0Cit7CisgICAgLy8gV2UgYWxsb3cgb25lIGxldmVsIG9mIHNlbGYtcmVm ZXJlbmNlIGJlY2F1c2Ugc29tZSBzaXRlcyBkZXBlbmQgb24gdGhhdCwKKyAgICAvLyBidXQgd2Ug ZG9uJ3QgYWxsb3cgbW9yZSB0aGFuIG9uZS4KKyAgICBpZiAobV9wYWdlLT5zdWJmcmFtZUNvdW50 KCkgPj0gUGFnZTo6bWF4TnVtYmVyT2ZGcmFtZXMpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICBib29sIGZvdW5kU2VsZlJlZmVyZW5jZSA9IGZhbHNlOworICAgIGZvciAoY29uc3QgRnJhbWUq IGZyYW1lID0gdGhpczsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpIHsK KyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIoZnJhbWUtPmRvY3Vt ZW50KCktPnVybCgpLCB1cmwpKSB7CisgICAgICAgICAgICBpZiAoZm91bmRTZWxmUmVmZXJlbmNl KQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGZvdW5kU2VsZlJl ZmVyZW5jZSA9IHRydWU7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisK ICNpZiAhUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oV0lOKQogc3RydWN0IFNjb3BlZEZyYW1l UGFpbnRpbmdTdGF0ZSB7CiAgICAgU2NvcGVkRnJhbWVQYWludGluZ1N0YXRlKEZyYW1lKiBmcmFt ZSwgTm9kZSogbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAppbmRleCA5Yzg3NGFiODguLjcwNTNlYjI0MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWUuaApAQCAtMjAyLDYgKzIwMiw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgLy8gU2hvdWxkIG9ubHkgYmUgY2FsbGVkIG9uIHRoZSBtYWluIGZyYW1lIG9mIGEg cGFnZS4KICAgICAgICAgdm9pZCBub3RpZnlDaHJvbWVDbGllbnRXaGVlbEV2ZW50SGFuZGxlckNv dW50Q2hhbmdlZCgpIGNvbnN0OwogCisgICAgICAgIGJvb2wgaXNVUkxBbGxvd2VkKGNvbnN0IEtV UkwmKSBjb25zdDsKKwogICAgIC8vID09PT09PT09CiAKICAgICBwcml2YXRlOgo=