<!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>[160107] trunk</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/160107">160107</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 11:15:58 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Buildfix after <a href="http://trac.webkit.org/projects/webkit/changeset/160104">r160104</a>
https://bugs.webkit.org/show_bug.cgi?id=125233
Reviewed by Anders Carlsson.
Source/WebKit2:
* UIProcess/API/efl/ewk_cookie_manager.cpp:
(EwkCookieManager::EwkCookieManager):
* UIProcess/API/efl/ewk_favicon_database.cpp:
(EwkFaviconDatabase::EwkFaviconDatabase):
* UIProcess/efl/ContextHistoryClientEfl.cpp:
(WebKit::ContextHistoryClientEfl::ContextHistoryClientEfl):
* UIProcess/efl/ContextMenuClientEfl.cpp:
(ContextMenuClientEfl::ContextMenuClientEfl):
* UIProcess/efl/DownloadManagerEfl.cpp:
(WebKit::DownloadManagerEfl::DownloadManagerEfl):
* UIProcess/efl/FindClientEfl.cpp:
(WebKit::FindClientEfl::FindClientEfl):
* UIProcess/efl/FormClientEfl.cpp:
(WebKit::FormClientEfl::FormClientEfl):
* UIProcess/efl/PageLoadClientEfl.cpp:
(WebKit::PageLoadClientEfl::PageLoadClientEfl):
* UIProcess/efl/PagePolicyClientEfl.cpp:
(WebKit::PagePolicyClientEfl::PagePolicyClientEfl):
* UIProcess/efl/PageUIClientEfl.cpp:
(WebKit::PageUIClientEfl::PageUIClientEfl):
Tools:
* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
(TestWebKitAPI::setPageLoaderClient):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_cookie_managercpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_favicon_databasecpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflContextHistoryClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflContextMenuClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflDownloadManagerEflcpp">trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflFindClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflFormClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflPageLoadClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflPagePolicyClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflPageUIClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CoordinatedGraphicsWKViewIsActiveSetIsActivecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2eflWKViewClientWebProcessCallbackscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-04 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL][WK2] Buildfix after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125233
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/efl/ewk_cookie_manager.cpp:
+ (EwkCookieManager::EwkCookieManager):
+ * UIProcess/API/efl/ewk_favicon_database.cpp:
+ (EwkFaviconDatabase::EwkFaviconDatabase):
+ * UIProcess/efl/ContextHistoryClientEfl.cpp:
+ (WebKit::ContextHistoryClientEfl::ContextHistoryClientEfl):
+ * UIProcess/efl/ContextMenuClientEfl.cpp:
+ (ContextMenuClientEfl::ContextMenuClientEfl):
+ * UIProcess/efl/DownloadManagerEfl.cpp:
+ (WebKit::DownloadManagerEfl::DownloadManagerEfl):
+ * UIProcess/efl/FindClientEfl.cpp:
+ (WebKit::FindClientEfl::FindClientEfl):
+ * UIProcess/efl/FormClientEfl.cpp:
+ (WebKit::FormClientEfl::FormClientEfl):
+ * UIProcess/efl/PageLoadClientEfl.cpp:
+ (WebKit::PageLoadClientEfl::PageLoadClientEfl):
+ * UIProcess/efl/PagePolicyClientEfl.cpp:
+ (WebKit::PagePolicyClientEfl::PagePolicyClientEfl):
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl):
+
</ins><span class="cx"> 2013-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Deprecate all unversioned client structs in favor of having explicit versioned structs
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_cookie_managercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -42,12 +42,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_cookieManager);
</span><span class="cx">
</span><del>- WKCookieManagerClient wkCookieManagerClient = {
- kWKCookieManagerClientCurrentVersion,
- this, // clientInfo
- cookiesDidChange
- };
- WKCookieManagerSetClient(m_cookieManager.get(), &wkCookieManagerClient);
</del><ins>+ WKCookieManagerClientV0 wkCookieManagerClient;
+ memset(&wkCookieManagerClient, 0, sizeof(wkCookieManagerClient));
+ wkCookieManagerClient.base.version = 0;
+ wkCookieManagerClient.base.clientInfo = this;
+ wkCookieManagerClient.cookiesDidChange = cookiesDidChange;
+ WKCookieManagerSetClient(m_cookieManager.get(), &wkCookieManagerClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EwkCookieManager::~EwkCookieManager()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_favicon_databasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -42,12 +42,12 @@
</span><span class="cx"> EwkFaviconDatabase::EwkFaviconDatabase(WKIconDatabaseRef iconDatabase)
</span><span class="cx"> : m_iconDatabase(iconDatabase)
</span><span class="cx"> {
</span><del>- WKIconDatabaseClient iconDatabaseClient;
</del><ins>+ WKIconDatabaseClientV1 iconDatabaseClient;
</ins><span class="cx"> memset(&iconDatabaseClient, 0, sizeof(WKIconDatabaseClient));
</span><del>- iconDatabaseClient.version = kWKIconDatabaseClientCurrentVersion;
- iconDatabaseClient.clientInfo = this;
</del><ins>+ iconDatabaseClient.base.version = kWKIconDatabaseClientCurrentVersion;
+ iconDatabaseClient.base.clientInfo = this;
</ins><span class="cx"> iconDatabaseClient.iconDataReadyForPageURL = iconDataReadyForPageURL;
</span><del>- WKIconDatabaseSetIconDatabaseClient(m_iconDatabase.get(), &iconDatabaseClient);
</del><ins>+ WKIconDatabaseSetIconDatabaseClient(m_iconDatabase.get(), &iconDatabaseClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EwkFaviconDatabase::~EwkFaviconDatabase()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflContextHistoryClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -116,11 +116,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_context);
</span><span class="cx">
</span><del>- WKContextHistoryClient wkHistoryClient;
</del><ins>+ WKContextHistoryClientV0 wkHistoryClient;
</ins><span class="cx"> memset(&wkHistoryClient, 0, sizeof(WKContextHistoryClient));
</span><span class="cx">
</span><del>- wkHistoryClient.version = kWKContextHistoryClientCurrentVersion;
- wkHistoryClient.clientInfo = this;
</del><ins>+ wkHistoryClient.base.version = 0;
+ wkHistoryClient.base.clientInfo = this;
</ins><span class="cx">
</span><span class="cx"> wkHistoryClient.didNavigateWithNavigationData = didNavigateWithNavigationData;
</span><span class="cx"> wkHistoryClient.didPerformClientRedirect = didPerformClientRedirect;
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> wkHistoryClient.didUpdateHistoryTitle = didUpdateHistoryTitle;
</span><span class="cx"> wkHistoryClient.populateVisitedLinks = populateVisitedLinks;
</span><span class="cx">
</span><del>- WKContextSetHistoryClient(m_context.get(), &wkHistoryClient);
</del><ins>+ WKContextSetHistoryClient(m_context.get(), &wkHistoryClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContextHistoryClientEfl::~ContextHistoryClientEfl()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflContextMenuClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> WKPageRef pageRef = m_view->wkPage();
</span><span class="cx"> ASSERT(pageRef);
</span><span class="cx">
</span><del>- WKPageContextMenuClient contextMenuClient;
</del><ins>+ WKPageContextMenuClientV3 contextMenuClient;
</ins><span class="cx"> memset(&contextMenuClient, 0, sizeof(WKPageContextMenuClient));
</span><del>- contextMenuClient.version = kWKPageContextMenuClientCurrentVersion;
- contextMenuClient.clientInfo = this;
</del><ins>+ contextMenuClient.base.version = 3;
+ contextMenuClient.base.clientInfo = this;
</ins><span class="cx"> contextMenuClient.getContextMenuFromProposedMenu_deprecatedForUseWithV0 = 0;
</span><span class="cx"> contextMenuClient.customContextMenuItemSelected = customContextMenuItemSelected;
</span><span class="cx"> contextMenuClient.contextMenuDismissed = 0;
</span><span class="lines">@@ -69,6 +69,6 @@
</span><span class="cx"> contextMenuClient.showContextMenu = showContextMenu;
</span><span class="cx"> contextMenuClient.hideContextMenu = hideContextMenu;
</span><span class="cx">
</span><del>- WKPageSetPageContextMenuClient(pageRef, &contextMenuClient);
</del><ins>+ WKPageSetPageContextMenuClient(pageRef, &contextMenuClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflDownloadManagerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -120,11 +120,11 @@
</span><span class="cx"> DownloadManagerEfl::DownloadManagerEfl(WKContextRef context)
</span><span class="cx"> : m_context(context)
</span><span class="cx"> {
</span><del>- WKContextDownloadClient wkDownloadClient;
</del><ins>+ WKContextDownloadClientV0 wkDownloadClient;
</ins><span class="cx"> memset(&wkDownloadClient, 0, sizeof(WKContextDownloadClient));
</span><span class="cx">
</span><del>- wkDownloadClient.version = kWKContextDownloadClientCurrentVersion;
- wkDownloadClient.clientInfo = this;
</del><ins>+ wkDownloadClient.base.version = 0;
+ wkDownloadClient.base.clientInfo = this;
</ins><span class="cx"> wkDownloadClient.didCancel = didCancel;
</span><span class="cx"> wkDownloadClient.decideDestinationWithSuggestedFilename = decideDestinationWithSuggestedFilename;
</span><span class="cx"> wkDownloadClient.didCreateDestination = didCreateDestination;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> wkDownloadClient.didFail = didFail;
</span><span class="cx"> wkDownloadClient.didFinish = didFinish;
</span><span class="cx">
</span><del>- WKContextSetDownloadClient(m_context.get(), &wkDownloadClient);
</del><ins>+ WKContextSetDownloadClient(m_context.get(), &wkDownloadClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DownloadManagerEfl::~DownloadManagerEfl()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflFindClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx"> WKPageRef pageRef = m_view->wkPage();
</span><span class="cx"> ASSERT(pageRef);
</span><span class="cx">
</span><del>- WKPageFindClient findClient;
</del><ins>+ WKPageFindClientV0 findClient;
</ins><span class="cx"> memset(&findClient, 0, sizeof(WKPageFindClient));
</span><del>- findClient.version = kWKPageFindClientCurrentVersion;
- findClient.clientInfo = this;
</del><ins>+ findClient.base.version = 0;
+ findClient.base.clientInfo = this;
</ins><span class="cx"> findClient.didFindString = didFindString;
</span><span class="cx"> findClient.didFailToFindString = didFailToFindString;
</span><span class="cx"> findClient.didCountStringMatches = didFindString;
</span><del>- WKPageSetPageFindClient(pageRef, &findClient);
</del><ins>+ WKPageSetPageFindClient(pageRef, &findClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflFormClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx"> WKPageRef pageRef = m_view->wkPage();
</span><span class="cx"> ASSERT(pageRef);
</span><span class="cx">
</span><del>- WKPageFormClient formClient;
</del><ins>+ WKPageFormClientV0 formClient;
</ins><span class="cx"> memset(&formClient, 0, sizeof(WKPageFormClient));
</span><del>- formClient.version = kWKPageFormClientCurrentVersion;
- formClient.clientInfo = this;
</del><ins>+ formClient.base.version = 0;
+ formClient.base.clientInfo = this;
</ins><span class="cx"> formClient.willSubmitForm = willSubmitForm;
</span><del>- WKPageSetPageFormClient(pageRef, &formClient);
</del><ins>+ WKPageSetPageFormClient(pageRef, &formClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflPageLoadClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -162,10 +162,10 @@
</span><span class="cx"> WKPageRef pageRef = m_view->wkPage();
</span><span class="cx"> ASSERT(pageRef);
</span><span class="cx">
</span><del>- WKPageLoaderClient loadClient;
</del><ins>+ WKPageLoaderClientV3 loadClient;
</ins><span class="cx"> memset(&loadClient, 0, sizeof(WKPageLoaderClient));
</span><del>- loadClient.version = kWKPageLoaderClientCurrentVersion;
- loadClient.clientInfo = this;
</del><ins>+ loadClient.base.version = 3;
+ loadClient.base.clientInfo = this;
</ins><span class="cx"> loadClient.didReceiveTitleForFrame = didReceiveTitleForFrame;
</span><span class="cx"> loadClient.didStartProgress = didChangeProgress;
</span><span class="cx"> loadClient.didChangeProgress = didChangeProgress;
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> loadClient.didChangeBackForwardList = didChangeBackForwardList;
</span><span class="cx"> loadClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
</span><span class="cx"> loadClient.didReceiveAuthenticationChallengeInFrame = didReceiveAuthenticationChallengeInFrame;
</span><del>- WKPageSetPageLoaderClient(pageRef, &loadClient);
</del><ins>+ WKPageSetPageLoaderClient(pageRef, &loadClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflPagePolicyClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -105,15 +105,15 @@
</span><span class="cx"> WKPageRef pageRef = m_view->wkPage();
</span><span class="cx"> ASSERT(pageRef);
</span><span class="cx">
</span><del>- WKPagePolicyClient policyClient;
</del><ins>+ WKPagePolicyClientV1 policyClient;
</ins><span class="cx"> memset(&policyClient, 0, sizeof(WKPagePolicyClient));
</span><del>- policyClient.version = kWKPagePolicyClientCurrentVersion;
- policyClient.clientInfo = this;
</del><ins>+ policyClient.base.version = 1;
+ policyClient.base.clientInfo = this;
</ins><span class="cx"> policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
</span><span class="cx"> policyClient.decidePolicyForNewWindowAction = decidePolicyForNewWindowAction;
</span><span class="cx"> policyClient.decidePolicyForResponse = decidePolicyForResponseCallback;
</span><span class="cx">
</span><del>- WKPageSetPagePolicyClient(pageRef, &policyClient);
</del><ins>+ WKPageSetPagePolicyClient(pageRef, &policyClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflPageUIClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> WKPageRef pageRef = m_view->wkPage();
</span><span class="cx"> ASSERT(pageRef);
</span><span class="cx">
</span><del>- WKPageUIClient uiClient;
</del><ins>+ WKPageUIClientV2 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(WKPageUIClient));
</span><del>- uiClient.version = kWKPageUIClientCurrentVersion;
- uiClient.clientInfo = this;
</del><ins>+ uiClient.base.version = 2;
+ uiClient.base.clientInfo = this;
</ins><span class="cx"> uiClient.close = close;
</span><span class="cx"> uiClient.takeFocus = takeFocus;
</span><span class="cx"> uiClient.focus = focus;
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> uiClient.hideColorPicker = hideColorPicker;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WKPageSetPageUIClient(pageRef, &uiClient);
</del><ins>+ WKPageSetPageUIClient(pageRef, &uiClient.base);
</ins><span class="cx">
</span><span class="cx"> // Popup Menu UI client.
</span><span class="cx"> WKPageUIPopupMenuClientV0 uiPopupMenuClient;
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> uiPopupMenuClient.base.clientInfo = this;
</span><span class="cx"> uiPopupMenuClient.showPopupMenu = showPopupMenu;
</span><span class="cx"> uiPopupMenuClient.hidePopupMenu = hidePopupMenu;
</span><del>- WKPageSetUIPopupMenuClient(pageRef, reinterpret_cast<WKPageUIPopupMenuClientBase*>(&uiPopupMenuClient));
</del><ins>+ WKPageSetUIPopupMenuClient(pageRef, &uiPopupMenuClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Tools/ChangeLog 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-04 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL][WK2] Buildfix after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125233
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+
</ins><span class="cx"> 2013-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Deprecate all unversioned client structs in favor of having explicit versioned structs
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CoordinatedGraphicsWKViewIsActiveSetIsActivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> // At this point we should have an active view.
</span><span class="cx"> ASSERT_TRUE(WKViewIsActive(view.get()));
</span><span class="cx">
</span><del>- WKPageLoaderClient pageLoaderClient;
</del><ins>+ WKPageLoaderClientV3 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(WKPageLoaderClient));
</span><del>- pageLoaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+ pageLoaderClient.base.version = 3;
</ins><span class="cx"> pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(WKViewGetPage(view.get()), &pageLoaderClient);
</del><ins>+ WKPageSetPageLoaderClient(WKViewGetPage(view.get()), &pageLoaderClient.base);
</ins><span class="cx">
</span><span class="cx"> const WKSize size = WKSizeMake(100, 100);
</span><span class="cx"> WKViewSetSize(view.get(), size);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2eflWKViewClientWebProcessCallbackscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp (160106 => 160107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp 2013-12-04 19:15:58 UTC (rev 160107)
</span><span class="lines">@@ -58,13 +58,14 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><ins>+ loaderClient.base.version = 3;
+ loaderClient.base.clientInfo = clientInfo;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- loaderClient.clientInfo = clientInfo;
</del><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webProcessCrashed(WKViewRef view, WKURLRef url, const void* clientInfo)
</span></span></pre>
</div>
</div>
</body>
</html>