Title: [223138] trunk/Source/WebKit
- Revision
- 223138
- Author
- mcatanz...@igalia.com
- Date
- 2017-10-10 12:41:05 -0700 (Tue, 10 Oct 2017)
Log Message
Unreviewed, rolling out r223136.
Forgot to update GTK API header
Reverted changeset:
"[WPE] Header cairo.h is used in GLib API headers but cannot
be found"
https://bugs.webkit.org/show_bug.cgi?id=178100
http://trac.webkit.org/changeset/223136
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223137 => 223138)
--- trunk/Source/WebKit/ChangeLog 2017-10-10 19:24:03 UTC (rev 223137)
+++ trunk/Source/WebKit/ChangeLog 2017-10-10 19:41:05 UTC (rev 223138)
@@ -1,3 +1,16 @@
+2017-10-10 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, rolling out r223136.
+
+ Forgot to update GTK API header
+
+ Reverted changeset:
+
+ "[WPE] Header cairo.h is used in GLib API headers but cannot
+ be found"
+ https://bugs.webkit.org/show_bug.cgi?id=178100
+ http://trac.webkit.org/changeset/223136
+
2017-10-10 Adrian Perez de Castro <ape...@igalia.com>
[WPE] Header cairo.h is used in GLib API headers but cannot be found
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp (223137 => 223138)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2017-10-10 19:24:03 UTC (rev 223137)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2017-10-10 19:41:05 UTC (rev 223138)
@@ -27,7 +27,6 @@
#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 (223137 => 223138)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2017-10-10 19:24:03 UTC (rev 223137)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2017-10-10 19:41:05 UTC (rev 223138)
@@ -85,8 +85,6 @@
#include "WPEView.h"
#endif
-#include <cairo.h>
-
#if USE(LIBNOTIFY)
#include <libnotify/notify.h>
#endif
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h (223137 => 223138)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h 2017-10-10 19:24:03 UTC (rev 223137)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h 2017-10-10 19:41:05 UTC (rev 223138)
@@ -24,6 +24,7 @@
#ifndef WebKitFaviconDatabase_h
#define WebKitFaviconDatabase_h
+#include <cairo.h>
#include <gio/gio.h>
#include <glib-object.h>
#include <wpe/WebKitDefines.h>
@@ -30,8 +31,6 @@
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
