Changeset 223138 in webkit

Timestamp:

Oct 10, 2017 12:41:05 PM (7 years ago)

Author:

Michael Catanzaro

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

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitFaviconDatabase.cpp (modified) (1 diff)
• UIProcess/API/glib/WebKitWebView.cpp (modified) (1 diff)
• UIProcess/API/wpe/WebKitFaviconDatabase.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-10  Michael Catanzaro  <mcatanzaro@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  <aperez@igalia.com>
 

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

@@ -28 +28 @@
 #include <WebCore/IntSize.h>
 #include <WebCore/RefPtrCairo.h>
-#include <cairo.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/RunLoop.h>

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

@@ -86 +86 @@
 #endif
 
-#include <cairo.h>
-
 #if USE(LIBNOTIFY)
 #include <libnotify/notify.h>

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

@@ -25 +25 @@
 #define WebKitFaviconDatabase_h
 
+#include <cairo.h>
 #include <gio/gio.h>
 #include <glib-object.h>
@@ -30 +31 @@
 
 G_BEGIN_DECLS
-
-typedef struct _cairo_surface cairo_surface_t;
 
 #define WEBKIT_TYPE_FAVICON_DATABASE            (webkit_favicon_database_get_type())