Diff
Modified: trunk/Source/WebKit2/ChangeLog (191414 => 191415)
--- 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)
@@ -1,3 +1,28 @@
+2015-10-21 Tim Horton <[email protected]>
+
+ 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:
+
2015-10-21 Enrica Casucci <[email protected]>
WebProcess crashes when accessibility bundle is not found.
Added: trunk/Source/WebKit2/UIProcess/API/APIFindMatchesClient.h (0 => 191415)
--- 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)
@@ -0,0 +1,50 @@
+/*
+ * 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
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191414 => 191415)
--- 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)
@@ -32,7 +32,9 @@
#include "APIData.h"
#include "APIDictionary.h"
#include "APIFindClient.h"
+#include "APIFindMatchesClient.h"
#include "APIFrameInfo.h"
+#include "APIGeometry.h"
#include "APIHitTestResult.h"
#include "APILoaderClient.h"
#include "APINavigationAction.h"
@@ -57,6 +59,7 @@
#include "WKPluginInformation.h"
#include "WebBackForwardList.h"
#include "WebFormClient.h"
+#include "WebImage.h"
#include "WebInspectorProxy.h"
#include "WebOpenPanelParameters.h"
#include "WebOpenPanelResultListenerProxy.h"
@@ -113,6 +116,14 @@
};
#endif
+template<> struct ClientTraits<WKPageFindClientBase> {
+ typedef std::tuple<WKPageFindClientV0> Versions;
+};
+
+template<> struct ClientTraits<WKPageFindMatchesClientBase> {
+ typedef std::tuple<WKPageFindMatchesClientV0> Versions;
+};
+
}
WKTypeID WKPageGetTypeID()
@@ -914,7 +925,45 @@
void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClientBase* wkClient)
{
- toImpl(pageRef)->initializeFindMatchesClient(wkClient);
+ 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));
}
void WKPageSetPageInjectedBundleClient(WKPageRef pageRef, const WKPageInjectedBundleClientBase* wkClient)
Deleted: trunk/Source/WebKit2/UIProcess/WebFindClient.cpp (191414 => 191415)
--- 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)
@@ -1,76 +0,0 @@
-/*
- * 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
-
Deleted: trunk/Source/WebKit2/UIProcess/WebFindClient.h (191414 => 191415)
--- 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)
@@ -1,65 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191414 => 191415)
--- 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)
@@ -30,6 +30,7 @@
#include "APIArray.h"
#include "APIContextMenuClient.h"
#include "APIFindClient.h"
+#include "APIFindMatchesClient.h"
#include "APIFormClient.h"
#include "APIFrameInfo.h"
#include "APIGeometry.h"
@@ -310,6 +311,7 @@
, m_formClient(std::make_unique<API::FormClient>())
, m_uiClient(std::make_unique<API::UIClient>())
, m_findClient(std::make_unique<API::FindClient>())
+ , m_findMatchesClient(std::make_unique<API::FindMatchesClient>())
, m_diagnosticLoggingClient(std::make_unique<API::DiagnosticLoggingClient>())
#if ENABLE(CONTEXT_MENUS)
, m_contextMenuClient(std::make_unique<API::ContextMenuClient>())
@@ -622,9 +624,14 @@
m_findClient = WTF::move(findClient);
}
-void WebPageProxy::initializeFindMatchesClient(const WKPageFindMatchesClientBase* client)
+void WebPageProxy::setFindMatchesClient(std::unique_ptr<API::FindMatchesClient> findMatchesClient)
{
- m_findMatchesClient.initialize(client);
+ if (!findMatchesClient) {
+ m_findMatchesClient = std::make_unique<API::FindMatchesClient>();
+ return;
+ }
+
+ m_findMatchesClient = WTF::move(findMatchesClient);
}
void WebPageProxy::setDiagnosticLoggingClient(std::unique_ptr<API::DiagnosticLoggingClient> diagnosticLoggingClient)
@@ -835,7 +842,7 @@
m_uiPopupMenuClient.initialize(nullptr);
#endif
m_findClient = std::make_unique<API::FindClient>();
- m_findMatchesClient.initialize(nullptr);
+ m_findMatchesClient = std::make_unique<API::FindMatchesClient>();
m_diagnosticLoggingClient = std::make_unique<API::DiagnosticLoggingClient>();
#if ENABLE(CONTEXT_MENUS)
m_contextMenuClient = std::make_unique<API::ContextMenuClient>();
@@ -4034,7 +4041,7 @@
void WebPageProxy::didGetImageForFindMatch(const ShareableBitmap::Handle& contentImageHandle, uint32_t matchIndex)
{
- m_findMatchesClient.didGetImageForMatchResult(this, WebImage::create(ShareableBitmap::create(contentImageHandle)).get(), matchIndex);
+ m_findMatchesClient->didGetImageForMatchResult(this, WebImage::create(ShareableBitmap::create(contentImageHandle)).get(), matchIndex);
}
void WebPageProxy::setTextIndicator(const TextIndicatorData& indicatorData, uint64_t lifetime)
@@ -4072,20 +4079,7 @@
void WebPageProxy::didFindStringMatches(const String& string, const Vector<Vector<WebCore::IntRect>>& matchRects, int32_t firstIndexAfterSelection)
{
- 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);
+ m_findMatchesClient->didFindStringMatches(this, string, matchRects, firstIndexAfterSelection);
}
void WebPageProxy::didFailToFindString(const String& string)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191414 => 191415)
--- 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)
@@ -53,7 +53,6 @@
#include "WebColorPicker.h"
#include "WebContextMenuItemData.h"
#include "WebCoreArgumentCoders.h"
-#include "WebFindClient.h"
#include "WebFrameProxy.h"
#include "WebPageCreationParameters.h"
#include "WebPageDiagnosticLoggingClient.h"
@@ -129,6 +128,7 @@
namespace API {
class ContextMenuClient;
class FindClient;
+class FindMatchesClient;
class FormClient;
class HistoryClient;
class LoaderClient;
@@ -332,9 +332,10 @@
#endif
API::FindClient& findClient() { return *m_findClient; }
void setFindClient(std::unique_ptr<API::FindClient>);
+ API::FindMatchesClient& findMatchesClient() { return *m_findMatchesClient; }
+ void setFindMatchesClient(std::unique_ptr<API::FindMatchesClient>);
API::DiagnosticLoggingClient& diagnosticLoggingClient() { return *m_diagnosticLoggingClient; }
void setDiagnosticLoggingClient(std::unique_ptr<API::DiagnosticLoggingClient>);
- void initializeFindMatchesClient(const WKPageFindMatchesClientBase*);
void setFormClient(std::unique_ptr<API::FormClient>);
void setNavigationClient(std::unique_ptr<API::NavigationClient>);
void setHistoryClient(std::unique_ptr<API::HistoryClient>);
@@ -1476,7 +1477,7 @@
WebUIPopupMenuClient m_uiPopupMenuClient;
#endif
std::unique_ptr<API::FindClient> m_findClient;
- WebFindMatchesClient m_findMatchesClient;
+ std::unique_ptr<API::FindMatchesClient> m_findMatchesClient;
std::unique_ptr<API::DiagnosticLoggingClient> m_diagnosticLoggingClient;
#if ENABLE(CONTEXT_MENUS)
std::unique_ptr<API::ContextMenuClient> m_contextMenuClient;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (191414 => 191415)
--- 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)
@@ -222,8 +222,6 @@
1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */; };
1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; };
1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
- 1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */; };
- 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3DD201125E5A1F004515E6 /* WebFindClient.h */; };
1A3DD206125E5A2F004515E6 /* APIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3DD205125E5A2F004515E6 /* APIClient.h */; };
1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */; };
1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */; };
@@ -616,10 +614,10 @@
2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */; };
2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */; };
2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */; };
- 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 = (); }; };
+ 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 */; };
2D5AB62E1A69D6FB0014A9CB /* MessageRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5AB62B1A69D6FB0014A9CB /* MessageRecorder.h */; };
2D5AB62F1A69D6FB0014A9CB /* MessageRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D5AB62C1A69D6FB0014A9CB /* MessageRecorder.cpp */; };
2D5AB6301A69D6FB0014A9CB /* MessageRecorderProbes.d in Sources */ = {isa = PBXBuildFile; fileRef = 2D5AB62D1A69D6FB0014A9CB /* MessageRecorderProbes.d */; };
@@ -680,6 +678,7 @@
2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */; };
2DD12A081A8177F3002C74E6 /* WKPageRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
2DD13BD518F7DADD00E130A1 /* FindControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD13BD318F7DADD00E130A1 /* FindControllerIOS.mm */; };
+ 2DD67A2E1BD819730053B251 /* APIFindMatchesClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */; };
2DD9EB2D1A6F012500BB1267 /* APINavigationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD9EB2C1A6F012500BB1267 /* APINavigationClient.h */; };
2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */; };
2DDE0AFB18298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */; };
@@ -694,10 +693,10 @@
2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */; };
2DF9EEEC1A7836EE00B6CFBE /* APINavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */; };
2DF9EEEE1A786EAD00B6CFBE /* APINavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */; };
+ 2DFC7DBB1BCCC19500C1548C /* WebViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */; };
+ 2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */; };
2E0B8A7A1BC59A590044B32D /* _WKFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
2E7A944A1BBD97C300945547 /* _WKFocusedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 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 = (); }; };
31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099968146C71F50029DEB9 /* WebNotificationClient.h */; };
312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2333,8 +2332,6 @@
1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolInternal.h; sourceTree = "<group>"; };
1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; };
1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentCoders.cpp; sourceTree = "<group>"; };
- 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>"; };
1A3DD205125E5A2F004515E6 /* APIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIClient.h; sourceTree = "<group>"; };
1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlatformStrategies.h; sourceTree = "<group>"; };
1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPlatformStrategies.cpp; sourceTree = "<group>"; };
@@ -2846,6 +2843,7 @@
2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewContentProviderRegistry.mm; sourceTree = "<group>"; };
2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageRenderingProgressEvents.h; sourceTree = "<group>"; };
2DD13BD318F7DADD00E130A1 /* FindControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FindControllerIOS.mm; path = ios/FindControllerIOS.mm; sourceTree = "<group>"; };
+ 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFindMatchesClient.h; sourceTree = "<group>"; };
2DD9EB2C1A6F012500BB1267 /* APINavigationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationClient.h; sourceTree = "<group>"; };
2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreePropertyApplier.h; sourceTree = "<group>"; };
2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreePropertyApplier.mm; sourceTree = "<group>"; };
@@ -2860,10 +2858,10 @@
2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoInternal.h; sourceTree = "<group>"; };
2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationAction.h; sourceTree = "<group>"; };
2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationResponse.h; sourceTree = "<group>"; };
- 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>"; };
2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewImpl.h; sourceTree = "<group>"; };
2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewImpl.mm; sourceTree = "<group>"; };
+ 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>"; };
31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
31099971146C759B0029DEB9 /* WebNotificationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationClient.cpp; sourceTree = "<group>"; };
312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNotificationProvider.h; sourceTree = "<group>"; };
@@ -6191,8 +6189,6 @@
BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */,
BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */,
BCA0EF9D12332642007D3CFB /* WebEditCommandProxy.h */,
- 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */,
- 1A3DD201125E5A1F004515E6 /* WebFindClient.h */,
BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */,
BCE469501214E6CB000B98EB /* WebFormClient.h */,
BCE469511214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp */,
@@ -6272,6 +6268,7 @@
83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */,
1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */,
00B9661518E24CBA00CE1F88 /* APIFindClient.h */,
+ 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */,
37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */,
2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */,
2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */,
@@ -7842,6 +7839,7 @@
31A67E0D165B2A99006CBA66 /* PlugInAutoStartProvider.h in Headers */,
1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */,
1AA56F2911E92BC80061B882 /* PluginController.h in Headers */,
+ 2DD67A2E1BD819730053B251 /* APIFindMatchesClient.h in Headers */,
1A8EF4CB1252403700F7067F /* PluginControllerProxy.h in Headers */,
1A8EF96F1252AF6B00F7067F /* PluginControllerProxyMessages.h in Headers */,
1A179780137EE82C00F97D45 /* PluginCreationParameters.h in Headers */,
@@ -8002,7 +8000,6 @@
BC032DB910F4380F0058C15A /* WebEvent.h in Headers */,
BC032DBB10F4380F0058C15A /* WebEventConversion.h in Headers */,
BC111B5D112F629800337BAB /* WebEventFactory.h in Headers */,
- 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */,
1A90C1EE1264FD50003E44D4 /* WebFindOptions.h in Headers */,
BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */,
BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
@@ -9847,7 +9844,6 @@
C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */,
- 1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */,
BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */,
BCE469551214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp in Sources */,
BC111ADD112F5B9300337BAB /* WebFrame.cpp in Sources */,
