Diff
Modified: trunk/Source/WebKit/ChangeLog (263027 => 263028)
--- trunk/Source/WebKit/ChangeLog 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/ChangeLog 2020-06-15 09:27:11 UTC (rev 263028)
@@ -1,3 +1,37 @@
+2020-06-15 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Add API to expose UIClient::requestStorageAccessConfirm
+ https://bugs.webkit.org/show_bug.cgi?id=210422
+
+ Reviewed by Michael Catanzaro.
+
+ Add WebKitWebsiteDataAccessPermissionRequest to ask for permission to the user using the existing permission
+ request API.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * SourcesGTK.txt:
+ * SourcesWPE.txt:
+ * UIProcess/API/glib/WebKitUIClient.cpp:
+ * UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequest.cpp: Added.
+ (webkitWebsiteDataAccessPermissionRequestAllow):
+ (webkitWebsiteDataAccessPermissionRequestDeny):
+ (webkit_permission_request_interface_init):
+ (webkitWebsiteDataAccessPermissionRequestDispose):
+ (webkit_website_data_access_permission_request_class_init):
+ (webkitWebsiteDataAccessPermissionRequestCreate):
+ (webkit_website_data_access_permission_request_get_requesting_domain):
+ (webkit_website_data_access_permission_request_get_current_domain):
+ * UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequestPrivate.h: Added.
+ * UIProcess/API/gtk/WebKitWebsiteDataAccessPermissionRequest.h: Added.
+ * UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:
+ * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml:
+ * UIProcess/API/gtk/webkit2.h:
+ * UIProcess/API/wpe/WebKitWebsiteDataAccessPermissionRequest.h: Added.
+ * UIProcess/API/wpe/docs/wpe-1.0-sections.txt:
+ * UIProcess/API/wpe/docs/wpe-docs.sgml:
+ * UIProcess/API/wpe/webkit.h:
+
2020-06-14 Sam Weinig <[email protected]>
[WPT] html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-pluginarray.html fails due to lack of caching of Plugin objects
Modified: trunk/Source/WebKit/PlatformGTK.cmake (263027 => 263028)
--- trunk/Source/WebKit/PlatformGTK.cmake 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2020-06-15 09:27:11 UTC (rev 263028)
@@ -138,6 +138,7 @@
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebView.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewSessionState.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteData.h
+ ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteDataAccessPermissionRequest.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebsiteDataManager.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h
Modified: trunk/Source/WebKit/PlatformWPE.cmake (263027 => 263028)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-06-15 09:27:11 UTC (rev 263028)
@@ -150,6 +150,7 @@
${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebViewBackend.h
${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebViewSessionState.h
${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteData.h
+ ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteDataAccessPermissionRequest.h
${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWebsiteDataManager.h
${WEBKIT_DIR}/UIProcess/API/wpe/WebKitWindowProperties.h
${WEBKIT_DIR}/UIProcess/API/wpe/webkit.h
Modified: trunk/Source/WebKit/SourcesGTK.txt (263027 => 263028)
--- trunk/Source/WebKit/SourcesGTK.txt 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/SourcesGTK.txt 2020-06-15 09:27:11 UTC (rev 263028)
@@ -190,6 +190,7 @@
UIProcess/API/glib/WebKitWebViewAccessible.cpp @no-unify
UIProcess/API/glib/WebKitWebViewSessionState.cpp @no-unify
UIProcess/API/glib/WebKitWebsiteData.cpp @no-unify
+UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequest.cpp @no-unify
UIProcess/API/glib/WebKitWebsiteDataManager.cpp @no-unify
UIProcess/API/glib/WebKitWindowProperties.cpp @no-unify
Modified: trunk/Source/WebKit/SourcesWPE.txt (263027 => 263028)
--- trunk/Source/WebKit/SourcesWPE.txt 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/SourcesWPE.txt 2020-06-15 09:27:11 UTC (rev 263028)
@@ -178,6 +178,7 @@
UIProcess/API/glib/WebKitWebViewAccessible.cpp @no-unify
UIProcess/API/glib/WebKitWebViewSessionState.cpp @no-unify
UIProcess/API/glib/WebKitWebsiteData.cpp @no-unify
+UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequest.cpp @no-unify
UIProcess/API/glib/WebKitWebsiteDataManager.cpp @no-unify
UIProcess/API/glib/WebKitWindowProperties.cpp @no-unify
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp 2020-06-15 09:27:11 UTC (rev 263028)
@@ -31,6 +31,7 @@
#include "WebKitURIRequestPrivate.h"
#include "WebKitUserMediaPermissionRequestPrivate.h"
#include "WebKitWebViewPrivate.h"
+#include "WebKitWebsiteDataAccessPermissionRequestPrivate.h"
#include "WebKitWindowPropertiesPrivate.h"
#include "WebPageProxy.h"
#include "WebProcessProxy.h"
@@ -300,6 +301,12 @@
webkitWebViewMakePermissionRequest(m_webView, WEBKIT_PERMISSION_REQUEST(notificationPermissionRequest.get()));
}
+ void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler<void(bool)>&& completionHandler) final
+ {
+ GRefPtr<WebKitWebsiteDataAccessPermissionRequest> websiteDataAccessPermissionRequest = adoptGRef(webkitWebsiteDataAccessPermissionRequestCreate(requestingDomain, currentDomain, WTFMove(completionHandler)));
+ webkitWebViewMakePermissionRequest(m_webView, WEBKIT_PERMISSION_REQUEST(websiteDataAccessPermissionRequest.get()));
+ }
+
#if PLATFORM(GTK)
bool takeFocus(WebPageProxy* page, WKFocusDirection direction) final
{
Added: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequest.cpp (0 => 263028)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequest.cpp (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequest.cpp 2020-06-15 09:27:11 UTC (rev 263028)
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2020 Igalia S.L
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "WebKitWebsiteDataAccessPermissionRequest.h"
+
+#include "WebKitPermissionRequest.h"
+#include "WebKitWebsiteDataAccessPermissionRequestPrivate.h"
+#include <wtf/CompletionHandler.h>
+#include <wtf/glib/WTFGType.h>
+
+/**
+ * SECTION: WebKitWebsiteDataAccessPermissionRequest
+ * @Short_description: A permission request for accessing website data from third-party domains
+ * @Title: WebKitWebsiteDataAccessPermissionRequest
+ * @See_also: #WebKitPermissionRequest, #WebKitWebView
+ *
+ * WebKitWebsiteDataAccessPermissionRequest represents a request for
+ * permission to allow a third-party domain access its cookies.
+ *
+ * When a WebKitWebsiteDataAccessPermissionRequest is not handled by the user,
+ * it is denied by default.
+ *
+ * Since: 2.30
+ */
+
+static void webkit_permission_request_interface_init(WebKitPermissionRequestIface*);
+
+struct _WebKitWebsiteDataAccessPermissionRequestPrivate {
+ CString requestingDomain;
+ CString currentDomain;
+ CompletionHandler<void(bool)> completionHandler;
+};
+
+WEBKIT_DEFINE_TYPE_WITH_CODE(
+ WebKitWebsiteDataAccessPermissionRequest, webkit_website_data_access_permission_request, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_PERMISSION_REQUEST, webkit_permission_request_interface_init))
+
+static void webkitWebsiteDataAccessPermissionRequestAllow(WebKitPermissionRequest* request)
+{
+ ASSERT(WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request));
+
+ auto* priv = WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request)->priv;
+ if (priv->completionHandler)
+ priv->completionHandler(true);
+}
+
+static void webkitWebsiteDataAccessPermissionRequestDeny(WebKitPermissionRequest* request)
+{
+ ASSERT(WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request));
+
+ auto* priv = WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request)->priv;
+ if (priv->completionHandler)
+ priv->completionHandler(false);
+}
+
+static void webkit_permission_request_interface_init(WebKitPermissionRequestIface* iface)
+{
+ iface->allow = webkitWebsiteDataAccessPermissionRequestAllow;
+ iface->deny = webkitWebsiteDataAccessPermissionRequestDeny;
+}
+
+static void webkitWebsiteDataAccessPermissionRequestDispose(GObject* object)
+{
+ // Default behaviour when no decision has been made is denying the request.
+ webkitWebsiteDataAccessPermissionRequestDeny(WEBKIT_PERMISSION_REQUEST(object));
+ G_OBJECT_CLASS(webkit_website_data_access_permission_request_parent_class)->dispose(object);
+}
+
+static void webkit_website_data_access_permission_request_class_init(WebKitWebsiteDataAccessPermissionRequestClass* klass)
+{
+ GObjectClass* objectClass = G_OBJECT_CLASS(klass);
+ objectClass->dispose = webkitWebsiteDataAccessPermissionRequestDispose;
+}
+
+WebKitWebsiteDataAccessPermissionRequest* webkitWebsiteDataAccessPermissionRequestCreate(const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler<void(bool)>&& completionHandler)
+{
+ auto* websiteDataPermissionRequest = WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(g_object_new(WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, nullptr));
+ websiteDataPermissionRequest->priv->requestingDomain = requestingDomain.string().utf8();
+ websiteDataPermissionRequest->priv->currentDomain = currentDomain.string().utf8();
+ websiteDataPermissionRequest->priv->completionHandler = WTFMove(completionHandler);
+ return websiteDataPermissionRequest;
+}
+
+/**
+ * webkit_website_data_access_permission_request_get_requesting_domain:
+ * @request: a #WebKitWebsiteDataAccessPermissionRequest
+ *
+ * Get the domain requesting permission to access its cookies while browsing the current domain.
+ *
+ * Returns: the requesting domain name
+ *
+ * Since: 2.30
+ */
+const char* webkit_website_data_access_permission_request_get_requesting_domain(WebKitWebsiteDataAccessPermissionRequest* request)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request), nullptr);
+
+ return request->priv->requestingDomain.data();
+}
+
+/**
+ * webkit_website_data_access_permission_request_get_current_domain:
+ * @request: a #WebKitWebsiteDataAccessPermissionRequest
+ *
+ * Get the current domain being browsed.
+ *
+ * Returns: the current domain name
+ *
+ * Since: 2.30
+ */
+const char* webkit_website_data_access_permission_request_get_current_domain(WebKitWebsiteDataAccessPermissionRequest* request)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request), nullptr);
+
+ return request->priv->currentDomain.data();
+}
Added: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequestPrivate.h (0 => 263028)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequestPrivate.h (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataAccessPermissionRequestPrivate.h 2020-06-15 09:27:11 UTC (rev 263028)
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2020 Igalia S.L
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+#include "WebKitWebsiteDataAccessPermissionRequest.h"
+#include <WebCore/RegistrableDomain.h>
+
+WebKitWebsiteDataAccessPermissionRequest* webkitWebsiteDataAccessPermissionRequestCreate(const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler<void(bool)>&&);
Added: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataAccessPermissionRequest.h (0 => 263028)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataAccessPermissionRequest.h (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataAccessPermissionRequest.h 2020-06-15 09:27:11 UTC (rev 263028)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 Igalia S.L
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
+#ifndef WebKitWebsiteDataAccessPermissionRequest_h
+#define WebKitWebsiteDataAccessPermissionRequest_h
+
+#include <glib-object.h>
+#include <webkit2/WebKitDefines.h>
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST (webkit_website_data_access_permission_request_get_type())
+#define WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, WebKitWebsiteDataAccessPermissionRequest))
+#define WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST))
+#define WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, WebKitWebsiteDataAccessPermissionRequestClass))
+#define WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST))
+#define WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, WebKitWebsiteDataAccessPermissionRequestClass))
+
+typedef struct _WebKitWebsiteDataAccessPermissionRequest WebKitWebsiteDataAccessPermissionRequest;
+typedef struct _WebKitWebsiteDataAccessPermissionRequestClass WebKitWebsiteDataAccessPermissionRequestClass;
+typedef struct _WebKitWebsiteDataAccessPermissionRequestPrivate WebKitWebsiteDataAccessPermissionRequestPrivate;
+
+struct _WebKitWebsiteDataAccessPermissionRequest {
+ GObject parent;
+
+ /*< private >*/
+ WebKitWebsiteDataAccessPermissionRequestPrivate *priv;
+};
+
+struct _WebKitWebsiteDataAccessPermissionRequestClass {
+ GObjectClass parent_class;
+
+ void (*_webkit_reserved0) (void);
+ void (*_webkit_reserved1) (void);
+ void (*_webkit_reserved2) (void);
+ void (*_webkit_reserved3) (void);
+};
+
+WEBKIT_API GType
+webkit_website_data_access_permission_request_get_type (void);
+
+WEBKIT_API const char *
+webkit_website_data_access_permission_request_get_requesting_domain (WebKitWebsiteDataAccessPermissionRequest *request);
+
+WEBKIT_API const char *
+webkit_website_data_access_permission_request_get_current_domain (WebKitWebsiteDataAccessPermissionRequest *request);
+
+G_END_DECLS
+
+#endif
Modified: trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2020-06-15 09:27:11 UTC (rev 263028)
@@ -842,6 +842,26 @@
</SECTION>
<SECTION>
+<FILE>WebKitWebsiteDataAccessPermissionRequest</FILE>
+WebKitWebsiteDataAccessPermissionRequest
+webkit_website_data_access_permission_request_get_requesting_domain
+webkit_website_data_access_permission_request_get_current_domain
+
+<SUBSECTION Standard>
+WebKitWebsiteDataAccessPermissionRequestClass
+WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST
+WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST
+WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST
+WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS
+WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS
+WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_GET_CLASS
+
+<SUBSECTION Private>
+WebKitWebsiteDataAccessPermissionRequestPrivate
+webkit_website_data_access_permission_request_get_type
+</SECTION>
+
+<SECTION>
<FILE>WebKitPolicyDecision</FILE>
WebKitPolicyDecision
webkit_policy_decision_download
Modified: trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml 2020-06-15 09:27:11 UTC (rev 263028)
@@ -66,6 +66,7 @@
<xi:include href=""
<xi:include href=""
<xi:include href=""
+ <xi:include href=""
</chapter>
<chapter>
Modified: trunk/Source/WebKit/UIProcess/API/gtk/webkit2.h (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/gtk/webkit2.h 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/gtk/webkit2.h 2020-06-15 09:27:11 UTC (rev 263028)
@@ -90,6 +90,7 @@
#include <webkit2/WebKitWebViewBase.h>
#include <webkit2/WebKitWebViewSessionState.h>
#include <webkit2/WebKitWebsiteData.h>
+#include <webkit2/WebKitWebsiteDataAccessPermissionRequest.h>
#include <webkit2/WebKitWebsiteDataManager.h>
#include <webkit2/WebKitWindowProperties.h>
Added: trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataAccessPermissionRequest.h (0 => 263028)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataAccessPermissionRequest.h (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataAccessPermissionRequest.h 2020-06-15 09:27:11 UTC (rev 263028)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 Igalia S.L
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#if !defined(__WEBKIT_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <wpe/webkit.h> can be included directly."
+#endif
+
+#ifndef WebKitWebsiteDataAccessPermissionRequest_h
+#define WebKitWebsiteDataAccessPermissionRequest_h
+
+#include <glib-object.h>
+#include <wpe/WebKitDefines.h>
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST (webkit_website_data_access_permission_request_get_type())
+#define WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, WebKitWebsiteDataAccessPermissionRequest))
+#define WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST))
+#define WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, WebKitWebsiteDataAccessPermissionRequestClass))
+#define WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST))
+#define WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST, WebKitWebsiteDataAccessPermissionRequestClass))
+
+typedef struct _WebKitWebsiteDataAccessPermissionRequest WebKitWebsiteDataAccessPermissionRequest;
+typedef struct _WebKitWebsiteDataAccessPermissionRequestClass WebKitWebsiteDataAccessPermissionRequestClass;
+typedef struct _WebKitWebsiteDataAccessPermissionRequestPrivate WebKitWebsiteDataAccessPermissionRequestPrivate;
+
+struct _WebKitWebsiteDataAccessPermissionRequest {
+ GObject parent;
+
+ /*< private >*/
+ WebKitWebsiteDataAccessPermissionRequestPrivate *priv;
+};
+
+struct _WebKitWebsiteDataAccessPermissionRequestClass {
+ GObjectClass parent_class;
+
+ void (*_webkit_reserved0) (void);
+ void (*_webkit_reserved1) (void);
+ void (*_webkit_reserved2) (void);
+ void (*_webkit_reserved3) (void);
+};
+
+WEBKIT_API GType
+webkit_website_data_access_permission_request_get_type (void);
+
+WEBKIT_API const char *
+webkit_website_data_access_permission_request_get_requesting_domain (WebKitWebsiteDataAccessPermissionRequest *request);
+
+WEBKIT_API const char *
+webkit_website_data_access_permission_request_get_current_domain (WebKitWebsiteDataAccessPermissionRequest *request);
+
+G_END_DECLS
+
+#endif
Modified: trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt 2020-06-15 09:27:11 UTC (rev 263028)
@@ -846,6 +846,26 @@
</SECTION>
<SECTION>
+<FILE>WebKitWebsiteDataAccessPermissionRequest</FILE>
+WebKitWebsiteDataAccessPermissionRequest
+webkit_website_data_access_permission_request_get_requesting_domain
+webkit_website_data_access_permission_request_get_current_domain
+
+<SUBSECTION Standard>
+WebKitWebsiteDataAccessPermissionRequestClass
+WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST
+WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST
+WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST
+WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS
+WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS
+WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_GET_CLASS
+
+<SUBSECTION Private>
+WebKitWebsiteDataAccessPermissionRequestPrivate
+webkit_website_data_access_permission_request_get_type
+</SECTION>
+
+<SECTION>
<FILE>WebKitPolicyDecision</FILE>
WebKitPolicyDecision
webkit_policy_decision_download
Modified: trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml 2020-06-15 09:27:11 UTC (rev 263028)
@@ -60,6 +60,7 @@
<xi:include href=""
<xi:include href=""
<xi:include href=""
+ <xi:include href=""
</chapter>
<chapter>
@@ -101,5 +102,10 @@
<xi:include href="" /></xi:include>
</index>
+ <index id="api-index-2-30" role="2.30">
+ <title>Index of new symbols in 2.30</title>
+ <xi:include href="" /></xi:include>
+ </index>
+
<xi:include href="" /></xi:include>
</book>
Modified: trunk/Source/WebKit/UIProcess/API/wpe/webkit.h (263027 => 263028)
--- trunk/Source/WebKit/UIProcess/API/wpe/webkit.h 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Source/WebKit/UIProcess/API/wpe/webkit.h 2020-06-15 09:27:11 UTC (rev 263028)
@@ -84,6 +84,7 @@
#include <wpe/WebKitWebViewBackend.h>
#include <wpe/WebKitWebViewSessionState.h>
#include <wpe/WebKitWebsiteData.h>
+#include <wpe/WebKitWebsiteDataAccessPermissionRequest.h>
#include <wpe/WebKitWebsiteDataManager.h>
#include <wpe/WebKitWindowProperties.h>
Modified: trunk/Tools/ChangeLog (263027 => 263028)
--- trunk/Tools/ChangeLog 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Tools/ChangeLog 2020-06-15 09:27:11 UTC (rev 263028)
@@ -1,3 +1,15 @@
+2020-06-15 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Add API to expose UIClient::requestStorageAccessConfirm
+ https://bugs.webkit.org/show_bug.cgi?id=210422
+
+ Reviewed by Michael Catanzaro.
+
+ Handle WebKitWebsiteDataAccessPermissionRequest in MiniBrowser.
+
+ * MiniBrowser/gtk/BrowserTab.c:
+ (decidePermissionRequest):
+
2020-06-15 Philippe Normand <[email protected]>
[Flatpak SDK] Add libavif
Modified: trunk/Tools/MiniBrowser/gtk/BrowserTab.c (263027 => 263028)
--- trunk/Tools/MiniBrowser/gtk/BrowserTab.c 2020-06-15 09:20:01 UTC (rev 263027)
+++ trunk/Tools/MiniBrowser/gtk/BrowserTab.c 2020-06-15 09:27:11 UTC (rev 263028)
@@ -333,6 +333,13 @@
tab->pointerLockMessageLabelId = g_timeout_add_seconds(2, (GSourceFunc)pointerLockMessageTimeoutCallback, tab);
g_source_set_name_by_id(tab->pointerLockMessageLabelId, "[WebKit]pointerLockMessageTimeoutCallback");
return TRUE;
+ } else if (WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request)) {
+ title = "WebsiteData access request";
+ WebKitWebsiteDataAccessPermissionRequest *websiteDataAccessRequest = WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST(request);
+ const gchar *requestingDomain = webkit_website_data_access_permission_request_get_requesting_domain(websiteDataAccessRequest);
+ const gchar *currentDomain = webkit_website_data_access_permission_request_get_current_domain(websiteDataAccessRequest);
+ text = g_strdup_printf("Do you want to allow \"%s\" to use cookies while browsing \"%s\"? This will allow \"%s\" to track your activity",
+ requestingDomain, currentDomain, requestingDomain);
} else {
g_print("%s request not handled\n", G_OBJECT_TYPE_NAME(request));
return FALSE;