Changeset 223136 in webkit


Ignore:
Timestamp:
Oct 10, 2017 12:09:51 PM (7 years ago)
Author:
Adrian Perez de Castro
Message:

[WPE] Header cairo.h is used in GLib API headers but cannot be found
​https://bugs.webkit.org/show_bug.cgi?id=178100

Reviewed by Žan Doberšek.

Instead of including <cairo.h>, it is better to forward-declare cairo_surface_t,
which is the one and only Cairo declaration needed by the WPE API header.

  • UIProcess/API/glib/WebKitFaviconDatabase.cpp: Add inclusion of <cairo.h>.
  • UIProcess/API/glib/WebKitWebView.cpp: Add inclusion of <cairo.h>.
  • UIProcess/API/wpe/WebKitFaviconDatabase.h: Add forward declaration of cairo_surface_t.
Location:
trunk/Source/WebKit
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r223133 r223136  
     12017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE] Header cairo.h is used in GLib API headers but cannot be found
     4        https://bugs.webkit.org/show_bug.cgi?id=178100
     5
     6        Reviewed by Žan Doberšek.
     7
     8        Instead of including <cairo.h>, it is better to forward-declare cairo_surface_t,
     9        which is the one and only Cairo declaration needed by the WPE API header.
     10
     11        * UIProcess/API/glib/WebKitFaviconDatabase.cpp: Add inclusion of <cairo.h>.
     12        * UIProcess/API/glib/WebKitWebView.cpp: Add inclusion of <cairo.h>.
     13        * UIProcess/API/wpe/WebKitFaviconDatabase.h: Add forward declaration of cairo_surface_t.
     14
    1152017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
    216

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp

    r220694 r223136  
    2828#include <WebCore/IntSize.h>
    2929#include <WebCore/RefPtrCairo.h>
     30#include <cairo.h>
    3031#include <glib/gi18n-lib.h>
    3132#include <wtf/RunLoop.h>

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

    r222583 r223136  
    8686#endif
    8787
     88#include <cairo.h>
     89
    8890#if USE(LIBNOTIFY)
    8991#include <libnotify/notify.h>

  • trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h

    r218553 r223136  
    2525#define WebKitFaviconDatabase_h
    2626
    27 #include <cairo.h>
    2827#include <gio/gio.h>
    2928#include <glib-object.h>
    … …  
    3130
    3231G_BEGIN_DECLS
     32
     33typedef struct _cairo_surface cairo_surface_t;
    3334
    3435#define WEBKIT_TYPE_FAVICON_DATABASE            (webkit_favicon_database_get_type())
Note: See TracChangeset for help on using the changeset viewer.