<!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>[191415] 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/191415">191415</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-10-21 17:07:27 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>API-ify the FindMatches client
https://bugs.webkit.org/show_bug.cgi?id=150422
Reviewed by Anders Carlsson.
* UIProcess/API/APIFindMatchesClient.h: Renamed from Source/WebKit2/UIProcess/WebFindClient.h.
(API::FindMatchesClient::~FindMatchesClient):
(API::FindMatchesClient::didFindStringMatches):
(API::FindMatchesClient::didGetImageForMatchResult):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageFindMatchesClient):
* UIProcess/WebFindClient.cpp: Removed.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setFindMatchesClient):
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::didGetImageForFindMatch):
(WebKit::WebPageProxy::didFindStringMatches):
(WebKit::WebPageProxy::initializeFindMatchesClient): Deleted.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::findMatchesClient):
* WebKit2.xcodeproj/project.pbxproj:</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="#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="#trunkSourceWebKit2UIProcessAPIAPIFindMatchesClienth">trunk/Source/WebKit2/UIProcess/API/APIFindMatchesClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebFindClientcpp">trunk/Source/WebKit2/UIProcess/WebFindClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFindClienth">trunk/Source/WebKit2/UIProcess/WebFindClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-10-21 Tim Horton <timothy_horton@apple.com>
+
+ API-ify the FindMatches client
+ https://bugs.webkit.org/show_bug.cgi?id=150422
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/APIFindMatchesClient.h: Renamed from Source/WebKit2/UIProcess/WebFindClient.h.
+ (API::FindMatchesClient::~FindMatchesClient):
+ (API::FindMatchesClient::didFindStringMatches):
+ (API::FindMatchesClient::didGetImageForMatchResult):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageFindMatchesClient):
+ * UIProcess/WebFindClient.cpp: Removed.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::setFindMatchesClient):
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::didGetImageForFindMatch):
+ (WebKit::WebPageProxy::didFindStringMatches):
+ (WebKit::WebPageProxy::initializeFindMatchesClient): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::findMatchesClient):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-10-21 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> WebProcess crashes when accessibility bundle is not found.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIFindMatchesClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIFindMatchesClient.h (0 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIFindMatchesClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIFindMatchesClient.h 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2015 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 APIFindMatchesClient_h
+#define APIFindMatchesClient_h
+
+#include <WebCore/IntRect.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+class WebImage;
+class WebPageProxy;
+}
+
+namespace API {
+
+class FindMatchesClient {
+public:
+ virtual ~FindMatchesClient() { }
+
+ virtual void didFindStringMatches(WebKit::WebPageProxy*, const WTF::String&, const WTF::Vector<WTF::Vector<WebCore::IntRect>>&, int32_t) { }
+ virtual void didGetImageForMatchResult(WebKit::WebPageProxy*, WebKit::WebImage*, int32_t) { }
+};
+
+} // namespace API
+
+#endif // APIFindMatchesClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx"> #include "APIData.h"
</span><span class="cx"> #include "APIDictionary.h"
</span><span class="cx"> #include "APIFindClient.h"
</span><ins>+#include "APIFindMatchesClient.h"
</ins><span class="cx"> #include "APIFrameInfo.h"
</span><ins>+#include "APIGeometry.h"
</ins><span class="cx"> #include "APIHitTestResult.h"
</span><span class="cx"> #include "APILoaderClient.h"
</span><span class="cx"> #include "APINavigationAction.h"
</span><span class="lines">@@ -57,6 +59,7 @@
</span><span class="cx"> #include "WKPluginInformation.h"
</span><span class="cx"> #include "WebBackForwardList.h"
</span><span class="cx"> #include "WebFormClient.h"
</span><ins>+#include "WebImage.h"
</ins><span class="cx"> #include "WebInspectorProxy.h"
</span><span class="cx"> #include "WebOpenPanelParameters.h"
</span><span class="cx"> #include "WebOpenPanelResultListenerProxy.h"
</span><span class="lines">@@ -113,6 +116,14 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+template<> struct ClientTraits<WKPageFindClientBase> {
+ typedef std::tuple<WKPageFindClientV0> Versions;
+};
+
+template<> struct ClientTraits<WKPageFindMatchesClientBase> {
+ typedef std::tuple<WKPageFindMatchesClientV0> Versions;
+};
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKTypeID WKPageGetTypeID()
</span><span class="lines">@@ -914,7 +925,45 @@
</span><span class="cx">
</span><span class="cx"> void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClientBase* wkClient)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeFindMatchesClient(wkClient);
</del><ins>+ class FindMatchesClient : public API::Client<WKPageFindMatchesClientBase>, public API::FindMatchesClient {
+ public:
+ explicit FindMatchesClient(const WKPageFindMatchesClientBase* client)
+ {
+ initialize(client);
+ }
+
+ private:
+ virtual void didFindStringMatches(WebPageProxy* page, const String& string, const Vector<Vector<WebCore::IntRect>>& matchRects, int32_t index) override
+ {
+ if (!m_client.didFindStringMatches)
+ return;
+
+ Vector<RefPtr<API::Object>> matches;
+ matches.reserveInitialCapacity(matchRects.size());
+
+ for (const auto& rects : matchRects) {
+ Vector<RefPtr<API::Object>> apiRects;
+ apiRects.reserveInitialCapacity(rects.size());
+
+ for (const auto& rect : rects)
+ apiRects.uncheckedAppend(API::Rect::create(toAPI(rect)));
+
+ matches.uncheckedAppend(API::Array::create(WTF::move(apiRects)));
+ }
+
+ m_client.didFindStringMatches(toAPI(page), toAPI(string.impl()), toAPI(API::Array::create(WTF::move(matches)).ptr()), index, m_client.base.clientInfo);
+ }
+
+ virtual void didGetImageForMatchResult(WebPageProxy* page, WebImage* image, int32_t index) override
+ {
+ if (!m_client.didGetImageForMatchResult)
+ return;
+
+ m_client.didGetImageForMatchResult(toAPI(page), toAPI(image), index, m_client.base.clientInfo);
+ }
+ };
+
+ toImpl(pageRef)->setFindMatchesClient(std::make_unique<FindMatchesClient>(wkClient));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageSetPageInjectedBundleClient(WKPageRef pageRef, const WKPageInjectedBundleClientBase* wkClient)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFindClientcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebFindClient.cpp (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFindClient.cpp 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/UIProcess/WebFindClient.cpp 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#include "config.h"
-#include "WebFindClient.h"
-
-#include "WKAPICast.h"
-#include "WebImage.h"
-#include "WebPageProxy.h"
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-void WebFindClient::didFindString(WebPageProxy* page, const String& string, uint32_t matchCount, int32_t)
-{
- if (!m_client.didFindString)
- return;
-
- m_client.didFindString(toAPI(page), toAPI(string.impl()), matchCount, m_client.base.clientInfo);
-}
-
-void WebFindClient::didFailToFindString(WebPageProxy* page, const String& string)
-{
- if (!m_client.didFailToFindString)
- return;
-
- m_client.didFailToFindString(toAPI(page), toAPI(string.impl()), m_client.base.clientInfo);
-}
-
-void WebFindClient::didCountStringMatches(WebPageProxy* page, const String& string, uint32_t matchCount)
-{
- if (!m_client.didCountStringMatches)
- return;
-
- m_client.didCountStringMatches(toAPI(page), toAPI(string.impl()), matchCount, m_client.base.clientInfo);
-}
-
-void WebFindMatchesClient::didFindStringMatches(WebPageProxy* page, const String& string, API::Array* matches, int firstIndex)
-{
- if (!m_client.didFindStringMatches)
- return;
-
- m_client.didFindStringMatches(toAPI(page), toAPI(string.impl()), toAPI(matches), firstIndex, m_client.base.clientInfo);
-}
-
-void WebFindMatchesClient::didGetImageForMatchResult(WebPageProxy* page, WebImage* image, uint32_t index)
-{
- if (!m_client.didGetImageForMatchResult)
- return;
- m_client.didGetImageForMatchResult(toAPI(page), toAPI(image), index, m_client.base.clientInfo);
-}
-
-} // namespace WebKit
-
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFindClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebFindClient.h (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFindClient.h 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/UIProcess/WebFindClient.h 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 WebFindClient_h
-#define WebFindClient_h
-
-#include "APIClient.h"
-#include "WKPage.h"
-#include <wtf/Forward.h>
-
-namespace API {
-class Array;
-
-template<> struct ClientTraits<WKPageFindClientBase> {
- typedef std::tuple<WKPageFindClientV0> Versions;
-};
-
-template<> struct ClientTraits<WKPageFindMatchesClientBase> {
- typedef std::tuple<WKPageFindMatchesClientV0> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebPageProxy;
-class WebImage;
-
-class WebFindClient : public API::Client<WKPageFindClientBase> {
-public:
- void didFindString(WebPageProxy*, const String&, uint32_t matchCount, int32_t matchIndex);
- void didFailToFindString(WebPageProxy*, const String&);
- void didCountStringMatches(WebPageProxy*, const String&, uint32_t matchCount);
-};
-
-class WebFindMatchesClient : public API::Client<WKPageFindMatchesClientBase> {
-public:
- void didFindStringMatches(WebPageProxy*, const String&, API::Array*, int);
- void didGetImageForMatchResult(WebPageProxy*, WebImage*, uint32_t);
-};
-
-} // namespace WebKit
-
-#endif // WebFindClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIContextMenuClient.h"
</span><span class="cx"> #include "APIFindClient.h"
</span><ins>+#include "APIFindMatchesClient.h"
</ins><span class="cx"> #include "APIFormClient.h"
</span><span class="cx"> #include "APIFrameInfo.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="lines">@@ -310,6 +311,7 @@
</span><span class="cx"> , m_formClient(std::make_unique<API::FormClient>())
</span><span class="cx"> , m_uiClient(std::make_unique<API::UIClient>())
</span><span class="cx"> , m_findClient(std::make_unique<API::FindClient>())
</span><ins>+ , m_findMatchesClient(std::make_unique<API::FindMatchesClient>())
</ins><span class="cx"> , m_diagnosticLoggingClient(std::make_unique<API::DiagnosticLoggingClient>())
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> , m_contextMenuClient(std::make_unique<API::ContextMenuClient>())
</span><span class="lines">@@ -622,9 +624,14 @@
</span><span class="cx"> m_findClient = WTF::move(findClient);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::initializeFindMatchesClient(const WKPageFindMatchesClientBase* client)
</del><ins>+void WebPageProxy::setFindMatchesClient(std::unique_ptr<API::FindMatchesClient> findMatchesClient)
</ins><span class="cx"> {
</span><del>- m_findMatchesClient.initialize(client);
</del><ins>+ if (!findMatchesClient) {
+ m_findMatchesClient = std::make_unique<API::FindMatchesClient>();
+ return;
+ }
+
+ m_findMatchesClient = WTF::move(findMatchesClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setDiagnosticLoggingClient(std::unique_ptr<API::DiagnosticLoggingClient> diagnosticLoggingClient)
</span><span class="lines">@@ -835,7 +842,7 @@
</span><span class="cx"> m_uiPopupMenuClient.initialize(nullptr);
</span><span class="cx"> #endif
</span><span class="cx"> m_findClient = std::make_unique<API::FindClient>();
</span><del>- m_findMatchesClient.initialize(nullptr);
</del><ins>+ m_findMatchesClient = std::make_unique<API::FindMatchesClient>();
</ins><span class="cx"> m_diagnosticLoggingClient = std::make_unique<API::DiagnosticLoggingClient>();
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> m_contextMenuClient = std::make_unique<API::ContextMenuClient>();
</span><span class="lines">@@ -4034,7 +4041,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didGetImageForFindMatch(const ShareableBitmap::Handle& contentImageHandle, uint32_t matchIndex)
</span><span class="cx"> {
</span><del>- m_findMatchesClient.didGetImageForMatchResult(this, WebImage::create(ShareableBitmap::create(contentImageHandle)).get(), matchIndex);
</del><ins>+ m_findMatchesClient->didGetImageForMatchResult(this, WebImage::create(ShareableBitmap::create(contentImageHandle)).get(), matchIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setTextIndicator(const TextIndicatorData& indicatorData, uint64_t lifetime)
</span><span class="lines">@@ -4072,20 +4079,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didFindStringMatches(const String& string, const Vector<Vector<WebCore::IntRect>>& matchRects, int32_t firstIndexAfterSelection)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<API::Object>> matches;
- matches.reserveInitialCapacity(matchRects.size());
-
- for (const auto& rects : matchRects) {
- Vector<RefPtr<API::Object>> apiRects;
- apiRects.reserveInitialCapacity(rects.size());
-
- for (const auto& rect : rects)
- apiRects.uncheckedAppend(API::Rect::create(toAPI(rect)));
-
- matches.uncheckedAppend(API::Array::create(WTF::move(apiRects)));
- }
-
- m_findMatchesClient.didFindStringMatches(this, string, API::Array::create(WTF::move(matches)).ptr(), firstIndexAfterSelection);
</del><ins>+ m_findMatchesClient->didFindStringMatches(this, string, matchRects, firstIndexAfterSelection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didFailToFindString(const String& string)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> #include "WebColorPicker.h"
</span><span class="cx"> #include "WebContextMenuItemData.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebFindClient.h"
</del><span class="cx"> #include "WebFrameProxy.h"
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span><span class="cx"> #include "WebPageDiagnosticLoggingClient.h"
</span><span class="lines">@@ -129,6 +128,7 @@
</span><span class="cx"> namespace API {
</span><span class="cx"> class ContextMenuClient;
</span><span class="cx"> class FindClient;
</span><ins>+class FindMatchesClient;
</ins><span class="cx"> class FormClient;
</span><span class="cx"> class HistoryClient;
</span><span class="cx"> class LoaderClient;
</span><span class="lines">@@ -332,9 +332,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> API::FindClient& findClient() { return *m_findClient; }
</span><span class="cx"> void setFindClient(std::unique_ptr<API::FindClient>);
</span><ins>+ API::FindMatchesClient& findMatchesClient() { return *m_findMatchesClient; }
+ void setFindMatchesClient(std::unique_ptr<API::FindMatchesClient>);
</ins><span class="cx"> API::DiagnosticLoggingClient& diagnosticLoggingClient() { return *m_diagnosticLoggingClient; }
</span><span class="cx"> void setDiagnosticLoggingClient(std::unique_ptr<API::DiagnosticLoggingClient>);
</span><del>- void initializeFindMatchesClient(const WKPageFindMatchesClientBase*);
</del><span class="cx"> void setFormClient(std::unique_ptr<API::FormClient>);
</span><span class="cx"> void setNavigationClient(std::unique_ptr<API::NavigationClient>);
</span><span class="cx"> void setHistoryClient(std::unique_ptr<API::HistoryClient>);
</span><span class="lines">@@ -1476,7 +1477,7 @@
</span><span class="cx"> WebUIPopupMenuClient m_uiPopupMenuClient;
</span><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<API::FindClient> m_findClient;
</span><del>- WebFindMatchesClient m_findMatchesClient;
</del><ins>+ std::unique_ptr<API::FindMatchesClient> m_findMatchesClient;
</ins><span class="cx"> std::unique_ptr<API::DiagnosticLoggingClient> m_diagnosticLoggingClient;
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> std::unique_ptr<API::ContextMenuClient> m_contextMenuClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (191414 => 191415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-22 00:02:01 UTC (rev 191414)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-22 00:07:27 UTC (rev 191415)
</span><span class="lines">@@ -222,8 +222,6 @@
</span><span class="cx"> 1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */; };
</span><span class="cx"> 1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; };
</span><span class="cx"> 1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
</span><del>- 1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */; };
- 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3DD201125E5A1F004515E6 /* WebFindClient.h */; };
</del><span class="cx"> 1A3DD206125E5A2F004515E6 /* APIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3DD205125E5A2F004515E6 /* APIClient.h */; };
</span><span class="cx"> 1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */; };
</span><span class="cx"> 1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */; };
</span><span class="lines">@@ -616,10 +614,10 @@
</span><span class="cx"> 2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */; };
</span><span class="cx"> 2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */; };
</span><span class="cx"> 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */; };
</span><del>- 2D50365E1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D50365D1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm */; settings = {ASSET_TAGS = (); }; };
- 2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D50366A1BCDE17900E20BB3 /* NativeWebGestureEvent.h */; settings = {ASSET_TAGS = (); }; };
- 2D5036751BCED19F00E20BB3 /* WebGestureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D5036731BCED19F00E20BB3 /* WebGestureEvent.cpp */; settings = {ASSET_TAGS = (); }; };
- 2D5036761BCED19F00E20BB3 /* WebGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5036741BCED19F00E20BB3 /* WebGestureEvent.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 2D50365E1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D50365D1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm */; };
+ 2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D50366A1BCDE17900E20BB3 /* NativeWebGestureEvent.h */; };
+ 2D5036751BCED19F00E20BB3 /* WebGestureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D5036731BCED19F00E20BB3 /* WebGestureEvent.cpp */; };
+ 2D5036761BCED19F00E20BB3 /* WebGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5036741BCED19F00E20BB3 /* WebGestureEvent.h */; };
</ins><span class="cx"> 2D5AB62E1A69D6FB0014A9CB /* MessageRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5AB62B1A69D6FB0014A9CB /* MessageRecorder.h */; };
</span><span class="cx"> 2D5AB62F1A69D6FB0014A9CB /* MessageRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D5AB62C1A69D6FB0014A9CB /* MessageRecorder.cpp */; };
</span><span class="cx"> 2D5AB6301A69D6FB0014A9CB /* MessageRecorderProbes.d in Sources */ = {isa = PBXBuildFile; fileRef = 2D5AB62D1A69D6FB0014A9CB /* MessageRecorderProbes.d */; };
</span><span class="lines">@@ -680,6 +678,7 @@
</span><span class="cx"> 2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */; };
</span><span class="cx"> 2DD12A081A8177F3002C74E6 /* WKPageRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2DD13BD518F7DADD00E130A1 /* FindControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD13BD318F7DADD00E130A1 /* FindControllerIOS.mm */; };
</span><ins>+ 2DD67A2E1BD819730053B251 /* APIFindMatchesClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */; };
</ins><span class="cx"> 2DD9EB2D1A6F012500BB1267 /* APINavigationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD9EB2C1A6F012500BB1267 /* APINavigationClient.h */; };
</span><span class="cx"> 2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */; };
</span><span class="cx"> 2DDE0AFB18298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */; };
</span><span class="lines">@@ -694,10 +693,10 @@
</span><span class="cx"> 2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */; };
</span><span class="cx"> 2DF9EEEC1A7836EE00B6CFBE /* APINavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */; };
</span><span class="cx"> 2DF9EEEE1A786EAD00B6CFBE /* APINavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */; };
</span><ins>+ 2DFC7DBB1BCCC19500C1548C /* WebViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */; };
+ 2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */; };
</ins><span class="cx"> 2E0B8A7A1BC59A590044B32D /* _WKFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2E7A944A1BBD97C300945547 /* _WKFocusedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 2DFC7DBB1BCCC19500C1548C /* WebViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */; settings = {ASSET_TAGS = (); }; };
- 2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */; settings = {ASSET_TAGS = (); }; };
</del><span class="cx"> 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
</span><span class="cx"> 310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099968146C71F50029DEB9 /* WebNotificationClient.h */; };
</span><span class="cx"> 312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2333,8 +2332,6 @@
</span><span class="cx"> 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentCoders.cpp; sourceTree = "<group>"; };
</span><del>- 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFindClient.cpp; sourceTree = "<group>"; };
- 1A3DD201125E5A1F004515E6 /* WebFindClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFindClient.h; sourceTree = "<group>"; };
</del><span class="cx"> 1A3DD205125E5A2F004515E6 /* APIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlatformStrategies.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPlatformStrategies.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2846,6 +2843,7 @@
</span><span class="cx"> 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewContentProviderRegistry.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageRenderingProgressEvents.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DD13BD318F7DADD00E130A1 /* FindControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FindControllerIOS.mm; path = ios/FindControllerIOS.mm; sourceTree = "<group>"; };
</span><ins>+ 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFindMatchesClient.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2DD9EB2C1A6F012500BB1267 /* APINavigationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreePropertyApplier.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreePropertyApplier.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -2860,10 +2858,10 @@
</span><span class="cx"> 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationAction.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationResponse.h; sourceTree = "<group>"; };
</span><del>- 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormDelegate.h; sourceTree = "<group>"; };
- 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKFocusedElementInfo.h; sourceTree = "<group>"; };
</del><span class="cx"> 2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewImpl.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewImpl.mm; sourceTree = "<group>"; };
</span><ins>+ 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormDelegate.h; sourceTree = "<group>"; };
+ 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKFocusedElementInfo.h; sourceTree = "<group>"; };
</ins><span class="cx"> 31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNotificationProvider.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6191,8 +6189,6 @@
</span><span class="cx"> BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */,
</span><span class="cx"> BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */,
</span><span class="cx"> BCA0EF9D12332642007D3CFB /* WebEditCommandProxy.h */,
</span><del>- 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */,
- 1A3DD201125E5A1F004515E6 /* WebFindClient.h */,
</del><span class="cx"> BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */,
</span><span class="cx"> BCE469501214E6CB000B98EB /* WebFormClient.h */,
</span><span class="cx"> BCE469511214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp */,
</span><span class="lines">@@ -6272,6 +6268,7 @@
</span><span class="cx"> 83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */,
</span><span class="cx"> 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */,
</span><span class="cx"> 00B9661518E24CBA00CE1F88 /* APIFindClient.h */,
</span><ins>+ 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */,
</ins><span class="cx"> 37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */,
</span><span class="cx"> 2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */,
</span><span class="cx"> 2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */,
</span><span class="lines">@@ -7842,6 +7839,7 @@
</span><span class="cx"> 31A67E0D165B2A99006CBA66 /* PlugInAutoStartProvider.h in Headers */,
</span><span class="cx"> 1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */,
</span><span class="cx"> 1AA56F2911E92BC80061B882 /* PluginController.h in Headers */,
</span><ins>+ 2DD67A2E1BD819730053B251 /* APIFindMatchesClient.h in Headers */,
</ins><span class="cx"> 1A8EF4CB1252403700F7067F /* PluginControllerProxy.h in Headers */,
</span><span class="cx"> 1A8EF96F1252AF6B00F7067F /* PluginControllerProxyMessages.h in Headers */,
</span><span class="cx"> 1A179780137EE82C00F97D45 /* PluginCreationParameters.h in Headers */,
</span><span class="lines">@@ -8002,7 +8000,6 @@
</span><span class="cx"> BC032DB910F4380F0058C15A /* WebEvent.h in Headers */,
</span><span class="cx"> BC032DBB10F4380F0058C15A /* WebEventConversion.h in Headers */,
</span><span class="cx"> BC111B5D112F629800337BAB /* WebEventFactory.h in Headers */,
</span><del>- 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */,
</del><span class="cx"> 1A90C1EE1264FD50003E44D4 /* WebFindOptions.h in Headers */,
</span><span class="cx"> BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */,
</span><span class="cx"> BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
</span><span class="lines">@@ -9847,7 +9844,6 @@
</span><span class="cx"> C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
</span><span class="cx"> BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
</span><span class="cx"> BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */,
</span><del>- 1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */,
</del><span class="cx"> BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */,
</span><span class="cx"> BCE469551214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp in Sources */,
</span><span class="cx"> BC111ADD112F5B9300337BAB /* WebFrame.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>