Bug 37851 – [GTK] Does not compile with -DGSEAL_ENABLE

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Andre Klapper]

Version: webkit-1.2.0 (not available from dropdown)


WebKit-Gtk does not build with -DGSEAL_ENABLE.
Fixing this is required for GNOME 3. See http://live.gnome.org/GnomeGoals/UseGseal .

Note that maybe this report cannot be fixed yet, as GTK+ still misses some accessor functions (see http://bugzilla.gnome.org/show_bug.cgi?id=588339 , http://bugzilla.gnome.org/show_bug.cgi?id=597610 ) needed for sealing.
Also see http://live.gnome.org/GTK%2B/3.0/PendingSealings for current status.

The jhbuild output posted here of course only lists the very first error when trying to compile.

WebCore/plugins/gtk/gtk2xtbin.c: In function ‘gtk_xtbin_realize’:
WebCore/plugins/gtk/gtk2xtbin.c:293: error: ‘GtkWidget’ has no member named ‘allocation’
WebCore/plugins/gtk/gtk2xtbin.c:294: error: ‘GtkWidget’ has no member named ‘allocation’
WebCore/plugins/gtk/gtk2xtbin.c: In function ‘gtk_xtbin_set_position’:
WebCore/plugins/gtk/gtk2xtbin.c:405: warning: passing argument 1 of ‘gtk_widget_get_realized’ from incompatible pointer type
/home/andre/include/gtk-2.0/gtk/gtkwidget.h:963: note: expected ‘struct GtkWidget *’ but argument is of type ‘struct GtkXtBin *’
WebCore/plugins/gtk/gtk2xtbin.c:406: error: ‘GtkWidget’ has no member named ‘window’
WebCore/plugins/gtk/gtk2xtbin.c: In function ‘gtk_xtbin_unrealize’:
WebCore/plugins/gtk/gtk2xtbin.c:459: error: ‘GtkObject’ has no member named ‘flags’
WebCore/plugins/gtk/gtk2xtbin.c: In function ‘xt_add_focus_listener’:
WebCore/plugins/gtk/gtk2xtbin.c:886: warning: unused variable ‘errorcode’
WebCore/plugins/gtk/gtk2xtbin.c: In function ‘xt_remove_focus_listener’:
WebCore/plugins/gtk/gtk2xtbin.c:906: warning: unused variable ‘errorcode’
make[1]: *** [WebCore/plugins/gtk/libwebkit_1_0_la-gtk2xtbin.lo] Error 1
make[1]: Leaving directory `/home/andre/webkit-1.2.0'
make: *** [all] Error 2
*** Error during phase build of WebKit: ########## Error running make   *** [1/1]

[Andre Klapper]

Created attachment 53958 [details]
Partial patch

Needs way more work in gtk2drawing.c.
Note that fixing this ticket is required for usage with GTK+ 3.0.

[WebKit Review Bot]

Attachment 53958 [details] did not pass style-queue:

Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1
Last 3072 characters of output:
lugins/gtk/PluginViewGtk.cpp:668:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/PluginViewGtk.cpp:796:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/PluginViewGtk.cpp:797:  Declaration has space between type name and * in GdkWindow *window  [whitespace/declaration] [3]
WebCore/plugins/gtk/PluginViewGtk.cpp:829:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/PluginViewGtk.cpp:830:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/PluginViewGtk.cpp:856:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/PluginViewGtk.cpp:857:  Extra space before ( in function call  [whitespace/parens] [4]
WARNING: File exempt from style guide. Skipping: "WebCore/platform/gtk/gtk2drawing.c"
WebCore/platform/gtk/ScrollbarGtk.cpp:122:  Missing space after ,  [whitespace/comma] [3]
WebCore/platform/gtk/ScrollbarGtk.cpp:173:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/gtk2xtbin.c:273:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/gtk2xtbin.c:274:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:274:  widget_allocation is incorrectly named. Don't use underscores in your identifier names.  [readability/naming] [4]
WebCore/plugins/gtk/gtk2xtbin.c:296:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/gtk2xtbin.c:297:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:297:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:298:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:299:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:414:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/gtk2xtbin.c:415:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:417:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:419:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/gtk2xtbin.c:420:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:476:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:476:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:477:  Missing space after ,  [whitespace/comma] [3]
WebCore/plugins/gtk/gtk2xtbin.c:480:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:480:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 50 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Andre Klapper]

Created attachment 54143 [details]
Partial patch

[WebKit Review Bot]

Attachment 54143 [details] did not pass style-queue:

Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1
WebCore/platform/gtk/PasteboardGtk.cpp:63:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/platform/gtk/PasteboardGtk.cpp:180:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/platform/gtk/WidgetGtk.cpp:88:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/platform/gtk/GtkPluginWidget.cpp:51:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/platform/gtk/ScrollViewGtk.cpp:180:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/PluginViewGtk.cpp:218:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/PluginViewGtk.cpp:356:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/PluginViewGtk.cpp:830:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/PluginViewGtk.cpp:857:  Extra space before ( in function call  [whitespace/parens] [4]
WARNING: File exempt from style guide. Skipping: "WebCore/platform/gtk/gtk2drawing.c"
WebCore/plugins/gtk/gtk2xtbin.c:274:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:274:  widget_allocation is incorrectly named. Don't use underscores in your identifier names.  [readability/naming] [4]
WebCore/plugins/gtk/gtk2xtbin.c:297:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:297:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:298:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:299:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:415:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:417:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:420:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:476:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:476:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:480:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:480:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 22 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Andre Klapper]

Created attachment 54144 [details]
Partial patch

[WebKit Review Bot]

Attachment 54144 [details] did not pass style-queue:

Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1
WebCore/platform/gtk/WidgetGtk.cpp:88:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/platform/gtk/ScrollViewGtk.cpp:180:  Extra space before ( in function call  [whitespace/parens] [4]
WARNING: File exempt from style guide. Skipping: "WebCore/platform/gtk/gtk2drawing.c"
WebCore/plugins/gtk/gtk2xtbin.c:274:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:297:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:298:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:299:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:415:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:417:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:420:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:476:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:480:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:480:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 12 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Holger Freyther]

Comment on attachment 54144 [details]
Partial patch

Sorry for waiting so letting you wait so long. We want to avoid the #if GTK_CHECK_VERSION, what we do  is to add a macro in WebCore/platform/gtk/GtkVersioning.h and this way can use the new API on old systems. It would be nice if you could adjust your patch.

[Andre Klapper]

(In reply to comment #7)
> Sorry for waiting so letting you wait so long.

No problem at all.

> We want to avoid the #if
> GTK_CHECK_VERSION, what we do  is to add a macro in
> WebCore/platform/gtk/GtkVersioning.h and this way can use the new API on old
> systems. It would be nice if you could adjust your patch.

Quite busy currently here, sorry.
If somebody wants to go ahead, just do it. :)

[Xan Lopez]

Created attachment 58689 [details]
gseal.diff

Gave a shot at this today, seems to work fine.

[Gustavo Noronha (kov)]

Comment on attachment 58689 [details]
gseal.diff

Looks good to me, with the following comments:

WebKit/gtk/tests/testdomnode.c:164
 +      g_assert(webkit_dom_node_has_child_nodes(WEBKIT_DOM_NODE(body)) == FALSE);
oops =)

WebKit/gtk/webkit/webkitwebview.cpp:834
 +      gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
Might be worth saving the call to get here by using a variable? Micro-optimization, but it doesn't get less readable.

WebKit/gtk/webkit/webkitwebview.cpp:845
 +      gtk_im_context_set_client_window(priv->imContext, gtk_widget_get_window(widget));
One more call saved! yay hehe

[Xan Lopez]

Created attachment 58800 [details]
gseal.diff

Uploading the new patch to check that it builds in EWS.

[WebKit Review Bot]

Attachment 58800 [details] did not pass style-queue:

Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1
WebCore/plugins/gtk/gtk2xtbin.c:275:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:275:  widget_allocation is incorrectly named. Don't use underscores in your identifier names.  [readability/naming] [4]
WebCore/plugins/gtk/gtk2xtbin.c:298:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:299:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:300:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:416:  Extra space before ( in function call  [whitespace/parens] [4]
WebCore/plugins/gtk/gtk2xtbin.c:469:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 7 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Xan Lopez]

Comment on attachment 58689 [details]
gseal.diff

Pushed as r61206 with the requested changes.

[Xan Lopez]

Closing.

[Andre Klapper]

Thanks! By any chance, is a tarball release planned for the next days?

[Xan Lopez]

(In reply to comment #15)
> Thanks! By any chance, is a tarball release planned for the next days?

My plan is to make it parallel installable with GTK+3 and do a release before 2.31.4. As all plans, it could fail ;)

[Xan Lopez]

Created attachment 59855 [details]
gseal2.diff

OK, turns out there was a bunch of stuff missing to fix here...

Unfortunately there are a few things we do in gtk2drawing.c which cannot be done in a sealed GTK+, so I've just left them out when compiling with GTK+3.x for now.

[Xan Lopez]

Reopening.

[Gustavo Noronha (kov)]

Comment on attachment 59855 [details]
gseal2.diff

Clear Main Comment Box:8
 +          Add automake flage to signal whether we are building with GTK+ 2.x
s/flage/flag/

OK! Thankfully adding a gtk_widget_{set,get}_has_focus should be simple!

[Xan Lopez]

Comment on attachment 59855 [details]
gseal2.diff

Landed as r62002.

[Xan Lopez]

All patches landed, closing.