Summary: | [GTK] Does not build with latest GTK+ development release | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Gustavo Noronha (kov) <gustavo> | ||||||||
Component: | WebKitGTK | Assignee: | Nobody <webkit-unassigned> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | gustavo, webkit.review.bot, xan.lopez, zecke | ||||||||
Priority: | P2 | Keywords: | Gtk | ||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | PC | ||||||||||
OS: | OS X 10.5 | ||||||||||
Attachments: |
|
Description
Gustavo Noronha (kov)
2010-03-19 16:37:06 PDT
Created attachment 51206 [details]
fix building with newest GTK+
Since deprecation is a growing trend in GTK+, for the 3.0 release, I thought we needed a more centralized, and nice solution, instead of adding churn everywhere. This is my proposed solution.
Attachment 51206 [details] did not pass style-queue:
Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
WebCore/plugins/gtk/gtk2xtbin.c:45: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4]
WebCore/plugins/gtk/gtk2xtbin.c:405: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:460: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:460: Extra space before ( in function call [whitespace/parens] [4]
Total errors found: 4 in 12 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Attachment 51206 [details] did not build on gtk: Build output: http://webkit-commit-queue.appspot.com/results/1051019 Created attachment 51310 [details]
proposed fix
This one actually builds with earlier GTK+ versions, and fixes the logical bug with using gtk_widget_has_window() pointed out by Holger.
*** Bug 36404 has been marked as a duplicate of this bug. *** Attachment 51310 [details] did not pass style-queue:
Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
WebCore/plugins/gtk/gtk2xtbin.c:45: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4]
WebCore/plugins/gtk/gtk2xtbin.c:405: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:460: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:460: Extra space before ( in function call [whitespace/parens] [4]
Total errors found: 4 in 11 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Attachment 51310 [details] did not build on gtk: Build output: http://webkit-commit-queue.appspot.com/results/1051108 Created attachment 51381 [details]
proposed fix
I suck. Forgot to add the file in my new tree.
Attachment 51381 [details] did not pass style-queue:
Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
WebCore/plugins/gtk/gtk2xtbin.c:45: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4]
WebCore/plugins/gtk/gtk2xtbin.c:405: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:460: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
WebCore/plugins/gtk/gtk2xtbin.c:460: Extra space before ( in function call [whitespace/parens] [4]
Total errors found: 4 in 12 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 51381 [details] proposed fix Mostly fine, we will just ignore the style warning as we want to keep the mozilla code mergable. > - /* only paint widgets with NO_WINDOW this way */ > - if (!GTK_WIDGET_NO_WINDOW(platformWidget())) > + /* only paint widgets with no window this way */ > + if (!!gtk_widget_get_has_window(platformWidget())) > return; You can just remove the '!'?! (In reply to comment #10) > (From update of attachment 51381 [details]) > Mostly fine, we will just ignore the style warning as we want to keep the > mozilla code mergable. > > > > - /* only paint widgets with NO_WINDOW this way */ > > - if (!GTK_WIDGET_NO_WINDOW(platformWidget())) > > + /* only paint widgets with no window this way */ > > + if (!!gtk_widget_get_has_window(platformWidget())) > > return; > > You can just remove the '!'?! Search and replace fail =D Comment on attachment 51381 [details] proposed fix Landed as r56387. |