173358 2017-06-14 02:14:25 -0700 [GTK] Use API::InjectedBundle::Client in WebKitWebExtension 2017-06-15 02:10:22 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 173357 173383 1 cgarcia webkit-unassigned bugs-noreply commit-queue mcatanzaro zan oldest_to_newest 1319067 0 cgarcia 2017-06-14 02:14:25 -0700 Instead of the C API. 1319069 1 312875 cgarcia 2017-06-14 02:16:39 -0700 Created attachment 312875 Patch Adri, this will fail to build because it depends on a new header added in bug #173357 1319169 2 cgarcia 2017-06-14 09:46:16 -0700 Committed r218265: <http://trac.webkit.org/changeset/218265> 1319321 3 commit-queue 2017-06-14 13:49:30 -0700 Re-opened since this is blocked by bug 173383 1319510 4 cgarcia 2017-06-15 02:10:22 -0700 Committed r218323: <http://trac.webkit.org/changeset/218323> 312875 2017-06-14 02:16:39 -0700 2017-06-14 08:46:34 -0700 Patch wk2-gtk-injected-bundle-client.diff text/plain 6108 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2YzUxYjVkMjIwYi4uMTM5NDRhNmVkYjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNCBAQAogMjAxNy0wNi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OkNsaWVu dCBpbiBXZWJLaXRXZWJFeHRlbnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE3MzM1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgdGhlIEMgQVBJLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYkV4dGVuc2lvbi5jcHA6CisgICAg ICAgICh3ZWJraXRXZWJFeHRlbnNpb25DcmVhdGUpOgorICAgICAgICAod2Via2l0V2ViRXh0ZW5z aW9uUGFnZUNyZWF0ZWQpOiBEZWxldGVkLgorICAgICAgICAod2Via2l0V2ViRXh0ZW5zaW9uUGFn ZURlc3Ryb3kpOiBEZWxldGVkLgorICAgICAgICAod2Via2l0V2ViRXh0ZW5zaW9uRGlkUmVjZWl2 ZU1lc3NhZ2UpOiBEZWxldGVkLgorICAgICAgICAoZGlkQ3JlYXRlUGFnZSk6IERlbGV0ZWQuCisg ICAgICAgICh3aWxsRGVzdHJveVBhZ2UpOiBEZWxldGVkLgorICAgICAgICAoZGlkUmVjZWl2ZU1l c3NhZ2UpOiBEZWxldGVkLgorICAgICAgICAoZGlkUmVjZWl2ZU1lc3NhZ2VUb1BhZ2UpOiBEZWxl dGVkLgorCisyMDE3LTA2LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKwogICAgICAgICBBZGQgQVBJOjpJbmplY3RlZEJ1bmRsZTo6Q2xpZW50CiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMzNTcKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dl YktpdFdlYkV4dGVuc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0ZW5zaW9uLmNwcAppbmRleCA3M2RkYTQzYzkyZC4u NjBkODQxYWY5NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24u Y3BwCkBAIC0yMSwxMCArMjEsOCBAQAogI2luY2x1ZGUgIldlYktpdFdlYkV4dGVuc2lvbi5oIgog CiAjaW5jbHVkZSAiQVBJRGljdGlvbmFyeS5oIgorI2luY2x1ZGUgIkFQSUluamVjdGVkQnVuZGxl QnVuZGxlQ2xpZW50LmgiCiAjaW5jbHVkZSAiQVBJU3RyaW5nLmgiCi0jaW5jbHVkZSAiV0tCdW5k bGUuaCIKLSNpbmNsdWRlICJXS0J1bmRsZUFQSUNhc3QuaCIKLSNpbmNsdWRlICJXS0J1bmRsZVBh Z2UuaCIKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViRXh0 ZW5zaW9uUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFdlYlBhZ2VQcml2YXRlLmgiCkBAIC0x NDYsNjcgKzE0NCw1MSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2V4dGVuc2lvbl9jbGFzc19p bml0KFdlYktpdFdlYkV4dGVuc2lvbkNsYXNzKiBrbGFzcykKICAgICAgICAgV0VCS0lUX1RZUEVf V0VCX1BBR0UpOwogfQogCi1zdGF0aWMgdm9pZCB3ZWJraXRXZWJFeHRlbnNpb25QYWdlQ3JlYXRl ZChXZWJLaXRXZWJFeHRlbnNpb24qIGV4dGVuc2lvbiwgV2ViUGFnZSogcGFnZSkKLXsKLSAgICBH UmVmUHRyPFdlYktpdFdlYlBhZ2U+IHdlYlBhZ2UgPSBhZG9wdEdSZWYod2Via2l0V2ViUGFnZUNy ZWF0ZShwYWdlKSk7Ci0gICAgZXh0ZW5zaW9uLT5wcml2LT5wYWdlcy5hZGQocGFnZSwgd2ViUGFn ZSk7Ci0gICAgZ19zaWduYWxfZW1pdChleHRlbnNpb24sIHNpZ25hbHNbUEFHRV9DUkVBVEVEXSwg MCwgd2ViUGFnZS5nZXQoKSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHdlYmtpdFdlYkV4dGVuc2lvblBh Z2VEZXN0cm95KFdlYktpdFdlYkV4dGVuc2lvbiogZXh0ZW5zaW9uLCBXZWJQYWdlKiBwYWdlKQot ewotICAgIGV4dGVuc2lvbi0+cHJpdi0+cGFnZXMucmVtb3ZlKHBhZ2UpOwotfQotCi1zdGF0aWMg dm9pZCB3ZWJraXRXZWJFeHRlbnNpb25EaWRSZWNlaXZlTWVzc2FnZShXZWJLaXRXZWJFeHRlbnNp b24qLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBBUEk6OkRpY3Rpb25hcnkmIG1lc3NhZ2Up Ci17Ci0gICAgaWYgKG1lc3NhZ2VOYW1lID09IFN0cmluZzo6ZnJvbVVURjgoIlByZWZldGNoRE5T IikpIHsKLSAgICAgICAgQVBJOjpTdHJpbmcqIGhvc3RuYW1lID0gc3RhdGljX2Nhc3Q8QVBJOjpT dHJpbmcqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJIb3N0bmFtZSIpKSk7Ci0gICAg ICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnByZWZldGNoRE5TKGhvc3RuYW1lLT5zdHJpbmco KSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotfQotCi1zdGF0 aWMgdm9pZCBkaWRDcmVhdGVQYWdlKFdLQnVuZGxlUmVmLCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICB3ZWJraXRXZWJFeHRlbnNpb25QYWdlQ3Jl YXRlZChXRUJLSVRfV0VCX0VYVEVOU0lPTihjbGllbnRJbmZvKSwgdG9JbXBsKHBhZ2UpKTsKLX0K LQotc3RhdGljIHZvaWQgd2lsbERlc3Ryb3lQYWdlKFdLQnVuZGxlUmVmLCBXS0J1bmRsZVBhZ2VS ZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICB3ZWJraXRXZWJFeHRlbnNp b25QYWdlRGVzdHJveShXRUJLSVRfV0VCX0VYVEVOU0lPTihjbGllbnRJbmZvKSwgdG9JbXBsKHBh Z2UpKTsKLX0KLQotc3RhdGljIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoV0tCdW5kbGVSZWYsIFdL U3RyaW5nUmVmIG5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKLXsKLSAgICBBU1NFUlQoV0tHZXRUeXBlSUQobWVzc2FnZUJvZHkpID09IFdLRGljdGlv bmFyeUdldFR5cGVJRCgpKTsKLSAgICB3ZWJraXRXZWJFeHRlbnNpb25EaWRSZWNlaXZlTWVzc2Fn ZShXRUJLSVRfV0VCX0VYVEVOU0lPTihjbGllbnRJbmZvKSwgdG9JbXBsKG5hbWUpLT5zdHJpbmco KSwgKnRvSW1wbChzdGF0aWNfY2FzdDxXS0RpY3Rpb25hcnlSZWY+KG1lc3NhZ2VCb2R5KSkpOwot fQotCi1zdGF0aWMgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZVRvUGFnZShXS0J1bmRsZVJlZiwgV0tC dW5kbGVQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIG5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9k eSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICBBU1NFUlQoV0tHZXRUeXBlSUQobWVz c2FnZUJvZHkpID09IFdLRGljdGlvbmFyeUdldFR5cGVJRCgpKTsKLSAgICBpZiAoV2ViS2l0V2Vi UGFnZSogd2ViUGFnZSA9IFdFQktJVF9XRUJfRVhURU5TSU9OKGNsaWVudEluZm8pLT5wcml2LT5w YWdlcy5nZXQodG9JbXBsKHBhZ2UpKSkKLSAgICAgICAgd2Via2l0V2ViUGFnZURpZFJlY2VpdmVN ZXNzYWdlKHdlYlBhZ2UsIHRvSW1wbChuYW1lKS0+c3RyaW5nKCksICp0b0ltcGwoc3RhdGljX2Nh c3Q8V0tEaWN0aW9uYXJ5UmVmPihtZXNzYWdlQm9keSkpKTsKLX0KK2NsYXNzIFdlYkV4dGVuc2lv bkluamVjdGVkQnVuZGxlQ2xpZW50IGZpbmFsIDogcHVibGljIEFQSTo6SW5qZWN0ZWRCdW5kbGU6 OkNsaWVudCB7CitwdWJsaWM6CisgICAgZXhwbGljaXQgV2ViRXh0ZW5zaW9uSW5qZWN0ZWRCdW5k bGVDbGllbnQoV2ViS2l0V2ViRXh0ZW5zaW9uKiBleHRlbnNpb24pCisgICAgICAgIDogbV9leHRl bnNpb24oZXh0ZW5zaW9uKQorICAgIHsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgdm9pZCBkaWRD cmVhdGVQYWdlKEluamVjdGVkQnVuZGxlJiwgV2ViUGFnZSYgcGFnZSkgb3ZlcnJpZGUKKyAgICB7 CisgICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUGFnZT4gd2ViUGFnZSA9IGFkb3B0R1JlZih3ZWJr aXRXZWJQYWdlQ3JlYXRlKCZwYWdlKSk7CisgICAgICAgIG1fZXh0ZW5zaW9uLT5wcml2LT5wYWdl cy5hZGQoJnBhZ2UsIHdlYlBhZ2UpOworICAgICAgICBnX3NpZ25hbF9lbWl0KG1fZXh0ZW5zaW9u LCBzaWduYWxzW1BBR0VfQ1JFQVRFRF0sIDAsIHdlYlBhZ2UuZ2V0KCkpOworICAgIH0KKworICAg IHZvaWQgd2lsbERlc3Ryb3lQYWdlKEluamVjdGVkQnVuZGxlJiwgV2ViUGFnZSYgcGFnZSkgb3Zl cnJpZGUKKyAgICB7CisgICAgICAgIG1fZXh0ZW5zaW9uLT5wcml2LT5wYWdlcy5yZW1vdmUoJnBh Z2UpOworICAgIH0KKworICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSW5qZWN0ZWRCdW5kbGUm LCBjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBBUEk6Ok9iamVjdCogbWVzc2FnZUJvZHkpIG92 ZXJyaWRlCisgICAgeworICAgICAgICBBU1NFUlQobWVzc2FnZUJvZHktPnR5cGUoKSA9PSBBUEk6 Ok9iamVjdDo6VHlwZTo6RGljdGlvbmFyeSk7CisgICAgICAgIEFQSTo6RGljdGlvbmFyeSYgbWVz c2FnZSA9ICpzdGF0aWNfY2FzdDxBUEk6OkRpY3Rpb25hcnkqPihtZXNzYWdlQm9keSk7CisgICAg ICAgIGlmIChtZXNzYWdlTmFtZSA9PSBTdHJpbmc6OmZyb21VVEY4KCJQcmVmZXRjaEROUyIpKSB7 CisgICAgICAgICAgICBBUEk6OlN0cmluZyogaG9zdG5hbWUgPSBzdGF0aWNfY2FzdDxBUEk6OlN0 cmluZyo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIkhvc3RuYW1lIikpKTsKKyAgICAg ICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnByZWZldGNoRE5TKGhvc3RuYW1lLT5zdHJp bmcoKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgfQorCisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZVRvUGFnZShJbmplY3RlZEJ1bmRs ZSYsIFdlYlBhZ2UmIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2JqZWN0 KiBtZXNzYWdlQm9keSkgb3ZlcnJpZGUKKyAgICB7CisgICAgICAgIEFTU0VSVChtZXNzYWdlQm9k eS0+dHlwZSgpID09IEFQSTo6T2JqZWN0OjpUeXBlOjpEaWN0aW9uYXJ5KTsKKyAgICAgICAgaWYg KGF1dG8qIHdlYlBhZ2UgPSBtX2V4dGVuc2lvbi0+cHJpdi0+cGFnZXMuZ2V0KCZwYWdlKSkKKyAg ICAgICAgICAgIHdlYmtpdFdlYlBhZ2VEaWRSZWNlaXZlTWVzc2FnZSh3ZWJQYWdlLCBtZXNzYWdl TmFtZSwgKnN0YXRpY19jYXN0PEFQSTo6RGljdGlvbmFyeSo+KG1lc3NhZ2VCb2R5KSk7CisgICAg fQorCisgICAgV2ViS2l0V2ViRXh0ZW5zaW9uKiBtX2V4dGVuc2lvbjsKK307CiAKIFdlYktpdFdl YkV4dGVuc2lvbiogd2Via2l0V2ViRXh0ZW5zaW9uQ3JlYXRlKEluamVjdGVkQnVuZGxlKiBidW5k bGUpCiB7CiAgICAgV2ViS2l0V2ViRXh0ZW5zaW9uKiBleHRlbnNpb24gPSBXRUJLSVRfV0VCX0VY VEVOU0lPTihnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfV0VCX0VYVEVOU0lPTiwgTlVMTCkpOwot Ci0gICAgV0tCdW5kbGVDbGllbnRWMSB3a0J1bmRsZUNsaWVudCA9IHsKLSAgICAgICAgewotICAg ICAgICAgICAgMSwgLy8gdmVyc2lvbgotICAgICAgICAgICAgZXh0ZW5zaW9uLCAvLyBjbGllbnRJ bmZvCi0gICAgICAgIH0sCi0gICAgICAgIGRpZENyZWF0ZVBhZ2UsCi0gICAgICAgIHdpbGxEZXN0 cm95UGFnZSwKLSAgICAgICAgMCwgLy8gZGlkSW5pdGlhbGl6ZVBhZ2VHcm91cAotICAgICAgICBk aWRSZWNlaXZlTWVzc2FnZSwKLSAgICAgICAgZGlkUmVjZWl2ZU1lc3NhZ2VUb1BhZ2UKLSAgICB9 OwotICAgIFdLQnVuZGxlU2V0Q2xpZW50KHRvQVBJKGJ1bmRsZSksICZ3a0J1bmRsZUNsaWVudC5i YXNlKTsKLQorICAgIGJ1bmRsZS0+c2V0Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8V2ViRXh0ZW5z aW9uSW5qZWN0ZWRCdW5kbGVDbGllbnQ+KGV4dGVuc2lvbikpOwogICAgIHJldHVybiBleHRlbnNp b247CiB9CiAK