Bug 70990 – [EFL] Fix building with Glib support disabled

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit EFL

[Ivan Briano]

[EFL] Fix building with Glib support disabled

[Ivan Briano]

Created attachment 112637 [details]
Patch

[WebKit Review Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1

Source/WebCore/platform/cairo/WidgetBackingStore.h:28:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 2 files


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

[Ivan Briano]

Created attachment 112684 [details]
Patch

[Ivan Briano]

Comment on attachment 112684 [details]
Patch

I'm not sure this is the right way to fix this, but since platforms others than Gtk may want to use cairo, and the usage of cairo_surface_t is not under conditionals, it seems coherent to just have the right header included as well.

[Martin Robinson]

Comment on attachment 112684 [details]
Patch

Why not add the typedefs here or create a similar typedefs file for yourself. We worked pretty hard to keep system headers out of WebCore/JSC headers.

[Raphael Kubo da Costa (:rakuco)]

(In reply to comment #5)
> (From update of attachment 112684 [details])
> Why not add the typedefs here or create a similar typedefs file for yourself. 

Just adding a typedef there should be fine IMHO.

> We worked pretty hard to keep system headers out of WebCore/JSC headers.

Hmm. Does it mean the same should be done to other headers (platform/graphics/CairoUtilities.h), for example?

[Martin Robinson]

(In reply to comment #6)

> Hmm. Does it mean the same should be done to other headers (platform/graphics/CairoUtilities.h), for example?

Yes, if possible and within reason. :)

[Eric Seidel (no email)]

Comment on attachment 112684 [details]
Patch

Do we forward-declare these instead of including cairo.h?

[Ivan Briano]

Oh my, I had completely forgotten about this.
I'll make a new patch this week.

[Ivan Briano]

Created attachment 120344 [details]
Patch

New patch. Leaving the declaration unconditional to match its usage below.

[Martin Robinson]

Comment on attachment 120344 [details]
Patch

I would have preferred this go within the PLATFORM(EFL) block, but this is fine.

[Ivan Briano]

Even when the type is used without any #ifdef later? I will keep that in mind if so.
Thanks.

[WebKit Review Bot]

Comment on attachment 120344 [details]
Patch

Clearing flags on attachment: 120344

Committed r103614: <http://trac.webkit.org/changeset/103614>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.