Bug 94313 - [GTK] Enable introspection for webkit2
: [GTK] Enable introspection for webkit2
Status: RESOLVED FIXED
: WebKit
WebKit Gtk
: 528+ (Nightly build)
: Unspecified Unspecified
: P2 Normal
Assigned To:
:
:
:
:
  Show dependency treegraph
 
Reported: 2012-08-17 01:53 PST by
Modified: 2012-10-31 12:29 PST (History)


Attachments
Enable webkit2 introspection (5.05 KB, patch)
2012-08-17 01:53 PST, Jesse van den Kieboom
cgarcia: review-
Review Patch | Details | Formatted Diff | Diff
Enable webkit2 introspection (6.03 KB, patch)
2012-10-30 11:22 PST, Jesse van den Kieboom
no flags Review Patch | Details | Formatted Diff | Diff
Enable webkit2 introspection (6.83 KB, patch)
2012-10-31 06:33 PST, Jesse van den Kieboom
no flags Review Patch | Details | Formatted Diff | Diff
Enable webkit2 introspection (6.84 KB, patch)
2012-10-31 07:15 PST, Jesse van den Kieboom
no flags Review Patch | Details | Formatted Diff | Diff
Enable webkit2 introspection (7.02 KB, patch)
2012-10-31 10:16 PST, Jesse van den Kieboom
no flags Review Patch | Details | Formatted Diff | Diff


Note

You need to log in before you can comment on or make changes to this bug.


Description From 2012-08-17 01:53:17 PST
Created an attachment (id=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).
------- Comment #1 From 2012-10-30 02:29:04 PST -------
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.
------- Comment #2 From 2012-10-30 02:36:00 PST -------
(From update of attachment 159047 [details])
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
------- Comment #3 From 2012-10-30 11:22:54 PST -------
Created an attachment (id=171488) [details]
Enable webkit2 introspection

Patch with changelog entry
------- Comment #4 From 2012-10-30 11:29:20 PST -------
(From update of attachment 171488 [details])
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?
------- Comment #5 From 2012-10-30 12:02:48 PST -------
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?
------- Comment #6 From 2012-10-30 12:05:18 PST -------
(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.
------- Comment #7 From 2012-10-30 12:05:43 PST -------
(From update of attachment 171488 [details])
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.
------- Comment #8 From 2012-10-31 06:33:54 PST -------
Created an attachment (id=171637) [details]
Enable webkit2 introspection

Separate webkit and webkit2 typelib generation
------- Comment #9 From 2012-10-31 07:08:08 PST -------
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
------- Comment #10 From 2012-10-31 07:15:54 PST -------
Created an attachment (id=171650) [details]
Enable webkit2 introspection

Sorry, missed your comment there. New patch
------- Comment #11 From 2012-10-31 09:34:13 PST -------
(From update of attachment 171650 [details])
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?
------- Comment #12 From 2012-10-31 10:16:07 PST -------
Created an attachment (id=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.
------- Comment #13 From 2012-10-31 10:47:12 PST -------
(From update of attachment 171680 [details])
Thanks!
------- Comment #14 From 2012-10-31 12:29:39 PST -------
(From update of attachment 171680 [details])
Clearing flags on attachment: 171680

Committed r133059: <http://trac.webkit.org/changeset/133059>
------- Comment #15 From 2012-10-31 12:29:43 PST -------
All reviewed patches have been landed.  Closing bug.