112960 2013-03-21 13:46:29 -0700 [BlackBerry] addSearchProvider shouldn't match the full host, only the server 2013-03-21 14:54:43 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 otcheung webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 860639 0 otcheung 2013-03-21 13:46:29 -0700 Use the getRegisteredDomain ftn to compare the target url and the security origin url. Also, only dispatch the addsearchprovider event after we check user-gesture. 860642 1 194326 otcheung 2013-03-21 13:48:48 -0700 Created attachment 194326 Patch 860724 2 194326 rwlbuis 2013-03-21 14:46:00 -0700 Comment on attachment 194326 Patch LGTM. 860750 3 194326 webkit.review.bot 2013-03-21 14:54:40 -0700 Comment on attachment 194326 Patch Clearing flags on attachment: 194326 Committed r146526: <http://trac.webkit.org/changeset/146526> 860751 4 webkit.review.bot 2013-03-21 14:54:43 -0700 All reviewed patches have been landed. Closing bug. 194326 2013-03-21 13:48:48 -0700 2013-03-21 14:54:40 -0700 Patch bug-112960-20130321164436.patch text/plain 5494 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA4OTQ0ZTAzMjIwMjllMDAwZWE0OThmZDYwNTZmMjQ3ODVmNDU2ZDMwLi45MTkwMGIwMTcz MTIwYTkwNjA1MjFmOTUyMjg2ZjMyOGZmMTFlOWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMy0wMy0yMSAgT3R0byBEZXJlayBDaGV1bmcgIDxv dGNoZXVuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBhZGRTZWFyY2hQcm92aWRl ciBzaG91bGRuJ3QgbWF0Y2ggdGhlIGZ1bGwgaG9zdCwgb25seSB0aGUgc2VydmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI5NjAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgSW50ZXJuYWxseSBSZXZpZXdl ZCBieSBKZWZmIFJvZ2Vycy4KKworICAgICAgICBSZW1vdmUgZnVsbCBob3N0IG1hdGNoaW5nLiBv bmx5IGNoZWNrIGlmIGRvbWFpbnMgYXJlIGZyb20gdGhlIHNhbWUgc2VydmVyLgorCisgICAgICAg IEFsc28sIGNoZWNrIHVzZXIgZ2VzdHVyZSBiZWZvcmUgZGlzcGF0Y2hpbmcgdGhlIGFkZFNlYXJj aFByb3ZpZGVyIGV2ZW50IHRvIHRoZSBicm93c2VyLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVD bGllbnRCbGFja0JlcnJ5OjphZGRTZWFyY2hQcm92aWRlcik6CisgICAgICAgIChXZWJDb3JlOjpD aHJvbWVDbGllbnRCbGFja0JlcnJ5Ojppc1NlYXJjaFByb3ZpZGVySW5zdGFsbGVkKToKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5Lmg6CisgICAgICAgIChD aHJvbWVDbGllbnRCbGFja0JlcnJ5KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FeHRlcm5h bEV4dGVuc2lvbi5jcHA6CisgICAgICAgIChJc1NlYXJjaFByb3ZpZGVySW5zdGFsbGVkTWV0aG9k KToKKwogMjAxMy0wMy0xOSAgQW5kcmV3IExvICA8YW5sb0ByaW0uY29tPgogCiAgICAgICAgIFtC bGFja0JlcnJ5XSBTZWxlY3Rpb24gb3ZlcmxheSBpcyBzb21ldGltZXMgaW4gd3JvbmcgcG9zaXRp b24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggNDBlMTU3ZWMxY2Yx MDM1NDNjMWIxZDc5YWQzOTE5NWNiY2M1NTZjMy4uYjdjZDQ3NTYzODI1MmNhZWRmYzZiNDBmMWQw ZmFkNGM2MTQ4MmZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAt NjgsNiArNjgsNyBAQAogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybVNldHRpbmdzLmg+CiAj aW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtU3RyaW5nLmg+CiAjaW5jbHVkZSA8QmxhY2tCZXJy eVBsYXRmb3JtV2luZG93Lmg+CisjaW5jbHVkZSA8bmV0d29yay9Eb21haW5Ub29scy5oPgogCiAj aW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmlu Zy5oPgpAQCAtODI1LDI0ICs4MjYsMjcgQEAgUGFzc093blB0cjxDb2xvckNob29zZXI+IENocm9t ZUNsaWVudEJsYWNrQmVycnk6OmNyZWF0ZUNvbG9yQ2hvb3NlcihDb2xvckNob29zZXIKIAogdm9p ZCBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjphZGRTZWFyY2hQcm92aWRlcihjb25zdCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBvcmlnaW5VUkwsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRm b3JtOjpTdHJpbmcmIG5ld1VSTCkKIHsKLSAgICAvLyBTZWUgaWYgdGhlIGlucHV0IFVSTCBob3N0 IG1hdGNoZXMgb2YgdGhlIG9yaWdpbiBob3N0LgotICAgIEtVUkwgb3JpZ2luSG9zdCA9IEtVUkwo S1VSTCgpLCBvcmlnaW5VUkwpOworICAgIC8vIEVhcmx5IHJldHVybiBpZiB0aGlzIGZ1bmN0aW9u IGlzIG5vdCB0cmlnZ2VyZWQgYnkgYSB1c2VyIGdlc3R1cmUuCisgICAgaWYgKCFTY3JpcHRDb250 cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg Ly8gU2VjdXJpdHkgb3JpZ2luIGhvc3QgJiB0YXJnZXQgaG9zdCBtdXN0IHNoYXJlIGEgY29tbW9u IHJlZ2lzdGVyZWQgZG9tYWluCiAgICAgS1VSTCB1cmwgPSBLVVJMKEtVUkwoKSwgbmV3VVJMKTsK LSAgICBpZiAodXJsLmlzVmFsaWQoKSAmJiBvcmlnaW5Ib3N0Lmhvc3QoKSA9PSB1cmwuaG9zdCgp KQorICAgIFN0cmluZyBvcmlnaW5Ib3N0ID0gS1VSTChLVVJMKCksIG9yaWdpblVSTCkuaG9zdCgp OworCisgICAgaWYgKHVybC5pc1ZhbGlkKCkgJiYgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmdldFJl Z2lzdGVyZWREb21haW4ob3JpZ2luSG9zdCkgPT0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OmdldFJl Z2lzdGVyZWREb21haW4odXJsLmhvc3QoKSkpCiAgICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPmNs aWVudCgpLT5hZGRTZWFyY2hQcm92aWRlcihuZXdVUkwpOwogfQogCi1pbnQgQ2hyb21lQ2xpZW50 QmxhY2tCZXJyeTo6aXNTZWFyY2hQcm92aWRlckluc3RhbGxlZChjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBvcmlnaW5VUkwsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcmIG5ld1VSTCkKK2ludCBDaHJvbWVDbGllbnRCbGFja0JlcnJ5Ojppc1NlYXJjaFByb3Zp ZGVySW5zdGFsbGVkKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG5ld1VSTCkK IHsKIC8vICAgIFJldHVybnMgYSB2YWx1ZSBiYXNlZCBvbiBjb21wYXJpbmcgdXJsIHRvIHRoZSBV UkxzIG9mIHRoZSByZXN1bHRzIHBhZ2VzIG9mIHRoZSBpbnN0YWxsZWQgc2VhcmNoIGVuZ2luZXMu CiAvLyAgICAwIC0gTm9uZSBvZiB0aGUgaW5zdGFsbGVkIHNlYXJjaCBlbmdpbmVzIG1hdGNoIHVy bC4KIC8vICAgIDEgLSBPbmUgb3IgbW9yZSBpbnN0YWxsZWQgc2VhcmNoIGVuZ2luZXMgbWF0Y2gg dXJsLCBidXQgbm9uZSBhcmUgdGhlIHVzZXIncyBkZWZhdWx0IHNlYXJjaCBlbmdpbmUuCiAvLyAg ICAyIC0gVGhlIHVzZXIncyBkZWZhdWx0IHNlYXJjaCBlbmdpbmUgbWF0Y2hlcyB1cmwuCiAKLSAg ICAvLyBTZWUgaWYgdGhlIGlucHV0IFVSTCBob3N0IG1hdGNoZXMgb2YgdGhlIG9yaWdpbiBob3N0 LgotICAgIEtVUkwgb3JpZ2luSG9zdCA9IEtVUkwoS1VSTCgpLCBvcmlnaW5VUkwpOwogICAgIEtV UkwgdXJsID0gS1VSTChLVVJMKCksIG5ld1VSTCk7Ci0gICAgaWYgKHVybC5pc1ZhbGlkKCkgJiYg b3JpZ2luSG9zdC5ob3N0KCkgPT0gdXJsLmhvc3QoKSkKKyAgICBpZiAodXJsLmlzVmFsaWQoKSkK ICAgICAgICAgcmV0dXJuIG1fd2ViUGFnZVByaXZhdGUtPmNsaWVudCgpLT5pc1NlYXJjaFByb3Zp ZGVySW5zdGFsbGVkKG5ld1VSTCk7CiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJy eS5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEJsYWNrQmVycnkuaAppbmRleCAxMDg3OGM0ZGRhNzFkNjU5OWI4MmUwZGNlM2I2MDI1NjZlM2Nk MWM5Li44NjUyY2Q1NTU5MTliNDcyNmY2ZjA5ZjczYmNlOTM3MmU3Nzc0MTBkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50Qmxh Y2tCZXJyeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRCbGFja0JlcnJ5LmgKQEAgLTE1Miw3ICsxNTIsNyBAQCBwdWJsaWM6CiAjZW5k aWYKIAogICAgIHZpcnR1YWwgdm9pZCBhZGRTZWFyY2hQcm92aWRlcihjb25zdCBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nJiwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYp OwotICAgIHZpcnR1YWwgaW50IGlzU2VhcmNoUHJvdmlkZXJJbnN0YWxsZWQoY29uc3QgQmxhY2tC ZXJyeTo6UGxhdGZvcm06OlN0cmluZyYsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcmKTsKKyAgICB2aXJ0dWFsIGludCBpc1NlYXJjaFByb3ZpZGVySW5zdGFsbGVkKGNvbnN0IEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmKTsKIAogICAgIEJsYWNrQmVycnk6OldlYktpdDo6 V2ViUGFnZVByaXZhdGUqIHdlYlBhZ2VQcml2YXRlKCkgY29uc3QgeyByZXR1cm4gbV93ZWJQYWdl UHJpdmF0ZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29y ZVN1cHBvcnQvRXh0ZXJuYWxFeHRlbnNpb24uY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0V4dGVybmFsRXh0ZW5zaW9uLmNwcAppbmRleCAwYmY5YTA5MGI1NmEx MWJmOWQ0ZDZmZWI5NDIwM2FlNjJiNDIyOWQ2Li5lZDNjN2RhZjUzODk1NmQyNWYxMjE2NTRjODE0 NDFkMTdjMzUyZmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29y ZVN1cHBvcnQvRXh0ZXJuYWxFeHRlbnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJDb3JlU3VwcG9ydC9FeHRlcm5hbEV4dGVuc2lvbi5jcHAKQEAgLTg2LDkgKzg2LDgg QEAgc3RhdGljIEpTVmFsdWVSZWYgSXNTZWFyY2hQcm92aWRlckluc3RhbGxlZE1ldGhvZCgKICAg ICAgICAgSlNTdHJpbmdHZXRVVEY4Q1N0cmluZyhzdHJpbmcsIG5ld1VSTCwgc2l6ZVVURjgpOwog ICAgICAgICBKU1N0cmluZ1JlbGVhc2Uoc3RyaW5nKTsKIAotICAgICAgICBTdHJpbmcgb3JpZ2lu VVJMID0gZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCk7CiAg ICAgICAgIENocm9tZUNsaWVudEJsYWNrQmVycnkqIGNocm9tZSA9IHN0YXRpY19jYXN0PENocm9t ZUNsaWVudEJsYWNrQmVycnkqPiAocGFnZS0+Y2hyb21lKCktPmNsaWVudCgpKTsKLSAgICAgICAg aW50IHJldFZhbCA9IGNocm9tZS0+aXNTZWFyY2hQcm92aWRlckluc3RhbGxlZChvcmlnaW5VUkws IG5ld1VSTCk7CisgICAgICAgIGludCByZXRWYWwgPSBjaHJvbWUtPmlzU2VhcmNoUHJvdmlkZXJJ bnN0YWxsZWQobmV3VVJMKTsKIAogICAgICAgICBqc1JldFZhbCA9IEpTVmFsdWVNYWtlTnVtYmVy KGN0eCwgcmV0VmFsKTsKICAgICB9Cg==