<!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>[160125] 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/160125">160125</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 14:18:40 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][WK2] Fix build after <a href="http://trac.webkit.org/projects/webkit/changeset/160104">r160104</a>
https://bugs.webkit.org/show_bug.cgi?id=125240
Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-12-04
Reviewed by Anders Carlsson.
Using specific version of API client when instantiating them.
Applied that same change to the following files:
* UIProcess/API/gtk/WebKitContextMenuClient.cpp:
* UIProcess/API/gtk/WebKitCookieManager.cpp:
* UIProcess/API/gtk/WebKitDownloadClient.cpp:
* UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
* UIProcess/API/gtk/WebKitFindController.cpp:
* UIProcess/API/gtk/WebKitFormClient.cpp:
* UIProcess/API/gtk/WebKitGeolocationProvider.cpp:
* UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
* UIProcess/API/gtk/WebKitLoaderClient.cpp:
* UIProcess/API/gtk/WebKitPolicyClient.cpp:
* UIProcess/API/gtk/WebKitUIClient.cpp:
* WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFaviconDatabasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFormClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitGeolocationProvidercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebExtensioncpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
+
+ [GTK][WK2] Fix build after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125240
+
+ Reviewed by Anders Carlsson.
+
+ Using specific version of API client when instantiating them.
+ Applied that same change to the following files:
+
+ * UIProcess/API/gtk/WebKitContextMenuClient.cpp:
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+ * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
+ * UIProcess/API/gtk/WebKitFindController.cpp:
+ * UIProcess/API/gtk/WebKitFormClient.cpp:
+ * UIProcess/API/gtk/WebKitGeolocationProvider.cpp:
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ * UIProcess/API/gtk/WebKitPolicyClient.cpp:
+ * UIProcess/API/gtk/WebKitUIClient.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+
</ins><span class="cx"> 2013-12-04 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the 32-bit Mac build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -33,9 +33,11 @@
</span><span class="cx">
</span><span class="cx"> void attachContextMenuClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPageContextMenuClient wkContextMenuClient = {
- kWKPageContextMenuClientCurrentVersion,
- webView, // clientInfo
</del><ins>+ WKPageContextMenuClientV3 wkContextMenuClient = {
+ {
+ 3, // version
+ webView, // clientInfo
+ },
</ins><span class="cx"> 0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0
</span><span class="cx"> 0, // customContextMenuItemSelected
</span><span class="cx"> 0, // contextMenuDismissed
</span><span class="lines">@@ -44,6 +46,6 @@
</span><span class="cx"> 0, // hideContextMenu
</span><span class="cx"> };
</span><span class="cx"> WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
</span><del>- WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient);
</del><ins>+ WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -100,12 +100,14 @@
</span><span class="cx"> WebKitCookieManager* manager = WEBKIT_COOKIE_MANAGER(g_object_new(WEBKIT_TYPE_COOKIE_MANAGER, NULL));
</span><span class="cx"> manager->priv->webCookieManager = webCookieManager;
</span><span class="cx">
</span><del>- WKCookieManagerClient wkCookieManagerClient = {
- kWKCookieManagerClientCurrentVersion,
- manager, // clientInfo
</del><ins>+ WKCookieManagerClientV0 wkCookieManagerClient = {
+ {
+ 0, // version
+ manager, // clientInfo
+ },
</ins><span class="cx"> cookiesDidChange
</span><span class="cx"> };
</span><del>- WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient);
</del><ins>+ WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient.base);
</ins><span class="cx"> manager->priv->webCookieManager->startObservingCookieChanges();
</span><span class="cx">
</span><span class="cx"> return manager;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -95,9 +95,11 @@
</span><span class="cx">
</span><span class="cx"> void attachDownloadClientToContext(WebKitWebContext* webContext)
</span><span class="cx"> {
</span><del>- WKContextDownloadClient wkDownloadClient = {
- kWKContextDownloadClientCurrentVersion,
- webContext, // ClientInfo
</del><ins>+ WKContextDownloadClientV0 wkDownloadClient = {
+ {
+ 0, // version
+ webContext, // ClientInfo
+ },
</ins><span class="cx"> didStart,
</span><span class="cx"> 0, // didReceiveAuthenticationChallenge
</span><span class="cx"> didReceiveResponse,
</span><span class="lines">@@ -110,6 +112,6 @@
</span><span class="cx"> didCancel,
</span><span class="cx"> 0, // processDidCrash
</span><span class="cx"> };
</span><del>- WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient);
</del><ins>+ WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFaviconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -214,14 +214,16 @@
</span><span class="cx"> WebKitFaviconDatabase* faviconDatabase = WEBKIT_FAVICON_DATABASE(g_object_new(WEBKIT_TYPE_FAVICON_DATABASE, NULL));
</span><span class="cx"> faviconDatabase->priv->iconDatabase = iconDatabase;
</span><span class="cx">
</span><del>- WKIconDatabaseClient wkIconDatabaseClient = {
- kWKIconDatabaseClientCurrentVersion,
- faviconDatabase, // clientInfo
</del><ins>+ WKIconDatabaseClientV1 wkIconDatabaseClient = {
+ {
+ 1, // version
+ faviconDatabase, // clientInfo
+ },
</ins><span class="cx"> didChangeIconForPageURLCallback,
</span><span class="cx"> 0, // didRemoveAllIconsCallback
</span><span class="cx"> iconDataReadyForPageURLCallback,
</span><span class="cx"> };
</span><del>- WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient);
</del><ins>+ WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient.base);
</ins><span class="cx"> return faviconDatabase;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -111,15 +111,17 @@
</span><span class="cx"> static void webkitFindControllerConstructed(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> WebKitFindController* findController = WEBKIT_FIND_CONTROLLER(object);
</span><del>- WKPageFindClient wkFindClient = {
- kWKPageFindClientCurrentVersion,
- findController, // clientInfo
</del><ins>+ WKPageFindClientV0 wkFindClient = {
+ {
+ 0, // version
+ findController, // clientInfo
+ },
</ins><span class="cx"> didFindString,
</span><span class="cx"> didFailToFindString,
</span><span class="cx"> didCountStringMatches
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient);
</del><ins>+ WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitFindControllerGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -36,11 +36,13 @@
</span><span class="cx">
</span><span class="cx"> void attachFormClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPageFormClient wkFormClient = {
- kWKPageFormClientCurrentVersion,
- webView, // clientInfo
</del><ins>+ WKPageFormClientV0 wkFormClient = {
+ {
+ 0, // version
+ webView, // clientInfo
+ },
</ins><span class="cx"> willSubmitForm
</span><span class="cx"> };
</span><span class="cx"> WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
</span><del>- WKPageSetPageFormClient(wkPage, &wkFormClient);
</del><ins>+ WKPageSetPageFormClient(wkPage, &wkFormClient.base);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitGeolocationProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -64,13 +64,16 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(geolocationManager);
</span><span class="cx">
</span><del>- WKGeolocationProvider wkGeolocationProvider = {
- kWKGeolocationProviderCurrentVersion,
- this, // clientInfo
</del><ins>+ WKGeolocationProviderV1 wkGeolocationProvider = {
+ {
+ 1, // version
+ this, // clientInfo
+ },
</ins><span class="cx"> startUpdatingCallback,
</span><del>- stopUpdatingCallback
</del><ins>+ stopUpdatingCallback,
+ 0 // setEnableHighAccuracy
</ins><span class="cx"> };
</span><del>- WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider);
</del><ins>+ WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebKitGeolocationProvider::startUpdating()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -120,12 +120,14 @@
</span><span class="cx">
</span><span class="cx"> void attachInjectedBundleClientToContext(WebKitWebContext* webContext)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient wkInjectedBundleClient = {
- kWKContextInjectedBundleClientCurrentVersion,
- webContext, // clientInfo
</del><ins>+ WKContextInjectedBundleClientV1 wkInjectedBundleClient = {
+ {
+ 0, // version
+ webContext, // clientInfo
+ },
</ins><span class="cx"> didReceiveMessageFromInjectedBundle,
</span><span class="cx"> 0, // didReceiveSynchronousMessageFromInjectedBundle
</span><span class="cx"> 0 // getInjectedBundleInitializationUserData
</span><span class="cx"> };
</span><del>- WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient.base);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -140,9 +140,11 @@
</span><span class="cx">
</span><span class="cx"> void attachLoaderClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient wkLoaderClient = {
- kWKPageLoaderClientCurrentVersion,
- webView, // clientInfo
</del><ins>+ WKPageLoaderClientV3 wkLoaderClient = {
+ {
+ 3, // version
+ webView, // clientInfo
+ },
</ins><span class="cx"> didStartProvisionalLoadForFrame,
</span><span class="cx"> didReceiveServerRedirectForProvisionalLoadForFrame,
</span><span class="cx"> didFailProvisionalLoadWithErrorForFrame,
</span><span class="lines">@@ -181,6 +183,6 @@
</span><span class="cx"> 0, // pluginLoadPolicy
</span><span class="cx"> };
</span><span class="cx"> WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
</span><del>- WKPageSetPageLoaderClient(wkPage, &wkLoaderClient);
</del><ins>+ WKPageSetPageLoaderClient(wkPage, &wkLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -68,9 +68,11 @@
</span><span class="cx">
</span><span class="cx"> void attachPolicyClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPagePolicyClient policyClient = {
- kWKPagePolicyClientCurrentVersion,
- webView, // clientInfo
</del><ins>+ WKPagePolicyClientV1 policyClient = {
+ {
+ 1, // version
+ webView, // clientInfo
+ },
</ins><span class="cx"> 0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
</span><span class="cx"> decidePolicyForNewWindowAction,
</span><span class="cx"> 0, // decidePolicyForResponse_deprecatedForUseWithV0
</span><span class="lines">@@ -78,5 +80,5 @@
</span><span class="cx"> decidePolicyForNavigationAction,
</span><span class="cx"> decidePolicyForResponse
</span><span class="cx"> };
</span><del>- WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient);
</del><ins>+ WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient.base);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -160,9 +160,11 @@
</span><span class="cx">
</span><span class="cx"> void attachUIClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPageUIClient wkUIClient = {
- kWKPageUIClientCurrentVersion,
- webView, // clientInfo
</del><ins>+ WKPageUIClientV2 wkUIClient = {
+ {
+ 2, // version
+ webView, // clientInfo
+ },
</ins><span class="cx"> 0, // createNewPage_deprecatedForUseWithV0
</span><span class="cx"> showPage,
</span><span class="cx"> closePage,
</span><span class="lines">@@ -211,6 +213,6 @@
</span><span class="cx"> 0, // pluginLoadPolicy
</span><span class="cx"> };
</span><span class="cx"> WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
</span><del>- WKPageSetPageUIClient(wkPage, &wkUIClient);
</del><ins>+ WKPageSetPageUIClient(wkPage, &wkUIClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -116,16 +116,18 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitWebExtension* extension = WEBKIT_WEB_EXTENSION(g_object_new(WEBKIT_TYPE_WEB_EXTENSION, NULL));
</span><span class="cx">
</span><del>- WKBundleClient wkBundleClient = {
- kWKBundleClientCurrentVersion,
- extension, // clientInfo
</del><ins>+ WKBundleClientV1 wkBundleClient = {
+ {
+ 1, // version
+ extension, // clientInfo
+ },
</ins><span class="cx"> didCreatePage,
</span><span class="cx"> willDestroyPage,
</span><span class="cx"> 0, // didInitializePageGroup
</span><span class="cx"> didReceiveMessage,
</span><span class="cx"> didReceiveMessageToPage
</span><span class="cx"> };
</span><del>- WKBundleSetClient(toAPI(bundle), &wkBundleClient);
</del><ins>+ WKBundleSetClient(toAPI(bundle), &wkBundleClient.base);
</ins><span class="cx">
</span><span class="cx"> return extension;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (160124 => 160125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2013-12-04 22:18:40 UTC (rev 160125)
</span><span class="lines">@@ -309,9 +309,11 @@
</span><span class="cx"> WebKitWebPage* page = WEBKIT_WEB_PAGE(g_object_new(WEBKIT_TYPE_WEB_PAGE, NULL));
</span><span class="cx"> page->priv->webPage = webPage;
</span><span class="cx">
</span><del>- WKBundlePageLoaderClient loaderClient = {
- kWKBundlePageLoaderClientCurrentVersion,
- page,
</del><ins>+ WKBundlePageLoaderClientV7 loaderClient = {
+ {
+ 7, // version
+ page, // clientInfo
+ },
</ins><span class="cx"> didStartProvisionalLoadForFrame,
</span><span class="cx"> didReceiveServerRedirectForProvisionalLoadForFrame,
</span><span class="cx"> 0, // didFailProvisionalLoadWithErrorForFrame
</span><span class="lines">@@ -348,11 +350,13 @@
</span><span class="cx"> 0, // willLoadDataRequest
</span><span class="cx"> willDestroyFrame
</span><span class="cx"> };
</span><del>- WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient.base);
</ins><span class="cx">
</span><del>- WKBundlePageResourceLoadClient resourceLoadClient = {
- kWKBundlePageResourceLoadClientCurrentVersion,
- page,
</del><ins>+ WKBundlePageResourceLoadClientV1 resourceLoadClient = {
+ {
+ 1, // version
+ page, // clientInfo
+ },
</ins><span class="cx"> didInitiateLoadForResource,
</span><span class="cx"> willSendRequestForFrame,
</span><span class="cx"> didReceiveResponseForResource,
</span><span class="lines">@@ -362,7 +366,7 @@
</span><span class="cx"> 0, // shouldCacheResponse
</span><span class="cx"> 0 // shouldUseCredentialStorage
</span><span class="cx"> };
</span><del>- WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient);
</del><ins>+ WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient.base);
</ins><span class="cx">
</span><span class="cx"> return page;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>