<!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>[167330] 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/167330">167330</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-04-15 16:05:28 -0700 (Tue, 15 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Introduce API::FormClient
https://bugs.webkit.org/show_bug.cgi?id=131714

Reviewed by Tim Horton.

* UIProcess/API/APIFormClient.h: Added.
(API::FormClient::~FormClient):
(API::FormClient::willSubmitForm):

* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageFormClient): Changed to create a WebFormClient and call
WebPageProxy::setFormClient.

* UIProcess/WebFormClient.cpp:
(WebKit::WebFormClient::WebFormClient): Added a constructor from WKPageFormClientBase.
* UIProcess/WebFormClient.h: Added inheritance from API::FormClient, marked overrides as
such.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy): Initialize m_formClient member.
(WebKit::WebPageProxy::setFormClient): Added. Updates m_formClient.
(WebKit::WebPageProxy::close): Updated code to clear m_formClient.
(WebKit::WebPageProxy::willSubmitForm): Updated for type change.
(WebKit::WebPageProxy::initializeFormClient): Deleted.
* UIProcess/WebPageProxy.h:

* WebKit2.xcodeproj/project.pbxproj: Added reference to new file.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFormClientcpp">trunk/Source/WebKit2/UIProcess/WebFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFormClienth">trunk/Source/WebKit2/UIProcess/WebFormClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIFormClienth">trunk/Source/WebKit2/UIProcess/API/APIFormClient.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/ChangeLog        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-04-15  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        Introduce API::FormClient
+        https://bugs.webkit.org/show_bug.cgi?id=131714
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/APIFormClient.h: Added.
+        (API::FormClient::~FormClient):
+        (API::FormClient::willSubmitForm):
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageFormClient): Changed to create a WebFormClient and call
+        WebPageProxy::setFormClient.
+
+        * UIProcess/WebFormClient.cpp:
+        (WebKit::WebFormClient::WebFormClient): Added a constructor from WKPageFormClientBase.
+        * UIProcess/WebFormClient.h: Added inheritance from API::FormClient, marked overrides as
+        such.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy): Initialize m_formClient member.
+        (WebKit::WebPageProxy::setFormClient): Added. Updates m_formClient.
+        (WebKit::WebPageProxy::close): Updated code to clear m_formClient.
+        (WebKit::WebPageProxy::willSubmitForm): Updated for type change.
+        (WebKit::WebPageProxy::initializeFormClient): Deleted.
+        * UIProcess/WebPageProxy.h:
+
+        * WebKit2.xcodeproj/project.pbxproj: Added reference to new file.
+
</ins><span class="cx"> 2014-04-15  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS WK2] Pages often blank on first load if page loaded by typing the URL
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIFormClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIFormClient.h (0 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIFormClient.h                                (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIFormClient.h        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIFormClient_h
+#define APIFormClient_h
+
+#include &lt;wtf/Forward.h&gt;
+#include &lt;wtf/Vector.h&gt;
+
+namespace WebKit {
+class WebFormSubmissionListenerProxy;
+class WebFrameProxy;
+class WebPageProxy;
+}
+
+namespace API {
+class Object;
+
+class FormClient {
+public:
+    virtual ~FormClient() { }
+
+    virtual bool willSubmitForm(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebFrameProxy* sourceFrame, const Vector&lt;std::pair&lt;WTF::String, WTF::String&gt;&gt;&amp; textFieldValues, API::Object* userData, WebKit::WebFormSubmissionListenerProxy*)
+    {
+        UNUSED_PARAM(sourceFrame);
+        UNUSED_PARAM(textFieldValues);
+        UNUSED_PARAM(userData);
+        return false;
+    }
+};
+
+} // namespace API
+
+#endif // APIFormClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include &quot;WKPagePolicyClientInternal.h&quot;
</span><span class="cx"> #include &quot;WKPluginInformation.h&quot;
</span><span class="cx"> #include &quot;WebBackForwardList.h&quot;
</span><ins>+#include &quot;WebFormClient.h&quot;
</ins><span class="cx"> #include &quot;WebPageMessages.h&quot;
</span><span class="cx"> #include &quot;WebPageProxy.h&quot;
</span><span class="cx"> #include &quot;WebProcessProxy.h&quot;
</span><span class="lines">@@ -740,7 +741,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClientBase* wkClient)
</span><span class="cx"> {
</span><del>-    toImpl(pageRef)-&gt;initializeFormClient(wkClient);
</del><ins>+    toImpl(pageRef)-&gt;setFormClient(std::make_unique&lt;WebFormClient&gt;(wkClient));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClientBase* wkClient)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.cpp (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFormClient.cpp        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.cpp        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -32,6 +32,11 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><ins>+WebFormClient::WebFormClient(const WKPageFormClientBase* wkClient)
+{
+    initialize(wkClient);
+}
+
</ins><span class="cx"> bool WebFormClient::willSubmitForm(WebPageProxy* page, WebFrameProxy* frame, WebFrameProxy* sourceFrame, const Vector&lt;std::pair&lt;String, String&gt;&gt;&amp; textFieldValues, API::Object* userData, WebFormSubmissionListenerProxy* listener)
</span><span class="cx"> {
</span><span class="cx">     if (!m_client.willSubmitForm)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFormClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.h (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFormClient.h        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.h        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -27,14 +27,10 @@
</span><span class="cx"> #define WebFormClient_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;APIClient.h&quot;
</span><del>-#include &quot;WKPage.h&quot;
-#include &lt;utility&gt;
-#include &lt;wtf/Forward.h&gt;
-#include &lt;wtf/Vector.h&gt;
</del><ins>+#include &quot;APIFormClient.h&quot;
+#include &quot;WKPageFormClient.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> namespace API {
</span><del>-class Object;
-
</del><span class="cx"> template&lt;&gt; struct ClientTraits&lt;WKPageFormClientBase&gt; {
</span><span class="cx">     typedef std::tuple&lt;WKPageFormClientV0&gt; Versions;
</span><span class="cx"> };
</span><span class="lines">@@ -42,13 +38,11 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><del>-class WebPageProxy;
-class WebFrameProxy;
-class WebFormSubmissionListenerProxy;
-
-class WebFormClient : public API::Client&lt;WKPageFormClientBase&gt; {
</del><ins>+class WebFormClient : public API::FormClient, API::Client&lt;WKPageFormClientBase&gt; {
</ins><span class="cx"> public:
</span><del>-    bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector&lt;std::pair&lt;String, String&gt;&gt;&amp; textFieldValues, API::Object* userData, WebFormSubmissionListenerProxy*);
</del><ins>+    explicit WebFormClient(const WKPageFormClientBase*);
+
+    virtual bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector&lt;std::pair&lt;String, String&gt;&gt;&amp; textFieldValues, API::Object* userData, WebFormSubmissionListenerProxy*) override;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;APIArray.h&quot;
</span><span class="cx"> #include &quot;APIFindClient.h&quot;
</span><ins>+#include &quot;APIFormClient.h&quot;
</ins><span class="cx"> #include &quot;APILoaderClient.h&quot;
</span><span class="cx"> #include &quot;APIPolicyClient.h&quot;
</span><span class="cx"> #include &quot;APIUIClient.h&quot;
</span><span class="lines">@@ -256,6 +257,7 @@
</span><span class="cx">     : m_pageClient(pageClient)
</span><span class="cx">     , m_loaderClient(std::make_unique&lt;API::LoaderClient&gt;())
</span><span class="cx">     , m_policyClient(std::make_unique&lt;API::PolicyClient&gt;())
</span><ins>+    , m_formClient(std::make_unique&lt;API::FormClient&gt;())
</ins><span class="cx">     , m_uiClient(std::make_unique&lt;API::UIClient&gt;())
</span><span class="cx">     , m_findClient(std::make_unique&lt;API::FindClient&gt;())
</span><span class="cx">     , m_process(process)
</span><span class="lines">@@ -460,9 +462,14 @@
</span><span class="cx">     m_policyClient = std::move(policyClient);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::initializeFormClient(const WKPageFormClientBase* formClient)
</del><ins>+void WebPageProxy::setFormClient(std::unique_ptr&lt;API::FormClient&gt; formClient)
</ins><span class="cx"> {
</span><del>-    m_formClient.initialize(formClient);
</del><ins>+    if (!formClient) {
+        m_formClient = std::make_unique&lt;API::FormClient&gt;();
+        return;
+    }
+
+    m_formClient = std::move(formClient);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPageProxy::setUIClient(std::unique_ptr&lt;API::UIClient&gt; uiClient)
</span><span class="lines">@@ -614,7 +621,7 @@
</span><span class="cx"> 
</span><span class="cx">     m_loaderClient = std::make_unique&lt;API::LoaderClient&gt;();
</span><span class="cx">     m_policyClient = std::make_unique&lt;API::PolicyClient&gt;();
</span><del>-    m_formClient.initialize(0);
</del><ins>+    m_formClient = std::make_unique&lt;API::FormClient&gt;();
</ins><span class="cx">     m_uiClient = std::make_unique&lt;API::UIClient&gt;();
</span><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx">     m_uiPopupMenuClient.initialize(0);
</span><span class="lines">@@ -2734,7 +2741,7 @@
</span><span class="cx">     MESSAGE_CHECK(sourceFrame);
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;WebFormSubmissionListenerProxy&gt; listener = frame-&gt;setUpFormSubmissionListenerProxy(listenerID);
</span><del>-    if (!m_formClient.willSubmitForm(this, frame, sourceFrame, textFieldValues, userData.get(), listener.get()))
</del><ins>+    if (!m_formClient-&gt;willSubmitForm(this, frame, sourceFrame, textFieldValues, userData.get(), listener.get()))
</ins><span class="cx">         listener-&gt;continueSubmission();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> #include &quot;WebContextMenuItemData.h&quot;
</span><span class="cx"> #include &quot;WebCoreArgumentCoders.h&quot;
</span><span class="cx"> #include &quot;WebFindClient.h&quot;
</span><del>-#include &quot;WebFormClient.h&quot;
</del><span class="cx"> #include &quot;WebFrameProxy.h&quot;
</span><span class="cx"> #include &quot;WebPageContextMenuClient.h&quot;
</span><span class="cx"> #include &quot;WebPageCreationParameters.h&quot;
</span><span class="lines">@@ -103,6 +102,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace API {
</span><span class="cx"> class FindClient;
</span><ins>+class FormClient;
</ins><span class="cx"> class LoaderClient;
</span><span class="cx"> class PolicyClient;
</span><span class="cx"> class UIClient;
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx">     API::FindClient&amp; findClient() { return *m_findClient; }
</span><span class="cx">     void setFindClient(std::unique_ptr&lt;API::FindClient&gt;);
</span><span class="cx">     void initializeFindMatchesClient(const WKPageFindMatchesClientBase*);
</span><del>-    void initializeFormClient(const WKPageFormClientBase*);
</del><ins>+    void setFormClient(std::unique_ptr&lt;API::FormClient&gt;);
</ins><span class="cx">     void setLoaderClient(std::unique_ptr&lt;API::LoaderClient&gt;);
</span><span class="cx">     void setPolicyClient(std::unique_ptr&lt;API::PolicyClient&gt;);
</span><span class="cx"> 
</span><span class="lines">@@ -1395,7 +1395,7 @@
</span><span class="cx">     PageClient&amp; m_pageClient;
</span><span class="cx">     std::unique_ptr&lt;API::LoaderClient&gt; m_loaderClient;
</span><span class="cx">     std::unique_ptr&lt;API::PolicyClient&gt; m_policyClient;
</span><del>-    WebFormClient m_formClient;
</del><ins>+    std::unique_ptr&lt;API::FormClient&gt; m_formClient;
</ins><span class="cx">     std::unique_ptr&lt;API::UIClient&gt; m_uiClient;
</span><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx">     WebUIPopupMenuClient m_uiPopupMenuClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (167329 => 167330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-04-15 22:36:30 UTC (rev 167329)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-04-15 23:05:28 UTC (rev 167330)
</span><span class="lines">@@ -705,6 +705,7 @@
</span><span class="cx">                 37D0B5C61845218400F6CE7D /* WKErrorRecoveryAttempting.h in Headers */ = {isa = PBXBuildFile; fileRef = 37D0B5C51845218400F6CE7D /* WKErrorRecoveryAttempting.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 37D0B5C81845232700F6CE7D /* WKErrorRecoveryAttempting.m in Sources */ = {isa = PBXBuildFile; fileRef = 37D0B5C71845232700F6CE7D /* WKErrorRecoveryAttempting.m */; };
</span><span class="cx">                 37DFA7001810BB92001F4A9F /* WKFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 37DFA6FF1810BB92001F4A9F /* WKFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><ins>+                37E25D6E18FDE5D6005D3A00 /* APIFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */; };
</ins><span class="cx">                 37F623B812A57B6200E3FDF6 /* WKFindOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 37F90DE31376560E0051CF68 /* HTTPCookieAcceptPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */; };
</span><span class="cx">                 37FC19471850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FC19461850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2529,6 +2530,7 @@
</span><span class="cx">                 37D0B5C51845218400F6CE7D /* WKErrorRecoveryAttempting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorRecoveryAttempting.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 37D0B5C71845232700F6CE7D /* WKErrorRecoveryAttempting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WKErrorRecoveryAttempting.m; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 37DFA6FF1810BB92001F4A9F /* WKFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFoundation.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFormClient.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFindOptions.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 37FC19461850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextLoadDelegatePrivate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 37FC194818510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLAuthenticationChallenge.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -5544,6 +5546,7 @@
</span><span class="cx">                                 BC111B47112F616900337BAB /* mac */,
</span><span class="cx">                                 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */,
</span><span class="cx">                                 00B9661518E24CBA00CE1F88 /* APIFindClient.h */,
</span><ins>+                                37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */,
</ins><span class="cx">                                 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */,
</span><span class="cx">                                 1A2464F21891E45100234C5B /* APILoaderClient.h */,
</span><span class="cx">                                 1AFDD3141891B54000153970 /* APIPolicyClient.h */,
</span><span class="lines">@@ -6900,6 +6903,7 @@
</span><span class="cx">                                 1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */,
</span><span class="cx">                                 1A2BB6D114117B4D000F35D4 /* PluginProcessConnectionMessages.h in Headers */,
</span><span class="cx">                                 1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
</span><ins>+                                37E25D6E18FDE5D6005D3A00 /* APIFormClient.h in Headers */,
</ins><span class="cx">                                 3743925818BC4C60001C8675 /* WKUIDelegatePrivate.h in Headers */,
</span><span class="cx">                                 1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */,
</span><span class="cx">                                 0FCB4E6618BBE3D9000FCFC9 /* WKPrintingView.h in Headers */,
</span></span></pre>
</div>
</div>

</body>
</html>