Bug 87842 – [WK2-Gtk]Compilation errors with flag CONTEXT_MENUS=0

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[chandra shekar vallala]

Disable CONTEXT_MENUS flag.
Build webkit2.

[chandra shekar vallala]

Created attachment 144779 [details]
fix

patch to fix compilation errors

[Martin Robinson]

Comment on attachment 144779 [details]
fix

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

Looks good, but I don't think you're a committer, so r- for some minor issues.

> Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp:30
> +
> +#if ENABLE(CONTEXT_MENUS)
> +
>  #include "WebContextMenuProxyGtk.h"

See below.

> Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp:30
>  #include "config.h"
> +
> +#if ENABLE(CONTEXT_MENUS)
> +

WebContextMenuClient.h already seems to be guarded by ENABLE(CONTEXT_MENUS) so you can move the #ifdef down before the second block.

[chandra shekar vallala]

Created attachment 145217 [details]
updated.patch

updated patch

[Martin Robinson]

Comment on attachment 145217 [details]
updated.patch

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

> Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp:28
>  #include "config.h"
> +
>  #include "WebContextMenuProxyGtk.h"

Okay, this a serious nit pick, but we don't typically put a newline here. If you were a committer, I'd just have you fix it and land yourself. I don't believe you are though, so do you mind uploading a new patch? Really appreciate it!

[chandra shekar vallala]

Created attachment 145575 [details]
updtaed

addressed review comments.

[Martin Robinson]

Comment on attachment 145575 [details]
updtaed

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

> Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp:30
> +
> +#if ENABLE(CONTEXT_MENUS)
> +

My sincere apologies. I just noticed that WebContextMenuClient.h also guards the header with #if ENABLE(CONTEXT_MENUS), so this can down before the second block of headers as well.

[chandra shekar vallala]

Created attachment 145996 [details]
updated

done.

[WebKit Review Bot]

Comment on attachment 145996 [details]
updated

Clearing flags on attachment: 145996

Committed r119592: <http://trac.webkit.org/changeset/119592>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.