129549 2014-03-01 10:54:40 -0800 [GTK] Make impossible to build with <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> included together 2014-03-02 06:54:20 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto commit-queue gustavo mrobinson oldest_to_newest 985946 0 cgarcia 2014-03-01 10:54:40 -0800 Add a compile error to prevent mixing the UI and web process APIs. 985947 1 225556 cgarcia 2014-03-01 10:56:09 -0800 Created attachment 225556 Patch 985948 2 commit-queue 2014-03-01 10:58:06 -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 986071 3 cgarcia 2014-03-02 06:54:20 -0800 Committed r164940: <http://trac.webkit.org/changeset/164940> 225556 2014-03-01 10:56:09 -0800 2014-03-01 21:04:05 -0800 Patch wk2-mixing-apis.diff text/plain 2102 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMDdmMThhLi5hNDViYzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTQtMDMtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIE1ha2UgaW1wb3NzaWJsZSB0byBidWlsZCB3aXRoIDx3ZWJraXQy L3dlYmtpdDIuaD4gYW5kIDx3ZWJraXQyL3dlYmtpdC13ZWItZXh0ZW5zaW9uLmg+IGluY2x1ZGVk IHRvZ2V0aGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjk1NDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBjb21waWxlIGVycm9yIHRvIHByZXZlbnQgbWl4aW5nIHRoZSBVSSBhbmQgd2ViIHBy b2Nlc3MgQVBJcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3dlYmtpdDIuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvd2Via2l0LXdlYi1leHRl bnNpb24uaDoKKworMjAxNC0wMy0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKICAgICAgICAgW0dUS10gV2ViS2l0MldlYkV4dGVuc2lvbiBHSVIgY2FuJ3Qg YmUgdXNlZCBpbiB2YWxhCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjcxNzkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvd2Via2l0Mi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvd2Via2l0 Mi5oCmluZGV4IDhkODIxOTkuLmMxODUzOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL3dlYmtpdDIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay93ZWJraXQyLmgKQEAgLTE4LDggKzE4LDEyIEBACiAgKiBCb3N0b24sIE1BIDAyMTEw LTEzMDEsIFVTQS4KICAqLwogCi0jaWZuZGVmIF9fV0VCS0lUMl9IX18KLSNkZWZpbmUgX19XRUJL SVQyX0hfXworI2lmZGVmIF9fV0VCS0lUX1dFQl9FWFRFTlNJT05fSF9fCisjZXJyb3IgIkhlYWRl cnMgPHdlYmtpdDIvd2Via2l0Mi5oPiBhbmQgPHdlYmtpdDIvd2Via2l0LXdlYi1leHRlbnNpb24u aD4gY2Fubm90IGJlIGluY2x1ZGVkIHRvZ2V0aGVyLiIKKyNlbmRpZgorCisjaWZuZGVmIF9fV0VC S0lUXzJfSF9fCisjZGVmaW5lIF9fV0VCS0lUXzJfSF9fCiAKICNkZWZpbmUgX19XRUJLSVQyX0hf SU5TSURFX18KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvZ3RrL3dlYmtpdC13ZWItZXh0ZW5zaW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvd2Via2l0LXdlYi1leHRlbnNpb24uaApp bmRleCBjZjIyZTA5Li4zY2U0NjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvd2Via2l0LXdlYi1leHRlbnNpb24uaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvd2Via2l0LXdl Yi1leHRlbnNpb24uaApAQCAtMTcsOCArMTcsMTIgQEAKICAqIEJvc3RvbiwgTUEgMDIxMTAtMTMw MSwgVVNBLgogICovCiAKLSNpZm5kZWYgX19XZWJLaXRXZWJFeHRlbnNpb25faAotI2RlZmluZSBf X1dlYktpdFdlYkV4dGVuc2lvbl9oCisjaWZkZWYgX19XRUJLSVRfMl9IX18KKyNlcnJvciAiSGVh ZGVycyA8d2Via2l0Mi93ZWJraXQyLmg+IGFuZCA8d2Via2l0Mi93ZWJraXQtd2ViLWV4dGVuc2lv bi5oPiBjYW5ub3QgYmUgaW5jbHVkZWQgdG9nZXRoZXIuIgorI2VuZGlmCisKKyNpZm5kZWYgX19X RUJLSVRfV0VCX0VYVEVOU0lPTl9IX18KKyNkZWZpbmUgX19XRUJLSVRfV0VCX0VYVEVOU0lPTl9I X18KIAogI2RlZmluZSBfX1dFQktJVF9XRUJfRVhURU5TSU9OX0hfSU5TSURFX18KIAo=