<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177278] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177278">177278</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-15 05:41:26 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use API::LoaderClient instead of WKPageLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=139583
Reviewed by Gustavo Noronha Silva.
It simplifies the code and it will make easier to implement new
loader client methods.
* UIProcess/API/gtk/WebKitBackForwardList.cpp:
(webkitBackForwardListChanged):
* UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
* UIProcess/API/gtk/WebKitLoaderClient.cpp:
(LoaderClient::LoaderClient):
(attachLoaderClientToView):
(didStartProvisionalLoadForFrame): Deleted.
(didReceiveServerRedirectForProvisionalLoadForFrame): Deleted.
(didFailProvisionalLoadWithErrorForFrame): Deleted.
(didCommitLoadForFrame): Deleted.
(didFinishLoadForFrame): Deleted.
(didFailLoadWithErrorForFrame): Deleted.
(didDisplayInsecureContentForFrame): Deleted.
(didRunInsecureContentForFrame): Deleted.
(didChangeBackForwardList): Deleted.
(didReceiveAuthenticationChallengeInFrame): Deleted.
(processDidCrash): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177277 => 177278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-15 13:40:08 UTC (rev 177277)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-15 13:41:26 UTC (rev 177278)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-12-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Use API::LoaderClient instead of WKPageLoaderClient
+ https://bugs.webkit.org/show_bug.cgi?id=139583
+
+ Reviewed by Gustavo Noronha Silva.
+
+ It simplifies the code and it will make easier to implement new
+ loader client methods.
+
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+ (webkitBackForwardListChanged):
+ * UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ (LoaderClient::LoaderClient):
+ (attachLoaderClientToView):
+ (didStartProvisionalLoadForFrame): Deleted.
+ (didReceiveServerRedirectForProvisionalLoadForFrame): Deleted.
+ (didFailProvisionalLoadWithErrorForFrame): Deleted.
+ (didCommitLoadForFrame): Deleted.
+ (didFinishLoadForFrame): Deleted.
+ (didFailLoadWithErrorForFrame): Deleted.
+ (didDisplayInsecureContentForFrame): Deleted.
+ (didRunInsecureContentForFrame): Deleted.
+ (didChangeBackForwardList): Deleted.
+ (didReceiveAuthenticationChallengeInFrame): Deleted.
+ (processDidCrash): Deleted.
+
</ins><span class="cx"> 2014-12-15 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add initial implementation of ThreadSafeCoordinatedSurface, ThreadedCompositor, and SimpleViewportController
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (177277 => 177278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2014-12-15 13:40:08 UTC (rev 177277)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2014-12-15 13:41:26 UTC (rev 177278)
</span><span class="lines">@@ -128,20 +128,18 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkitBackForwardListChanged(WebKitBackForwardList* backForwardList, WebBackForwardListItem* webAddedItem, API::Array* webRemovedItems)
</del><ins>+void webkitBackForwardListChanged(WebKitBackForwardList* backForwardList, WebBackForwardListItem* webAddedItem, Vector<RefPtr<WebBackForwardListItem>> webRemovedItems)
</ins><span class="cx"> {
</span><span class="cx"> WebKitBackForwardListItem* addedItem = webkitBackForwardListGetOrCreateItem(backForwardList, webAddedItem);
</span><del>- GList* removedItems = 0;
</del><ins>+ GList* removedItems = nullptr;
</ins><span class="cx">
</span><del>- size_t removedItemsSize = webRemovedItems ? webRemovedItems->size() : 0;
</del><span class="cx"> WebKitBackForwardListPrivate* priv = backForwardList->priv;
</span><del>- for (size_t i = 0; i < removedItemsSize; ++i) {
- WebBackForwardListItem* webItem = static_cast<WebBackForwardListItem*>(webRemovedItems->at(i));
- removedItems = g_list_prepend(removedItems, g_object_ref(G_OBJECT(priv->itemsMap.get(webItem).get())));
- priv->itemsMap.remove(webItem);
</del><ins>+ for (const auto& webItem : webRemovedItems) {
+ removedItems = g_list_prepend(removedItems, g_object_ref(priv->itemsMap.get(webItem.get()).get()));
+ priv->itemsMap.remove(webItem.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- g_signal_emit(backForwardList, signals[CHANGED], 0, addedItem, removedItems, NULL);
</del><ins>+ g_signal_emit(backForwardList, signals[CHANGED], 0, addedItem, removedItems, nullptr);
</ins><span class="cx"> g_list_free_full(removedItems, static_cast<GDestroyNotify>(g_object_unref));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h (177277 => 177278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h 2014-12-15 13:40:08 UTC (rev 177277)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h 2014-12-15 13:41:26 UTC (rev 177278)
</span><span class="lines">@@ -32,6 +32,6 @@
</span><span class="cx"> WebKitBackForwardList* webkitBackForwardListCreate(WebKit::WebBackForwardList*);
</span><span class="cx"> WebKitBackForwardListItem* webkitBackForwardListItemGetOrCreate(WebKit::WebBackForwardListItem*);
</span><span class="cx"> WebKit::WebBackForwardListItem* webkitBackForwardListItemGetItem(WebKitBackForwardListItem*);
</span><del>-void webkitBackForwardListChanged(WebKitBackForwardList*, WebKit::WebBackForwardListItem* webAddedItem, API::Array* webRemovedItems);
</del><ins>+void webkitBackForwardListChanged(WebKitBackForwardList*, WebKit::WebBackForwardListItem* webAddedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>>);
</ins><span class="cx">
</span><span class="cx"> #endif // WebKitBackForwardListPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (177277 => 177278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2014-12-15 13:40:08 UTC (rev 177277)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2014-12-15 13:41:26 UTC (rev 177278)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitLoaderClient.h"
</span><span class="cx">
</span><ins>+#include "APILoaderClient.h"
</ins><span class="cx"> #include "WebKitBackForwardListPrivate.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><span class="lines">@@ -32,135 +33,95 @@
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-static void didStartProvisionalLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef /* userData */, const void* clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+class LoaderClient : public API::LoaderClient {
+public:
+ explicit LoaderClient(WebKitWebView* webView)
+ : m_webView(webView)
+ {
+ }
</ins><span class="cx">
</span><del>- webkitWebViewLoadChanged(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_STARTED);
-}
</del><ins>+private:
+ void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
+ {
+ if (!frame->isMainFrame())
+ return;
+ webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_STARTED);
+ }
</ins><span class="cx">
</span><del>-static void didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef /* userData */, const void* clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
+ {
+ if (!frame->isMainFrame())
+ return;
+ webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_REDIRECTED);
+ }
</ins><span class="cx">
</span><del>- webkitWebViewLoadChanged(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_REDIRECTED);
-}
</del><ins>+ void didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy* frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override
+ {
+ if (!frame->isMainFrame())
+ return;
+ GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
+ toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
+ if (resourceError.tlsErrors()) {
+ webkitWebViewLoadFailedWithTLSErrors(m_webView, resourceError.failingURL().utf8().data(), error.get(),
+ static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()), resourceError.certificate());
+ } else
+ webkitWebViewLoadFailed(m_webView, WEBKIT_LOAD_STARTED, resourceError.failingURL().utf8().data(), error.get());
+ }
</ins><span class="cx">
</span><del>-static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef frame, WKErrorRef error, WKTypeRef /* userData */, const void* clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ void didCommitLoadForFrame(WebPageProxy*, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
+ {
+ if (!frame->isMainFrame())
+ return;
+ webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_COMMITTED);
+ }
</ins><span class="cx">
</span><del>- const ResourceError& resourceError = toImpl(error)->platformError();
- GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
- if (resourceError.tlsErrors()) {
- webkitWebViewLoadFailedWithTLSErrors(WEBKIT_WEB_VIEW(clientInfo), resourceError.failingURL().utf8().data(), webError.get(),
- static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()), resourceError.certificate());
- } else
- webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_STARTED, resourceError.failingURL().utf8().data(), webError.get());
-}
</del><ins>+ void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
+ {
+ if (!frame->isMainFrame())
+ return;
+ webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_FINISHED);
+ }
</ins><span class="cx">
</span><del>-static void didCommitLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef /* userData */, const void* clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy* frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override
+ {
+ if (!frame->isMainFrame())
+ return;
+ GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
+ toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
+ webkitWebViewLoadFailed(m_webView, WEBKIT_LOAD_COMMITTED, resourceError.failingURL().utf8().data(), error.get());
+ }
</ins><span class="cx">
</span><del>- webkitWebViewLoadChanged(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_COMMITTED);
-}
</del><ins>+ void didDisplayInsecureContentForFrame(WebPageProxy*, WebFrameProxy*, API::Object* /* userData */) override
+ {
+ webkitWebViewInsecureContentDetected(m_webView, WEBKIT_INSECURE_CONTENT_DISPLAYED);
+ }
</ins><span class="cx">
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef /* userData */, const void* clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ void didRunInsecureContentForFrame(WebPageProxy*, WebFrameProxy*, API::Object* /* userData */) override
+ {
+ webkitWebViewInsecureContentDetected(m_webView, WEBKIT_INSECURE_CONTENT_RUN);
+ }
</ins><span class="cx">
</span><del>- webkitWebViewLoadChanged(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_FINISHED);
-}
</del><ins>+ void didChangeBackForwardList(WebPageProxy*, WebBackForwardListItem* addedItem, Vector<RefPtr<WebBackForwardListItem>> removedItems) override
+ {
+ webkitBackForwardListChanged(webkit_web_view_get_back_forward_list(m_webView), addedItem, removedItems);
+ }
</ins><span class="cx">
</span><del>-static void didFailLoadWithErrorForFrame(WKPageRef, WKFrameRef frame, WKErrorRef error, WKTypeRef, const void* clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ void didReceiveAuthenticationChallengeInFrame(WebPageProxy*, WebFrameProxy*, AuthenticationChallengeProxy* authenticationChallenge) override
+ {
+ webkitWebViewHandleAuthenticationChallenge(m_webView, authenticationChallenge);
+ }
</ins><span class="cx">
</span><del>- const ResourceError& resourceError = toImpl(error)->platformError();
- GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
- webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_COMMITTED,
- resourceError.failingURL().utf8().data(), webError.get());
-}
</del><ins>+ void processDidCrash(WebPageProxy*) override
+ {
+ webkitWebViewWebProcessCrashed(m_webView);
+ }
</ins><span class="cx">
</span><del>-static void didDisplayInsecureContentForFrame(WKPageRef, WKFrameRef, WKTypeRef /* userData */, const void *clientInfo)
-{
- webkitWebViewInsecureContentDetected(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_INSECURE_CONTENT_DISPLAYED);
-}
</del><ins>+ WebKitWebView* m_webView;
+};
</ins><span class="cx">
</span><del>-static void didRunInsecureContentForFrame(WKPageRef, WKFrameRef, WKTypeRef /* userData */, const void *clientInfo)
-{
- webkitWebViewInsecureContentDetected(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_INSECURE_CONTENT_RUN);
-}
-
-static void didChangeBackForwardList(WKPageRef, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void* clientInfo)
-{
- webkitBackForwardListChanged(webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(clientInfo)), toImpl(addedItem), toImpl(removedItems));
-}
-
-static void didReceiveAuthenticationChallengeInFrame(WKPageRef, WKFrameRef, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo)
-{
- webkitWebViewHandleAuthenticationChallenge(WEBKIT_WEB_VIEW(clientInfo), toImpl(authenticationChallenge));
-}
-
-static void processDidCrash(WKPageRef, const void* clientInfo)
-{
- webkitWebViewWebProcessCrashed(WEBKIT_WEB_VIEW(clientInfo));
-}
-
</del><span class="cx"> void attachLoaderClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPageLoaderClientV3 wkLoaderClient = {
- {
- 3, // version
- webView, // clientInfo
- },
- didStartProvisionalLoadForFrame,
- didReceiveServerRedirectForProvisionalLoadForFrame,
- didFailProvisionalLoadWithErrorForFrame,
- didCommitLoadForFrame,
- 0, // didFinishDocumentLoadForFrame
- didFinishLoadForFrame,
- didFailLoadWithErrorForFrame,
- 0, // didSameDocumentNavigationForFrame
- 0, // didReceiveTitleForFrame,
- 0, // didFirstLayoutForFrame
- 0, // didFirstVisuallyNonEmptyLayoutForFrame
- 0, // didRemoveFrameFromHierarchy
- didDisplayInsecureContentForFrame,
- didRunInsecureContentForFrame,
- 0, // canAuthenticateAgainstProtectionSpaceInFrame
- didReceiveAuthenticationChallengeInFrame,
- 0, // didStartProgress
- 0, // didChangeProgress,
- 0, // didFinishProgress
- 0, // didBecomeUnresponsive
- 0, // didBecomeResponsive
- processDidCrash,
- didChangeBackForwardList,
- 0, // shouldGoToBackForwardListItem
- 0, // didFailToInitializePlugin
- 0, // didDetectXSSForFrame
- 0, // didFirstVisuallyNonEmptyLayoutForFrame
- 0, // willGoToBackForwardListItem
- 0, // interactionOccurredWhileProcessUnresponsive
- 0, // pluginDidFail_deprecatedForUseWithV1
- 0, // didReceiveIntentForFrame
- 0, // registerIntentServiceForFrame
- 0, // didLayout
- 0, // pluginLoadPolicy_deprecatedForUseWithV2
- 0, // pluginDidFail
- 0, // pluginLoadPolicy
- };
- WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
- WKPageSetPageLoaderClient(wkPage, &wkLoaderClient.base);
</del><ins>+ WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+ page->setLoaderClient(std::make_unique<LoaderClient>(webView));
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>