Bug 94313 – [GTK] Enable introspection for webkit2

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Jesse van den Kieboom]

Created attachment 159047 [details]
Enable webkit2 introspection

The attached patch enables introspection for webkit2. It's not completely finished since I was not entirely sure how to reference JSCore. Also, I wasn't entirely sure about reusing some of the autotools variables (so I suffixed most with 2).

[Jesse van den Kieboom]

Ping! Would be cool if this could be merged since we are starting to use webkit2 with the new gitg and we depend on this.

[Carlos Garcia Campos]

Comment on attachment 159047 [details]
Enable webkit2 introspection

View in context: https://bugs.webkit.org/attachment.cgi?id=159047&action=review

Thanks for the patch, and sorry for the late review. Patches in WebKit require a ChangeLog entry, and you should set the review flag to ? to ask for a review. See http://www.webkit.org/coding/contributing.html

> Source/WebKit2/GNUmakefile.am:211
> +	     --include=Gtk-@GTK_API_VERSION@ \

WebKit2 depends unconditionally on GTK 3, so we don't need to use the GTK_API_VERSION

[Jesse van den Kieboom]

Created attachment 171488 [details]
Enable webkit2 introspection

Patch with changelog entry

[Martin Robinson]

Comment on attachment 171488 [details]
Enable webkit2 introspection

View in context: https://bugs.webkit.org/attachment.cgi?id=171488&action=review

> Source/WebKit2/GNUmakefile.am:251
> +%.typelib: %.gir $(G_IR_COMPILER)
> +	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@

How does this not conflict with the similar rule for WebKit1?

[Jesse van den Kieboom]

Hmm, I forgot that webkit uses non-recursive make (I guess?). So, I can make specific rules for WebKit2-@WEBKITGTK_API_VERSION@.typelib: WebKit2-@WEBKITGTK_API_VERSION@.gir and maybe then also make the webkit one rule specific?

[Martin Robinson]

(In reply to comment #5)
> Hmm, I forgot that webkit uses non-recursive make (I guess?). So, I can make specific rules for WebKit2-@WEBKITGTK_API_VERSION@.typelib: WebKit2-@WEBKITGTK_API_VERSION@.gir and maybe then also make the webkit one rule specific?

That might be safer. I can't say for sure if there's a problem or not, but it's probably better to be more specific.

[Martin Robinson]

Comment on attachment 171488 [details]
Enable webkit2 introspection

View in context: https://bugs.webkit.org/attachment.cgi?id=171488&action=review

> Source/WebKit2/GNUmakefile.am:208
> +WEBKIT2_GIRSOURCES = WebKit2-@WEBKITGTK_API_VERSION@.gir

Instead of using a variable here, I think it might be clearer, just to use the string everywhere.

[Jesse van den Kieboom]

Created attachment 171637 [details]
Enable webkit2 introspection

Separate webkit and webkit2 typelib generation

[WebKit Review Bot]

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

[Jesse van den Kieboom]

Created attachment 171650 [details]
Enable webkit2 introspection

Sorry, missed your comment there. New patch

[Martin Robinson]

Comment on attachment 171650 [details]
Enable webkit2 introspection

View in context: https://bugs.webkit.org/attachment.cgi?id=171650&action=review

> Source/WebKit/gtk/GNUmakefile.am:332
> +WebKit-@WEBKITGTK_API_VERSION@.typelib: WebKit-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)

I apologize for the back and forth, but doesn't this pose an issue for JSCore-@WEBKITGTK_API_VERSION@.typelib?

[Jesse van den Kieboom]

Created attachment 171680 [details]
Enable webkit2 introspection

Ah yes, of course. Sorry for that. I added back a special rule also for JSCore. Related to that, I didn't really know what to do with JSCore for WebKit2. In any case it doesn't seem like the JSCore gir does any good wrt introspection.

[Martin Robinson]

Comment on attachment 171680 [details]
Enable webkit2 introspection

Thanks!

[WebKit Review Bot]

Comment on attachment 171680 [details]
Enable webkit2 introspection

Clearing flags on attachment: 171680

Committed r133059: <http://trac.webkit.org/changeset/133059>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.