126002 2013-12-19 11:42:17 -0800 [GTK] Some unit tests using web extensions fail when run alone 2013-12-20 04:08:35 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 126006 1 cgarcia webkit-unassigned commit-queue gustavo mrobinson oldest_to_newest 961469 0 cgarcia 2013-12-19 11:42:17 -0800 For example /webkit2/WebKitWebExtension/document-loaded-signal. The problem is that the page is created before the dbus connection has been established, and we are connecting to web-page-created signal once we have a valid dbus connection. We should connect to the signal before connecting to dbus and queue any request to emit a dbus signal until the connection is set. This also fixes the WebExtensions tests when using the network process because a new web process is launched for every test case. 961478 1 219668 cgarcia 2013-12-19 11:48:24 -0800 Created attachment 219668 Patch 961480 2 commit-queue 2013-12-19 11:49:41 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 961816 3 219668 gustavo 2013-12-20 03:40:08 -0800 Comment on attachment 219668 Patch Quite clean. You could drop the type from the constructor and infer it based on which constructor gets selected (no URL => document loaded, URL => uri changed), but I think I prefer the explicit one, it's more future proof too. 961819 4 cgarcia 2013-12-20 04:01:21 -0800 (In reply to comment #3) > (From update of attachment 219668 [details]) > Quite clean. You could drop the type from the constructor and infer it based on which constructor gets selected (no URL => document loaded, URL => uri changed), but I think I prefer the explicit one, it's more future proof too. Thanks for the review. 961825 5 cgarcia 2013-12-20 04:08:35 -0800 Committed r160904: <http://trac.webkit.org/changeset/160904> 219668 2013-12-19 11:48:24 -0800 2013-12-20 03:40:08 -0800 Patch wk2-extensions-test.diff text/plain 7338 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2NzU5NGFiLi5lMjk4NTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcg QEAKIDIwMTMtMTItMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFNvbWUgdW5pdCB0ZXN0cyB1c2luZyB3ZWIgZXh0ZW5zaW9ucyBm YWlsIHdoZW4gcnVuIGFsb25lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjYwMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGUgcHJvYmxlbSBpcyB0aGF0IHRoZSBwYWdlIGlzIGNyZWF0ZWQgYmVmb3Jl IHRoZSBkYnVzIGNvbm5lY3Rpb24KKyAgICAgICAgaGFzIGJlZW4gZXN0YWJsaXNoZWQsIGFuZCB3 ZSBhcmUgY29ubmVjdGluZyB0byB3ZWItcGFnZS1jcmVhdGVkCisgICAgICAgIHNpZ25hbCBvbmNl IHdlIGhhdmUgYSB2YWxpZCBkYnVzIGNvbm5lY3Rpb24uIFdlIHNob3VsZCBjb25uZWN0IHRvCisg ICAgICAgIHRoZSBzaWduYWwgYmVmb3JlIGNvbm5lY3RpbmcgdG8gZGJ1cyBhbmQgcXVldWUgYW55 IHJlcXVlc3QgdG8gZW1pdAorICAgICAgICBhIGRidXMgc2lnbmFsIHVudGlsIHRoZSBjb25uZWN0 aW9uIGlzIHNldC4gVGhpcyBhbHNvIGZpeGVzIHRoZQorICAgICAgICBXZWJFeHRlbnNpb25zIHRl c3RzIHdoZW4gdXNpbmcgdGhlIG5ldHdvcmsgcHJvY2VzcyBiZWNhdXNlIGEgbmV3CisgICAgICAg IHdlYiBwcm9jZXNzIGlzIGxhdW5jaGVkIGZvciBldmVyeSB0ZXN0IGNhc2UuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJFeHRlbnNpb25UZXN0LmNwcDoKKyAgICAgICAg KERlbGF5ZWRTaWduYWw6OkRlbGF5ZWRTaWduYWwpOiBIZWxwZXIgc3RydWN0IHRvIHF1ZXVlIHNp Z25hbAorICAgICAgICBlbWlzc2lvbnMgcmVxdWVzdGVkIGJlZm9yZSB0aGUgZGJ1cyBjb25uZWN0 aW9uIGhhcyBiZWVuCisgICAgICAgIGVzdGFibGlzaGVkLgorICAgICAgICAoZW1pdERvY3VtZW50 TG9hZGVkKTogRW1pdCB0aGUgZGJ1cyBEb2N1bWVudExvYWRlZCBzaWduYWwuCisgICAgICAgIChk b2N1bWVudExvYWRlZENhbGxiYWNrKTogUXVldWUgdGhlIHNpZ25hbCBlbWlzc2lvbiBpZiB3ZSBz dGlsbAorICAgICAgICBkb24ndCBoYXZlIGEgY29ubmVjdGlvbiBvciBjYWxsIGVtaXREb2N1bWVu dExvYWRlZCBvdGhlcndpc2UuCisgICAgICAgIChlbWl0VVJJQ2hhbmdlZCk6IEVtaXQgdGhlIGRi dXMgVVJJQ2hhbmdlZCBzaWduYWwuCisgICAgICAgICh1cmlDaGFuZ2VkQ2FsbGJhY2spOiBRdWV1 ZSB0aGUgc2lnbmFsIGVtaXNzaW9uIGlmIHdlIHN0aWxsIGRvbid0CisgICAgICAgIGhhdmUgYSBj b25uZWN0aW9uIG9yIGNhbGwgZW1pdFVSSUNoYW5nZWQgb3RoZXJ3aXNlLgorICAgICAgICAocGFn ZUNyZWF0ZWRDYWxsYmFjayk6IFBhc3MgdGhlIHdlYiBleHRlbnNpb24gYXMgdXNlciBkYXRhIHRv CisgICAgICAgIGRvY3VtZW50LWxvYWRlZCBhbmQgdXJpLWNoYW5nZWQgY2FsbGJhY2tzLgorICAg ICAgICAoYnVzQWNxdWlyZWRDYWxsYmFjayk6IFNldCB0aGUgY29ubmVjdGlvbiBhcyB1c2VyIGRh dGEgb2YgdGhlIHdlYgorICAgICAgICBleHRlbnNpb24gYW5kIHByb2Nlc3MgYW55IGRlbGF5ZWQg c2lnbmFsIGVtaXNzaW9uIHBlbmRpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX2V4dGVuc2lvbl9p bml0aWFsaXplKTogQ29ubmVjdCB0byB3ZWItcGFnZS1jcmVhdGUKKyAgICAgICAgc2lnbmFsIGJl Zm9yZSBjb25uZWN0aW5nIHRvIGRidXMuCisKKzIwMTMtMTItMTkgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIEJ1aWxkZml4IGZvciBOZXR3b3Jr UmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlV2lsbFNlbmRSZXF1ZXN0KCkgb24gIVBMQVRGT1JNKE1B QykgcGxhdGZvcm1zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjE0MzAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvV2ViRXh0ZW5zaW9uVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9XZWJFeHRlbnNpb25UZXN0LmNwcAppbmRleCBhY2ZmYjRmLi4wMjEyZTJi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJF eHRlbnNpb25UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9XZWJFeHRlbnNpb25UZXN0LmNwcApAQCAtMjUsOCArMjUsMTIgQEAKICNpbmNsdWRlIDxz dGRsaWIuaD4KICNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx3ZWJraXQyL3dlYmtpdC13 ZWItZXh0ZW5zaW9uLmg+CisjaW5jbHVkZSA8d3RmL0RlcXVlLmg+CisjaW5jbHVkZSA8d3RmL093 blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmpl Y3QvR093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dSZWZQdHIuaD4KKyNpbmNsdWRl IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIHN0YXRpYyBjb25zdCBjaGFyIGludHJvc3BlY3Rpb25Y TUxbXSA9CiAgICAgIjxub2RlPiIKQEAgLTQ4LDkgKzUyLDMzIEBAIHN0YXRpYyBjb25zdCBjaGFy IGludHJvc3BlY3Rpb25YTUxbXSA9CiAgICAgIiA8L2ludGVyZmFjZT4iCiAgICAgIjwvbm9kZT4i OwogCi1zdGF0aWMgdm9pZCBkb2N1bWVudExvYWRlZENhbGxiYWNrKFdlYktpdFdlYlBhZ2UqLCBn cG9pbnRlciB1c2VyRGF0YSkKK3R5cGVkZWYgZW51bSB7CisgICAgRG9jdW1lbnRMb2FkZWRTaWdu YWwsCisgICAgVVJJQ2hhbmdlZFNpZ25hbCwKK30gRGVsYXllZFNpZ25hbFR5cGU7CisKK3N0cnVj dCBEZWxheWVkU2lnbmFsIHsKKyAgICBEZWxheWVkU2lnbmFsKERlbGF5ZWRTaWduYWxUeXBlIHR5 cGUpCisgICAgICAgIDogdHlwZSh0eXBlKQorICAgIHsKKyAgICB9CisKKyAgICBEZWxheWVkU2ln bmFsKERlbGF5ZWRTaWduYWxUeXBlIHR5cGUsIGNvbnN0IGNoYXIqIHVyaSkKKyAgICAgICAgOiB0 eXBlKHR5cGUpCisgICAgICAgICwgdXJpKHVyaSkKKyAgICB7CisgICAgfQorCisgICAgRGVsYXll ZFNpZ25hbFR5cGUgdHlwZTsKKyAgICBDU3RyaW5nIHVyaTsKK307CisKK0RlcXVlPE93blB0cjxE ZWxheWVkU2lnbmFsPj4gZGVsYXllZFNpZ25hbHNRdWV1ZTsKKworc3RhdGljIHZvaWQgZW1pdERv Y3VtZW50TG9hZGVkKEdEQnVzQ29ubmVjdGlvbiogY29ubmVjdGlvbikKIHsKLSAgICBib29sIG9r ID0gZ19kYnVzX2Nvbm5lY3Rpb25fZW1pdF9zaWduYWwoR19EQlVTX0NPTk5FQ1RJT04odXNlckRh dGEpLAorICAgIGJvb2wgb2sgPSBnX2RidXNfY29ubmVjdGlvbl9lbWl0X3NpZ25hbCgKKyAgICAg ICAgY29ubmVjdGlvbiwKICAgICAgICAgMCwKICAgICAgICAgIi9vcmcvd2Via2l0L2d0ay9XZWJF eHRlbnNpb25UZXN0IiwKICAgICAgICAgIm9yZy53ZWJraXQuZ3RrLldlYkV4dGVuc2lvblRlc3Qi LApAQCAtNjAsMTkgKzg4LDM3IEBAIHN0YXRpYyB2b2lkIGRvY3VtZW50TG9hZGVkQ2FsbGJhY2so V2ViS2l0V2ViUGFnZSosIGdwb2ludGVyIHVzZXJEYXRhKQogICAgIGdfYXNzZXJ0KG9rKTsKIH0K IAotc3RhdGljIHZvaWQgdXJpQ2hhbmdlZENhbGxiYWNrKFdlYktpdFdlYlBhZ2UqIHdlYlBhZ2Us IEdQYXJhbVNwZWMqIHBzcGVjLCBncG9pbnRlciB1c2VyRGF0YSkKK3N0YXRpYyB2b2lkIGRvY3Vt ZW50TG9hZGVkQ2FsbGJhY2soV2ViS2l0V2ViUGFnZSosIFdlYktpdFdlYkV4dGVuc2lvbiogZXh0 ZW5zaW9uKQoreworICAgIGdwb2ludGVyIGRhdGEgPSBnX29iamVjdF9nZXRfZGF0YShHX09CSkVD VChleHRlbnNpb24pLCAiZGJ1cy1jb25uZWN0aW9uIik7CisgICAgaWYgKGRhdGEpCisgICAgICAg IGVtaXREb2N1bWVudExvYWRlZChHX0RCVVNfQ09OTkVDVElPTihkYXRhKSk7CisgICAgZWxzZQor ICAgICAgICBkZWxheWVkU2lnbmFsc1F1ZXVlLmFwcGVuZChhZG9wdFB0cihuZXcgRGVsYXllZFNp Z25hbChEb2N1bWVudExvYWRlZFNpZ25hbCkpKTsKK30KKworc3RhdGljIHZvaWQgZW1pdFVSSUNo YW5nZWQoR0RCdXNDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBjb25zdCBjaGFyKiB1cmkpCiB7CiAg ICAgYm9vbCBvayA9IGdfZGJ1c19jb25uZWN0aW9uX2VtaXRfc2lnbmFsKAotICAgICAgICBHX0RC VVNfQ09OTkVDVElPTih1c2VyRGF0YSksCisgICAgICAgIGNvbm5lY3Rpb24sCiAgICAgICAgIDAs CiAgICAgICAgICIvb3JnL3dlYmtpdC9ndGsvV2ViRXh0ZW5zaW9uVGVzdCIsCiAgICAgICAgICJv cmcud2Via2l0Lmd0ay5XZWJFeHRlbnNpb25UZXN0IiwKICAgICAgICAgIlVSSUNoYW5nZWQiLAot ICAgICAgICBnX3ZhcmlhbnRfbmV3KCIocykiLCB3ZWJraXRfd2ViX3BhZ2VfZ2V0X3VyaSh3ZWJQ YWdlKSksCisgICAgICAgIGdfdmFyaWFudF9uZXcoIihzKSIsIHVyaSksCiAgICAgICAgIDApOwog ICAgIGdfYXNzZXJ0KG9rKTsKIH0KIAorc3RhdGljIHZvaWQgdXJpQ2hhbmdlZENhbGxiYWNrKFdl YktpdFdlYlBhZ2UqIHdlYlBhZ2UsIEdQYXJhbVNwZWMqIHBzcGVjLCBXZWJLaXRXZWJFeHRlbnNp b24qIGV4dGVuc2lvbikKK3sKKyAgICBncG9pbnRlciBkYXRhID0gZ19vYmplY3RfZ2V0X2RhdGEo R19PQkpFQ1QoZXh0ZW5zaW9uKSwgImRidXMtY29ubmVjdGlvbiIpOworICAgIGlmIChkYXRhKQor ICAgICAgICBlbWl0VVJJQ2hhbmdlZChHX0RCVVNfQ09OTkVDVElPTihkYXRhKSwgd2Via2l0X3dl Yl9wYWdlX2dldF91cmkod2ViUGFnZSkpOworICAgIGVsc2UKKyAgICAgICAgZGVsYXllZFNpZ25h bHNRdWV1ZS5hcHBlbmQoYWRvcHRQdHIobmV3IERlbGF5ZWRTaWduYWwoVVJJQ2hhbmdlZFNpZ25h bCwgd2Via2l0X3dlYl9wYWdlX2dldF91cmkod2ViUGFnZSkpKSk7Cit9CisKIHN0YXRpYyBnYm9v bGVhbiBzZW5kUmVxdWVzdENhbGxiYWNrKFdlYktpdFdlYlBhZ2UqLCBXZWJLaXRVUklSZXF1ZXN0 KiByZXF1ZXN0LCBXZWJLaXRVUklSZXNwb25zZSosIGdwb2ludGVyKQogewogICAgIGNvbnN0IGNo YXIqIHJlcXVlc3RVUkkgPSB3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KTsKQEAg LTkyLDEwICsxMzgsMTAgQEAgc3RhdGljIGdib29sZWFuIHNlbmRSZXF1ZXN0Q2FsbGJhY2soV2Vi S2l0V2ViUGFnZSosIFdlYktpdFVSSVJlcXVlc3QqIHJlcXVlc3QsIFcKICAgICByZXR1cm4gRkFM U0U7CiB9CiAKLXN0YXRpYyB2b2lkIHBhZ2VDcmVhdGVkQ2FsbGJhY2soV2ViS2l0V2ViRXh0ZW5z aW9uKiwgV2ViS2l0V2ViUGFnZSogd2ViUGFnZSwgZ3BvaW50ZXIgdXNlckRhdGEpCitzdGF0aWMg dm9pZCBwYWdlQ3JlYXRlZENhbGxiYWNrKFdlYktpdFdlYkV4dGVuc2lvbiogZXh0ZW5zaW9uLCBX ZWJLaXRXZWJQYWdlKiB3ZWJQYWdlLCBncG9pbnRlcikKIHsKLSAgICBnX3NpZ25hbF9jb25uZWN0 KHdlYlBhZ2UsICJkb2N1bWVudC1sb2FkZWQiLCBHX0NBTExCQUNLKGRvY3VtZW50TG9hZGVkQ2Fs bGJhY2spLCB1c2VyRGF0YSk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCh3ZWJQYWdlLCAibm90aWZ5 Ojp1cmkiLCBHX0NBTExCQUNLKHVyaUNoYW5nZWRDYWxsYmFjayksIHVzZXJEYXRhKTsKKyAgICBn X3NpZ25hbF9jb25uZWN0KHdlYlBhZ2UsICJkb2N1bWVudC1sb2FkZWQiLCBHX0NBTExCQUNLKGRv Y3VtZW50TG9hZGVkQ2FsbGJhY2spLCBleHRlbnNpb24pOworICAgIGdfc2lnbmFsX2Nvbm5lY3Qo d2ViUGFnZSwgIm5vdGlmeTo6dXJpIiwgR19DQUxMQkFDSyh1cmlDaGFuZ2VkQ2FsbGJhY2spLCBl eHRlbnNpb24pOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViUGFnZSwgInNlbmQtcmVxdWVzdCIs IEdfQ0FMTEJBQ0soc2VuZFJlcXVlc3RDYWxsYmFjayksIDApOwogfQogCkBAIC0xOTEsMTIgKzIz NywyNSBAQCBzdGF0aWMgdm9pZCBidXNBY3F1aXJlZENhbGxiYWNrKEdEQnVzQ29ubmVjdGlvbiog Y29ubmVjdGlvbiwgY29uc3QgY2hhciogbmFtZSwgZwogICAgIGlmICghcmVnaXN0cmF0aW9uSUQp CiAgICAgICAgIGdfd2FybmluZygiRmFpbGVkIHRvIHJlZ2lzdGVyIG9iamVjdDogJXNcbiIsIGVy cm9yLT5tZXNzYWdlKTsKIAotICAgIGdfc2lnbmFsX2Nvbm5lY3QoV0VCS0lUX1dFQl9FWFRFTlNJ T04odXNlckRhdGEpLCAicGFnZS1jcmVhdGVkIiwgR19DQUxMQkFDSyhwYWdlQ3JlYXRlZENhbGxi YWNrKSwgY29ubmVjdGlvbik7Ci0gICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfc2NyaXB0X3dv cmxkX2dldF9kZWZhdWx0KCksICJ3aW5kb3ctb2JqZWN0LWNsZWFyZWQiLCBHX0NBTExCQUNLKHdp bmRvd09iamVjdENsZWFyZWQpLCAwKTsKKyAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVDVCh1 c2VyRGF0YSksICJkYnVzLWNvbm5lY3Rpb24iLCBjb25uZWN0aW9uKTsKKyAgICB3aGlsZSAoZGVs YXllZFNpZ25hbHNRdWV1ZS5zaXplKCkpIHsKKyAgICAgICAgT3duUHRyPERlbGF5ZWRTaWduYWw+ IGRlbGF5ZWRTaWduYWwgPSBkZWxheWVkU2lnbmFsc1F1ZXVlLnRha2VGaXJzdCgpOworICAgICAg ICBzd2l0Y2ggKGRlbGF5ZWRTaWduYWwtPnR5cGUpIHsKKyAgICAgICAgY2FzZSBEb2N1bWVudExv YWRlZFNpZ25hbDoKKyAgICAgICAgICAgIGVtaXREb2N1bWVudExvYWRlZChjb25uZWN0aW9uKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFVSSUNoYW5nZWRTaWduYWw6CisgICAg ICAgICAgICBlbWl0VVJJQ2hhbmdlZChjb25uZWN0aW9uLCBkZWxheWVkU2lnbmFsLT51cmkuZGF0 YSgpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQogfQogCiBleHRlcm4g IkMiIHZvaWQgd2Via2l0X3dlYl9leHRlbnNpb25faW5pdGlhbGl6ZShXZWJLaXRXZWJFeHRlbnNp b24qIGV4dGVuc2lvbikKIHsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGV4dGVuc2lvbiwgInBhZ2Ut Y3JlYXRlZCIsIEdfQ0FMTEJBQ0socGFnZUNyZWF0ZWRDYWxsYmFjayksIGV4dGVuc2lvbik7Cisg ICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfc2NyaXB0X3dvcmxkX2dldF9kZWZhdWx0KCksICJ3 aW5kb3ctb2JqZWN0LWNsZWFyZWQiLCBHX0NBTExCQUNLKHdpbmRvd09iamVjdENsZWFyZWQpLCAw KTsKKwogICAgIGdfYnVzX293bl9uYW1lKAogICAgICAgICBHX0JVU19UWVBFX1NFU1NJT04sCiAg ICAgICAgICJvcmcud2Via2l0Lmd0ay5XZWJFeHRlbnNpb25UZXN0IiwK