Title: [223136] trunk/Source/WebKit
- Revision
- 223136
- Author
- ape...@igalia.com
- Date
- 2017-10-10 12:09:51 -0700 (Tue, 10 Oct 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223135 => 223136)
--- trunk/Source/WebKit/ChangeLog 2017-10-10 18:42:34 UTC (rev 223135)
+++ trunk/Source/WebKit/ChangeLog 2017-10-10 19:09:51 UTC (rev 223136)
@@ -1,5 +1,19 @@
2017-10-10 Adrian Perez de Castro <ape...@igalia.com>
+ [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.
+
+2017-10-10 Adrian Perez de Castro <ape...@igalia.com>
+
[WPE] Cannot link against libWPEWebkit due to wrong contents of wpe-webkit.pc
https://bugs.webkit.org/show_bug.cgi?id=178133
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp (223135 => 223136)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2017-10-10 18:42:34 UTC (rev 223135)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2017-10-10 19:09:51 UTC (rev 223136)
@@ -27,6 +27,7 @@
#include <WebCore/Image.h>
#include <WebCore/IntSize.h>
#include <WebCore/RefPtrCairo.h>
+#include <cairo.h>
#include <glib/gi18n-lib.h>
#include <wtf/RunLoop.h>
#include <wtf/SetForScope.h>
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (223135 => 223136)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2017-10-10 18:42:34 UTC (rev 223135)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2017-10-10 19:09:51 UTC (rev 223136)
@@ -85,6 +85,8 @@
#include "WPEView.h"
#endif
+#include <cairo.h>
+
#if USE(LIBNOTIFY)
#include <libnotify/notify.h>
#endif
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h (223135 => 223136)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h 2017-10-10 18:42:34 UTC (rev 223135)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h 2017-10-10 19:09:51 UTC (rev 223136)
@@ -24,7 +24,6 @@
#ifndef WebKitFaviconDatabase_h
#define WebKitFaviconDatabase_h
-#include <cairo.h>
#include <gio/gio.h>
#include <glib-object.h>
#include <wpe/WebKitDefines.h>
@@ -31,6 +30,8 @@
G_BEGIN_DECLS
+typedef struct _cairo_surface cairo_surface_t;
+
#define WEBKIT_TYPE_FAVICON_DATABASE (webkit_favicon_database_get_type())
#define WEBKIT_FAVICON_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_FAVICON_DATABASE, WebKitFaviconDatabase))
#define WEBKIT_IS_FAVICON_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_FAVICON_DATABASE))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
