<!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>[160128] 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/160128">160128</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 14:42:46 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebKit2: [EFL][GTK][WK2] Remove unnecessary reinterpret_casts when setting API clients
https://bugs.webkit.org/show_bug.cgi?id=125231
Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-12-04
Reviewed by Anders Carlsson.
After <a href="http://trac.webkit.org/projects/webkit/changeset/159988">r159988</a>, WKClients have to be instantiated with a specific
version of that client and its Base field has to used when setting it.
Eg:
WKFullScreenClientV0 wkClient = {
{
0, // version
this, // clientInfo
},
willEnterFullScreen,
willExitFullScreen
};
WKViewSetFullScreenClientGtk(this, &wkClient.base);
So we don't need the reinterpret_casts introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/160075">r160075</a>.
* UIProcess/API/gtk/WebKitFullscreenClient.cpp:
(attachFullScreenClientToView): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
* UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
(attachRequestManagerClientToContext): Ditto.
* UIProcess/API/gtk/WebKitTextChecker.cpp:
(WebKitTextChecker::WebKitTextChecker): Ditto.
* UIProcess/API/gtk/WebKitWebInspector.cpp:
(webkitWebInspectorCreate): Ditto.
* UIProcess/efl/BatteryProvider.cpp:
(BatteryProvider::BatteryProvider): Ditto.
* UIProcess/efl/NetworkInfoProvider.cpp:
(NetworkInfoProvider::NetworkInfoProvider): Ditto.
* UIProcess/efl/PageUIClientEfl.cpp:
(WebKit::PageUIClientEfl::PageUIClientEfl): Ditto.
* UIProcess/efl/RequestManagerClientEfl.cpp:
(WebKit::RequestManagerClientEfl::RequestManagerClientEfl): Ditto.
* UIProcess/efl/TextCheckerClientEfl.cpp:
(TextCheckerClientEfl::TextCheckerClientEfl): Ditto.
* UIProcess/efl/VibrationClientEfl.cpp:
(VibrationClientEfl::VibrationClientEfl): Ditto.
* UIProcess/efl/ViewClientEfl.cpp:
(WebKit::ViewClientEfl::ViewClientEfl): Ditto.
Tools: [EFL][WK2] Buildfix after <a href="http://trac.webkit.org/projects/webkit/changeset/160104">r160104</a>
https://bugs.webkit.org/show_bug.cgi?id=125231
Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-12-04
Reviewed by Anders Carlsson.
* TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
(TestWebKitAPI::TEST): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
* TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
(TestWebKitAPI::setViewClient): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFullscreenClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitRequestManagerClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitTextCheckercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebInspectorcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflBatteryProvidercpp">trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflNetworkInfoProvidercpp">trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflRequestManagerClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflTextCheckerClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflVibrationClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflViewClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.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 (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><ins>+ [EFL][GTK][WK2] Remove unnecessary reinterpret_casts when setting API clients
+ https://bugs.webkit.org/show_bug.cgi?id=125231
+
+ Reviewed by Anders Carlsson.
+
+ After r159988, WKClients have to be instantiated with a specific
+ version of that client and its Base field has to used when setting it.
+ Eg:
+
+ WKFullScreenClientV0 wkClient = {
+ {
+ 0, // version
+ this, // clientInfo
+ },
+ willEnterFullScreen,
+ willExitFullScreen
+ };
+ WKViewSetFullScreenClientGtk(this, &wkClient.base);
+
+ So we don't need the reinterpret_casts introduced in r160075.
+
+ * UIProcess/API/gtk/WebKitFullscreenClient.cpp:
+ (attachFullScreenClientToView): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
+ * UIProcess/API/gtk/WebKitRequestManagerClient.cpp:
+ (attachRequestManagerClientToContext): Ditto.
+ * UIProcess/API/gtk/WebKitTextChecker.cpp:
+ (WebKitTextChecker::WebKitTextChecker): Ditto.
+ * UIProcess/API/gtk/WebKitWebInspector.cpp:
+ (webkitWebInspectorCreate): Ditto.
+ * UIProcess/efl/BatteryProvider.cpp:
+ (BatteryProvider::BatteryProvider): Ditto.
+ * UIProcess/efl/NetworkInfoProvider.cpp:
+ (NetworkInfoProvider::NetworkInfoProvider): Ditto.
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl): Ditto.
+ * UIProcess/efl/RequestManagerClientEfl.cpp:
+ (WebKit::RequestManagerClientEfl::RequestManagerClientEfl): Ditto.
+ * UIProcess/efl/TextCheckerClientEfl.cpp:
+ (TextCheckerClientEfl::TextCheckerClientEfl): Ditto.
+ * UIProcess/efl/VibrationClientEfl.cpp:
+ (VibrationClientEfl::VibrationClientEfl): Ditto.
+ * UIProcess/efl/ViewClientEfl.cpp:
+ (WebKit::ViewClientEfl::ViewClientEfl): Ditto.
+
+2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
+
</ins><span class="cx"> [GTK][WK2] Fix build after r160104
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125240
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFullscreenClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFullscreenClient.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -45,6 +45,6 @@
</span><span class="cx"> willEnterFullScreen,
</span><span class="cx"> willExitFullScreen
</span><span class="cx"> };
</span><del>- WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), reinterpret_cast<WKFullScreenClientGtkBase*>(&wkFullScreenClient));
</del><ins>+ WKViewSetFullScreenClientGtk(toAPI(WEBKIT_WEB_VIEW_BASE(webView)), &wkFullScreenClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitRequestManagerClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -48,6 +48,6 @@
</span><span class="cx"> didReceiveURIRequest,
</span><span class="cx"> didFailToLoadURIRequest
</span><span class="cx"> };
</span><del>- WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), reinterpret_cast<WKSoupRequestManagerClientBase*>(&wkRequestManagerClient));
</del><ins>+ WKSoupRequestManagerSetClient(toAPI(webkitWebContextGetRequestManager(webContext)), &wkRequestManagerClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitTextCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> learnWordCallback,
</span><span class="cx"> ignoreWordCallback,
</span><span class="cx"> };
</span><del>- WKTextCheckerSetClient(reinterpret_cast<WKTextCheckerClientBase*>(&wkTextCheckerClient));
</del><ins>+ WKTextCheckerSetClient(&wkTextCheckerClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebKitTextChecker::checkSpellingOfString(const String& string, int& misspellingLocation, int& misspellingLength)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> detach,
</span><span class="cx"> didChangeAttachedHeight
</span><span class="cx"> };
</span><del>- WKInspectorSetInspectorClientGtk(toAPI(webInspector), reinterpret_cast<WKInspectorClientGtkBase*>(&wkInspectorClientGtk));
</del><ins>+ WKInspectorSetInspectorClientGtk(toAPI(webInspector), &wkInspectorClientGtk.base);
</ins><span class="cx">
</span><span class="cx"> return inspector;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflBatteryProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> stopUpdatingCallback
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WKBatteryManagerSetProvider(m_batteryManager.get(), reinterpret_cast<WKBatteryProviderBase*>(&wkBatteryProvider));
</del><ins>+ WKBatteryManagerSetProvider(m_batteryManager.get(), &wkBatteryProvider.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BatteryProvider::startUpdating()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflNetworkInfoProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/NetworkInfoProvider.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> isMeteredCallback
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, reinterpret_cast<WKNetworkInfoProviderBase*>(&wkNetworkInfoProvider));
</del><ins>+ WKNetworkInfoManagerSetProvider(wkNetworkInfoManager, &wkNetworkInfoProvider.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkInfoProvider::~NetworkInfoProvider()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflRequestManagerClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> wkRequestManagerClient.base.clientInfo = this;
</span><span class="cx"> wkRequestManagerClient.didReceiveURIRequest = didReceiveURIRequest;
</span><span class="cx">
</span><del>- WKSoupRequestManagerSetClient(m_soupRequestManager.get(), reinterpret_cast<WKSoupRequestManagerClientBase*>(&wkRequestManagerClient));
</del><ins>+ WKSoupRequestManagerSetClient(m_soupRequestManager.get(), &wkRequestManagerClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RequestManagerClientEfl::~RequestManagerClientEfl()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflTextCheckerClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> learnWordCallback,
</span><span class="cx"> ignoreWordCallback
</span><span class="cx"> };
</span><del>- WKTextCheckerSetClient(reinterpret_cast<WKTextCheckerClientBase*>(&wkTextCheckerClient));
</del><ins>+ WKTextCheckerSetClient(&wkTextCheckerClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextCheckerClientEfl& TextCheckerClientEfl::instance()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflVibrationClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/VibrationClientEfl.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> vibrateCallback,
</span><span class="cx"> cancelVibrationCallback
</span><span class="cx"> };
</span><del>- WKVibrationSetProvider(wkVibration, reinterpret_cast<WKVibrationProviderBase*>(&wkVibrationProvider));
</del><ins>+ WKVibrationSetProvider(wkVibration, &wkVibrationProvider.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VibrationClientEfl::~VibrationClientEfl()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflViewClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> viewClient.doneWithTouchEvent = doneWithTouchEvent;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WKViewSetViewClient(m_view->wkView(), reinterpret_cast<WKViewClientBase*>(&viewClient));
</del><ins>+ WKViewSetViewClient(m_view->wkView(), &viewClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ViewClientEfl::~ViewClientEfl()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Tools/ChangeLog 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
+
+ [EFL][WK2] Buildfix after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125231
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
+ (TestWebKitAPI::TEST): reinterpret_cast<WKFooClientBase*>(&client) -> &client.base
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
+ (TestWebKitAPI::setViewClient): Ditto.
+
</ins><span class="cx"> 2013-12-04 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> check-webkit-style detected some ternary statements as initialization lists
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CoordinatedGraphicsWKViewIsActiveSetIsActivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> viewClient.base.version = 0;
</span><span class="cx"> viewClient.webProcessCrashed = webProcessCrashed;
</span><span class="cx"> viewClient.webProcessDidRelaunch = webProcessRelaunched;
</span><del>- WKViewSetViewClient(view.get(), reinterpret_cast<WKViewClientBase*>(&viewClient));
</del><ins>+ WKViewSetViewClient(view.get(), &viewClient.base);
</ins><span class="cx">
</span><span class="cx"> WKViewInitialize(view.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2eflWKViewClientWebProcessCallbackscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp (160127 => 160128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp 2013-12-04 22:24:55 UTC (rev 160127)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp 2013-12-04 22:42:46 UTC (rev 160128)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> viewClient.webProcessCrashed = webProcessCrashed;
</span><span class="cx"> viewClient.webProcessDidRelaunch = webProcessDidRelaunch;
</span><span class="cx">
</span><del>- WKViewSetViewClient(view, reinterpret_cast<WKViewClientBase*>(&viewClient));
</del><ins>+ WKViewSetViewClient(view, &viewClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, WKViewClientWebProcessCallbacks)
</span></span></pre>
</div>
</div>
</body>
</html>