213166 2020-06-13 09:37:46 -0700 Rename executeIfJavaScriptURL to executeJavaScriptURL 2020-06-13 23:35:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez darin ews-watchlist japhet webkit-bug-importer oldest_to_newest 1662365 0 rbuis 2020-06-13 09:37:46 -0700 Rename executeIfJavaScriptURL to executeJavaScriptURL in order to make the function unconditional, i.e. the passed url is expected to have the javascript protocol, this is asserted first thing in the method. This allows us to remove the return parameter since the remaining return statements all return true. 1662367 1 401839 rbuis 2020-06-13 09:39:26 -0700 Created attachment 401839 Patch 1662451 2 ews-feeder 2020-06-13 23:34:46 -0700 Committed r263008: <https://trac.webkit.org/changeset/263008> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401839. 1662452 3 webkit-bug-importer 2020-06-13 23:35:15 -0700 <rdar://problem/64337106> 401839 2020-06-13 09:39:26 -0700 2020-06-13 23:34:47 -0700 Patch bug-213166-20200613183925.patch text/plain 7447 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyOTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWZlZjVkNWFlYTIwNzkz NDRmYzBiYmZkMWFkNzJlMDQyMjYzOGMwZi4uZmI3YjdjYmY1NDJkZTRmYTdlNzk3ZmY5NzNiMzY1 N2VjOWVkMDU0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTEzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzE2NgorICAgICAgICBSZW5hbWUgZXhlY3V0ZUlmSmF2YVNj cmlwdFVSTCB0byBleGVjdXRlSmF2YVNjcmlwdFVSTAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBleGVjdXRlSWZKYXZhU2NyaXB0VVJMIHRv IGV4ZWN1dGVKYXZhU2NyaXB0VVJMIGluIG9yZGVyIHRvIG1ha2UgdGhlIGZ1bmN0aW9uCisgICAg ICAgIHVuY29uZGl0aW9uYWwsIGkuZS4gIHRoZSBwYXNzZWQgdXJsIGlzIGV4cGVjdGVkIHRvIGhh dmUgdGhlIGphdmFzY3JpcHQgcHJvdG9jb2wsIHRoaXMKKyAgICAgICAgaXMgYXNzZXJ0ZWQgZmly c3QgdGhpbmcgaW4gdGhlIG1ldGhvZC4gIFRoaXMgYWxsb3dzIHVzIHRvIHJlbW92ZSB0aGUgcmV0 dXJuIHBhcmFtZXRlcgorICAgICAgICBzaW5jZSB0aGUgcmVtYWluaW5nIHJldHVybiBzdGF0ZW1l bnRzIGFsbCByZXR1cm4gdHJ1ZS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENvbnRy b2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZUph dmFTY3JpcHRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0 ZUlmSmF2YVNjcmlwdFVSTCk6IERlbGV0ZWQuCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hhbmdlTG9jYXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OnN1Ym1pdEZvcm0pOgorICAgICAgICAqIGxvYWRlci9TdWJmcmFtZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6U3ViZnJhbWVMb2FkZXI6 OnJlcXVlc3RGcmFtZSk6CisKIDIwMjAtMDYtMTMgIFRldHN1aGFydSBPaHpla2kgIDx0ZXRzdWhh cnUub2h6ZWtpQGdtYWlsLmNvbT4KIAogICAgICAgICBSZW1vdmUgRmlsZUVycm9yLmgKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAKaW5kZXggZjM5 MWE4YmM3N2Y4OGMzZjMwZjkxNTM5YzE0ODY1NjQyZjY2Y2UxMi4uNDNkNzczMjk3MjdkMTRmNjFk Nzk0YWZiNjE1MTk4ODA1MmJjMTVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvU2NyaXB0Q29udHJvbGxlci5jcHAKQEAgLTgwNiwxNiArODA2LDE1IEBAIGJvb2wgU2NyaXB0 Q29udHJvbGxlcjo6Y2FuRXhlY3V0ZVNjcmlwdHMoUmVhc29uRm9yQ2FsbGluZ0NhbkV4ZWN1dGVT Y3JpcHRzIHJlYXNvCiAgICAgcmV0dXJuIG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuYWxsb3dT Y3JpcHQobV9mcmFtZS5zZXR0aW5ncygpLmlzU2NyaXB0RW5hYmxlZCgpKTsKIH0KIAotYm9vbCBT Y3JpcHRDb250cm9sbGVyOjpleGVjdXRlSWZKYXZhU2NyaXB0VVJMKGNvbnN0IFVSTCYgdXJsLCBS ZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHJlcXVlc3RlclNlY3VyaXR5T3JpZ2luLCBTaG91bGRSZXBs YWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgc2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2Ny aXB0VVJMKQordm9pZCBTY3JpcHRDb250cm9sbGVyOjpleGVjdXRlSmF2YVNjcmlwdFVSTChjb25z dCBVUkwmIHVybCwgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiByZXF1ZXN0ZXJTZWN1cml0eU9yaWdp biwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMIHNob3VsZFJlcGxhY2VEb2N1 bWVudElmSmF2YVNjcmlwdFVSTCkKIHsKLSAgICBpZiAoIXVybC5wcm90b2NvbElzSmF2YVNjcmlw dCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgQVNTRVJUKHVybC5wcm90b2NvbElzSmF2 YVNjcmlwdCgpKTsKIAogICAgIGlmIChyZXF1ZXN0ZXJTZWN1cml0eU9yaWdpbiAmJiAhcmVxdWVz dGVyU2VjdXJpdHlPcmlnaW4tPmNhbkFjY2VzcyhtX2ZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5 T3JpZ2luKCkpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuOwogCiAgICAg aWYgKCFtX2ZyYW1lLnBhZ2UoKSB8fCAhbV9mcmFtZS5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJp dHlQb2xpY3koKS0+YWxsb3dKYXZhU2NyaXB0VVJMcyhtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgp LnN0cmluZygpLCBldmVudEhhbmRsZXJQb3NpdGlvbigpLm1fbGluZSkpCi0gICAgICAgIHJldHVy biB0cnVlOworICAgICAgICByZXR1cm47CiAKICAgICAvLyBXZSBuZWVkIHRvIGhvbGQgb250byB0 aGUgRnJhbWUgaGVyZSBiZWNhdXNlIGV4ZWN1dGluZyBzY3JpcHQgY2FuCiAgICAgLy8gZGVzdHJv eSB0aGUgZnJhbWUuCkBAIC04MzUsMTcgKzgzNCwxNyBAQCBib29sIFNjcmlwdENvbnRyb2xsZXI6 OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwoY29uc3QgVVJMJiB1cmwsIFJlZlB0cjxTZWN1cml0eU9y aQogICAgIC8vIElmIGV4ZWN1dGluZyBzY3JpcHQgY2F1c2VkIHRoaXMgZnJhbWUgdG8gYmUgcmVt b3ZlZCBmcm9tIHRoZSBwYWdlLCB3ZQogICAgIC8vIGRvbid0IHdhbnQgdG8gdHJ5IHRvIHJlcGxh Y2UgaXRzIGRvY3VtZW50IQogICAgIGlmICghbV9mcmFtZS5wYWdlKCkpCi0gICAgICAgIHJldHVy biB0cnVlOworICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIXJlc3VsdCkKLSAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZyBzY3JpcHRSZXN1bHQ7CiAg ICAgYm9vbCBpc1N0cmluZyA9IHJlc3VsdC5nZXRTdHJpbmcoZ2xvYmFsT2JqZWN0LCBzY3JpcHRS ZXN1bHQpOwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgdHJ1ZSk7CisgICAg UkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB2b2lkKCkpOwogCiAgICAgaWYgKCFpc1N0 cmluZykKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZJ WE1FOiBXZSBzaG91bGQgYWx3YXlzIHJlcGxhY2UgdGhlIGRvY3VtZW50LCBidXQgZG9pbmcgc28K ICAgICAvLyAgICAgICAgc3luY2hyb25vdXNseSBjYW4gY2F1c2UgY3Jhc2hlczoKQEAgLTg2NSw3 ICs4NjQsNiBAQCBib29sIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwo Y29uc3QgVVJMJiB1cmwsIFJlZlB0cjxTZWN1cml0eU9yaQogICAgICAgICBpZiAoUmVmUHRyPERv Y3VtZW50TG9hZGVyPiBsb2FkZXIgPSBtX2ZyYW1lLmRvY3VtZW50KCktPmxvYWRlcigpKQogICAg ICAgICAgICAgbG9hZGVyLT53cml0ZXIoKS5yZXBsYWNlRG9jdW1lbnRXaXRoUmVzdWx0T2ZFeGVj dXRpbmdKYXZhc2NyaXB0VVJMKHNjcmlwdFJlc3VsdCwgb3duZXJEb2N1bWVudC5nZXQoKSk7CiAg ICAgfQotICAgIHJldHVybiB0cnVlOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmggYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmgKaW5kZXggZjdiMmVj MTc0M2U3N2FlNzgzYTM5MzQ3YTRiNDYyYmVmNmEwZTkyZS4uZWNlYjQ3YjllOWU2NzNmMzkxMGE2 NjNiMWJlMGRjNDY0Y2QxYzE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvU2NyaXB0Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuaApAQCAtMTA5LDggKzEwOSw4IEBAIHB1YmxpYzoKIAogICAgIEV4cGVj dGVkPHZvaWQsIEV4Y2VwdGlvbkRldGFpbHM+IHNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyhE b2N1bWVudCYpIGNvbnN0OwogCi0gICAgLy8gUmV0dXJucyB0cnVlIGlmIGFyZ3VtZW50IGlzIGEg SmF2YVNjcmlwdCBVUkwuCi0gICAgYm9vbCBleGVjdXRlSWZKYXZhU2NyaXB0VVJMKGNvbnN0IFVS TCYsIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gPSBudWxscHRyLCBTaG91bGRSZXBsYWNlRG9jdW1l bnRJZkphdmFTY3JpcHRVUkwgPSBSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpOworICAg IC8vIFRoaXMgYXNzZXJ0cyB0aGF0IFVSTCBhcmd1bWVudCBpcyBhIEphdmFTY3JpcHQgVVJMLgor ICAgIHZvaWQgZXhlY3V0ZUphdmFTY3JpcHRVUkwoY29uc3QgVVJMJiwgUmVmUHRyPFNlY3VyaXR5 T3JpZ2luPiA9IG51bGxwdHIsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCA9 IFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCk7CiAKICAgICAvLyBUaGlzIGZ1bmN0aW9u IG11c3QgYmUgY2FsbGVkIGZyb20gdGhlIG1haW4gdGhyZWFkLiBJdCBpcyBzYWZlIHRvIGNhbGwg aXQgcmVwZWF0ZWRseS4KICAgICAvLyBEYXJ3aW4gaXMgYW4gZXhjZXB0aW9uIHRvIHRoaXMgcnVs ZTogaXQgaXMgT0sgdG8gY2FsbCB0aGlzIGZ1bmN0aW9uIGZyb20gYW55IHRocmVhZCwgZXZlbiBy ZWVudHJhbnRseS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGYxN2Uz YTQ0ODBkMmU2Yzk3NGNlZjVmMTU0NjNlOGFjZGRhOGRmZDUuLjEyNDY4MWY1YzdlZDM4NmZmNTA0 NjZjMjI4OTUwNDczMzg3MjI2ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cApAQCAtNDM2LDcgKzQzNiw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNoYW5nZUxvY2F0aW9uKEZy YW1lTG9hZFJlcXVlc3QmJiBmcmFtZVJlcXVlc3QsIEV2ZW50KiB0cmlnZ2VyCiAKICAgICBSZWY8 RnJhbWU+IHByb3RlY3QobV9mcmFtZSk7CiAKLSAgICBpZiAobV9mcmFtZS5zY3JpcHQoKS5leGVj dXRlSWZKYXZhU2NyaXB0VVJMKGZyYW1lUmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKSwg JmZyYW1lUmVxdWVzdC5yZXF1ZXN0ZXIoKS5zZWN1cml0eU9yaWdpbigpLCBmcmFtZVJlcXVlc3Qu c2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKCkpKSB7CisgICAgaWYgKGZyYW1l UmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKS5wcm90b2NvbElzSmF2YVNjcmlwdCgpKSB7 CisgICAgICAgIG1fZnJhbWUuc2NyaXB0KCkuZXhlY3V0ZUphdmFTY3JpcHRVUkwoZnJhbWVSZXF1 ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpLCAmZnJhbWVSZXF1ZXN0LnJlcXVlc3RlcigpLnNl Y3VyaXR5T3JpZ2luKCksIGZyYW1lUmVxdWVzdC5zaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFT Y3JpcHRVUkwoKSk7CiAgICAgICAgIG1fcXVpY2tSZWRpcmVjdENvbWluZyA9IGZhbHNlOwogICAg ICAgICByZXR1cm47CiAgICAgfQpAQCAtNDc1LDcgKzQ3Niw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6 OnN1Ym1pdEZvcm0oUmVmPEZvcm1TdWJtaXNzaW9uPiYmIHN1Ym1pc3Npb24pCiAgICAgaWYgKGZv cm1BY3Rpb24ucHJvdG9jb2xJc0phdmFTY3JpcHQoKSkgewogICAgICAgICBtX2lzRXhlY3V0aW5n SmF2YVNjcmlwdEZvcm1BY3Rpb24gPSB0cnVlOwogICAgICAgICBSZWY8RnJhbWU+IHByb3RlY3Qo bV9mcmFtZSk7Ci0gICAgICAgIG1fZnJhbWUuc2NyaXB0KCkuZXhlY3V0ZUlmSmF2YVNjcmlwdFVS TChzdWJtaXNzaW9uLT5hY3Rpb24oKSwgbnVsbHB0ciwgRG9Ob3RSZXBsYWNlRG9jdW1lbnRJZkph dmFTY3JpcHRVUkwpOworICAgICAgICBtX2ZyYW1lLnNjcmlwdCgpLmV4ZWN1dGVKYXZhU2NyaXB0 VVJMKHN1Ym1pc3Npb24tPmFjdGlvbigpLCBudWxscHRyLCBEb05vdFJlcGxhY2VEb2N1bWVudElm SmF2YVNjcmlwdFVSTCk7CiAgICAgICAgIG1faXNFeGVjdXRpbmdKYXZhU2NyaXB0Rm9ybUFjdGlv biA9IGZhbHNlOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9T dWJmcmFtZUxvYWRlci5jcHAKaW5kZXggNzU4NGE0ZTMxMzQ0OWIyZTY4OWU0MGI2NjI0YTNlMDM2 OWUwYzNkNS4uNTNhZjdkODNhMGU1NmE3MDY1NzBkN2QzYTIwYjA5NmIyMjRjNjFmMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCkBAIC0xMDMsNyArMTAzLDcgQEAg Ym9vbCBGcmFtZUxvYWRlcjo6U3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RGcmFtZShIVE1MRnJhbWVP d25lckVsZW1lbnQmIG93bmVyRWxlbWUKICAgICAgICAgLy8gRklYTUU6IFNvbWUgc2l0ZXMgcmVs eSBvbiB0aGUgamF2YXNjcmlwdDonJyBsb2FkaW5nIHN5bmNocm9ub3VzbHksIHdoaWNoIGlzIHdo eSB3ZSBoYXZlIHRoaXMgc3BlY2lhbCBjYXNlLgogICAgICAgICAvLyBCbGluayBoYXMgdGhlIHNh bWUgd29ya2Fyb3VuZCAoaHR0cHM6Ly9idWdzLmNocm9taXVtLm9yZy9wL2Nocm9taXVtL2lzc3Vl cy9kZXRhaWw/aWQ9OTIzNTg1KS4KICAgICAgICAgaWYgKHVybFN0cmluZyA9PSAiamF2YXNjcmlw dDonJyIgfHwgdXJsU3RyaW5nID09ICJqYXZhc2NyaXB0OlwiXCIiKQotICAgICAgICAgICAgZnJh bWUtPnNjcmlwdCgpLmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwoc2NyaXB0VVJMKTsKKyAgICAgICAg ICAgIGZyYW1lLT5zY3JpcHQoKS5leGVjdXRlSmF2YVNjcmlwdFVSTChzY3JpcHRVUkwpOwogICAg ICAgICBlbHNlCiAgICAgICAgICAgICBmcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVk dWxlTG9jYXRpb25DaGFuZ2Uob3duZXJFbGVtZW50LmRvY3VtZW50KCksIG93bmVyRWxlbWVudC5k b2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCksIHNjcmlwdFVSTCwgbV9mcmFtZS5sb2FkZXIoKS5v dXRnb2luZ1JlZmVycmVyKCksIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCBzdG9w RGVsYXlpbmdMb2FkRXZlbnQucmVsZWFzZSgpKTsKICAgICB9Cg==