Attachment 323521 Details for Bug 178205 – Patch

[patch] Patch

bug-178205-20171012144443.patch (text/plain), 4.89 KB, created by Adrian Perez on 2017-10-12 04:44:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2017-10-12 04:44:44 PDT

Size: 4.89 KB

patch

obsolete

>Subversion Revision: 223234
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c8d5e418cb2aafe5af479597bfcb28d2dda739f1..eed425084d86d9c164ab50c526d9ad7e6202feed 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2017-10-12  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [WPE] Remove GLib API functions which use Cairo
>+        https://bugs.webkit.org/show_bug.cgi?id=178205
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Instead of actually removing the definitions from the headers, they get guarded with
>+        BUILDING_WPE__. This way the affected API is not directly useable when building
>+        programs that use WPE, and the WebKit code which uses them (like WebKitWebView using
>+        WebKitFaviconDatabase, or the unit tests) will still build correctly.
>+
>+        * UIProcess/API/wpe/WebKitFaviconDatabase.h: Guard webkit_favicon_database_get_favicon()
>+        and webkit_favicon_database_get_favicon_finish()
>+        * UIProcess/API/wpe/WebKitWebView.h: Guard webkit_web_view_get_favicon(),
>+        webkit_web_view_get_snapshot(), webkit_web_view_get_snapshot_finish(),
>+        WebKitSnapshotOptions, and WebKitSnapshotRegion.
>+
> 2017-10-11  Jaehun Lim  <ljaehun.lim@samsung.com>
> 
>         Fix debug build
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h b/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h
>index bed40181d8b3ff5cd34fa6972869fec1e76d2872..06daf7e4288b5d5bba3416887f3ce5d777f23310 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKitFaviconDatabase.h
>@@ -24,7 +24,10 @@
> #ifndef WebKitFaviconDatabase_h
> #define WebKitFaviconDatabase_h
> 
>+#if defined(BUILDING_WPE__) && BUILDING_WPE__
> #include <cairo.h>
>+#endif
>+
> #include <gio/gio.h>
> #include <glib-object.h>
> #include <wpe/WebKitDefines.h>
>@@ -78,6 +81,7 @@ webkit_favicon_database_error_quark        (void);
> WEBKIT_API GType
> webkit_favicon_database_get_type           (void);
> 
>+#if defined(BUILDING_WPE__) && BUILDING_WPE__
> WEBKIT_API void
> webkit_favicon_database_get_favicon        (WebKitFaviconDatabase *database,
>                                             const gchar           *page_uri,
>@@ -88,6 +92,8 @@ WEBKIT_API cairo_surface_t *
> webkit_favicon_database_get_favicon_finish (WebKitFaviconDatabase *database,
>                                             GAsyncResult          *result,
>                                             GError               **error);
>+#endif
>+
> WEBKIT_API gchar *
> webkit_favicon_database_get_favicon_uri    (WebKitFaviconDatabase *database,
>                                             const gchar           *page_uri);
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h
>index 403ac00d22c6026bf194ea808a1c3f02138733b2..35b56243c3137720d5e9e6062c372f0758eb1775 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h
>@@ -152,6 +152,7 @@ typedef enum {
>     WEBKIT_INSECURE_CONTENT_DISPLAYED
> } WebKitInsecureContentEvent;
> 
>+#if defined(BUILDING_WPE__) && BUILDING_WPE__
> /**
>  * WebKitSnapshotOptions:
>  * @WEBKIT_SNAPSHOT_OPTIONS_NONE: Do not include any special options.
>@@ -182,6 +183,7 @@ typedef enum {
>   WEBKIT_SNAPSHOT_REGION_VISIBLE = 0,
>   WEBKIT_SNAPSHOT_REGION_FULL_DOCUMENT,
> } WebKitSnapshotRegion;
>+#endif
> 
> struct _WebKitWebView {
>     GObject parent;
>@@ -361,8 +363,10 @@ webkit_web_view_go_to_back_forward_list_item         (WebKitWebView
> WEBKIT_API const gchar *
> webkit_web_view_get_uri                              (WebKitWebView             *web_view);
> 
>+#if defined(BUILDING_WPE__) && BUILDING_WPE__
> WEBKIT_API cairo_surface_t *
> webkit_web_view_get_favicon                          (WebKitWebView             *web_view);
>+#endif
> 
> WEBKIT_API const gchar *
> webkit_web_view_get_custom_charset                   (WebKitWebView             *web_view);
>@@ -477,6 +481,7 @@ WEBKIT_API gboolean
> webkit_web_view_get_tls_info                         (WebKitWebView             *web_view,
>                                                       GTlsCertificate          **certificate,
>                                                       GTlsCertificateFlags      *errors);
>+#if defined(BUILDING_WPE__) && BUILDING_WPE__
> WEBKIT_API void
> webkit_web_view_get_snapshot                         (WebKitWebView             *web_view,
>                                                       WebKitSnapshotRegion       region,
>@@ -489,6 +494,7 @@ WEBKIT_API cairo_surface_t *
> webkit_web_view_get_snapshot_finish                  (WebKitWebView             *web_view,
>                                                       GAsyncResult              *result,
>                                                       GError                   **error);
>+#endif
> 
> WEBKIT_API WebKitUserContentManager *
> webkit_web_view_get_user_content_manager             (WebKitWebView             *web_view);

Actions: View | Formatted Diff | Diff

Attachments on bug 178205: 323518 | 323521 | 323937 | 324680