Title: [279279] trunk/Source/WebKit
- Revision
- 279279
- Author
- [email protected]
- Date
- 2021-06-25 07:08:08 -0700 (Fri, 25 Jun 2021)
Log Message
[GLib] Guard Cairo inclusions in shared GLib API implementation files
https://bugs.webkit.org/show_bug.cgi?id=227370
Patch by Zan Dobersek <[email protected]> on 2021-06-25
Reviewed by Philippe Normand.
For cross-port GLib API implementation, different Cairo inclusions are
moved into appropriate build guards tha match the build guards where
Cairo is then used.
* UIProcess/API/glib/WebKitFaviconDatabase.cpp:
* UIProcess/API/glib/WebKitProtocolHandler.cpp:
(WebKit::WebKitProtocolHandler::handleGPU):
* UIProcess/API/glib/WebKitWebView.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279278 => 279279)
--- trunk/Source/WebKit/ChangeLog 2021-06-25 13:58:25 UTC (rev 279278)
+++ trunk/Source/WebKit/ChangeLog 2021-06-25 14:08:08 UTC (rev 279279)
@@ -1,3 +1,19 @@
+2021-06-25 Zan Dobersek <[email protected]>
+
+ [GLib] Guard Cairo inclusions in shared GLib API implementation files
+ https://bugs.webkit.org/show_bug.cgi?id=227370
+
+ Reviewed by Philippe Normand.
+
+ For cross-port GLib API implementation, different Cairo inclusions are
+ moved into appropriate build guards tha match the build guards where
+ Cairo is then used.
+
+ * UIProcess/API/glib/WebKitFaviconDatabase.cpp:
+ * UIProcess/API/glib/WebKitProtocolHandler.cpp:
+ (WebKit::WebKitProtocolHandler::handleGPU):
+ * UIProcess/API/glib/WebKitWebView.cpp:
+
2021-06-24 Antoine Quint <[email protected]>
[Model] Create a sandbox extension for a temporary directory to store model resources
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp (279278 => 279279)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2021-06-25 13:58:25 UTC (rev 279278)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp 2021-06-25 14:08:08 UTC (rev 279279)
@@ -24,7 +24,6 @@
#include "WebKitFaviconDatabasePrivate.h"
#include <WebCore/Image.h>
#include <WebCore/IntSize.h>
-#include <WebCore/RefPtrCairo.h>
#include <WebCore/SharedBuffer.h>
#include <glib/gi18n-lib.h>
#include <wtf/FileSystem.h>
@@ -34,6 +33,10 @@
#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
+#if PLATFORM(GTK)
+#include <WebCore/RefPtrCairo.h>
+#endif
+
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp (279278 => 279279)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2021-06-25 13:58:25 UTC (rev 279278)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2021-06-25 14:08:08 UTC (rev 279279)
@@ -28,7 +28,6 @@
#include <WebCore/IntRect.h>
#include <WebCore/PlatformDisplay.h>
#include <WebCore/PlatformScreen.h>
-#include <cairo.h>
#include <gio/gio.h>
#include <wtf/URL.h>
#include <wtf/glib/GRefPtr.h>
@@ -38,6 +37,10 @@
#include <sys/utsname.h>
#endif
+#if USE(CAIRO)
+#include <cairo.h>
+#endif
+
#if PLATFORM(GTK)
#include <gtk/gtk.h>
@@ -220,6 +223,7 @@
" </tbody></tr>",
g_getenv("XDG_CURRENT_DESKTOP"));
+#if USE(CAIRO)
g_string_append_printf(html,
" <tbody><tr>"
" <td><div class=\"titlename\">Cairo version</div></td>"
@@ -226,6 +230,7 @@
" <td>%s (build) %s (runtime)</td>"
" </tbody></tr>",
CAIRO_VERSION_STRING, cairo_version_string());
+#endif
#if USE(GSTREAMER)
GUniquePtr<char> gstVersion(gst_version_string());
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (279278 => 279279)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2021-06-25 13:58:25 UTC (rev 279278)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2021-06-25 14:08:08 UTC (rev 279279)
@@ -73,8 +73,7 @@
#include <jsc/JSCContextPrivate.h>
#include <WebCore/CertificateInfo.h>
#include <WebCore/JSDOMExceptionHandling.h>
-#include <WebCore/PlatformScreen.h>
-#include <WebCore/RefPtrCairo.h>
+#include <WebCore/URLSoup.h>
#include <glib/gi18n-lib.h>
#include <libsoup/soup.h>
#include <wtf/SetForScope.h>
@@ -91,6 +90,7 @@
#include "WebKitWebInspectorPrivate.h"
#include "WebKitWebViewBasePrivate.h"
#include <WebCore/GUniquePtrGtk.h>
+#include <WebCore/RefPtrCairo.h>
#endif
#if PLATFORM(WPE)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
