[webkit-changes] [WebKit/WebKit] 1a70ac: Replace DidFindString with a completion handler
Charlie Wolfe
noreply at github.com
Thu Feb 8 16:35:45 PST 2024
Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 1a70ac5097111a3f194ee589208b5ab79c66c47d
https://github.com/WebKit/WebKit/commit/1a70ac5097111a3f194ee589208b5ab79c66c47d
Author: Charlie Wolfe <charliew at apple.com>
Date: 2024-02-08 (Thu, 08 Feb 2024)
Changed paths:
M Source/WebKit/UIProcess/FindStringCallbackAggregator.cpp
M Source/WebKit/UIProcess/WebPageProxy.cpp
M Source/WebKit/UIProcess/WebPageProxy.h
M Source/WebKit/UIProcess/WebPageProxy.messages.in
M Source/WebKit/WebProcess/WebPage/FindController.cpp
M Source/WebKit/WebProcess/WebPage/FindController.h
M Source/WebKit/WebProcess/WebPage/WebPage.cpp
M Source/WebKit/WebProcess/WebPage/WebPage.h
M Source/WebKit/WebProcess/WebPage/WebPage.messages.in
Log Message:
-----------
Replace DidFindString with a completion handler
https://bugs.webkit.org/show_bug.cgi?id=268843
rdar://122405043
Reviewed by Alex Christensen.
This change moves the args passed to DidFindString to the completion handler.
When image analysis is enabled, two `DidFindString` messages are expected for one `findString:` call,
where the second message may be delayed. So, I needed to create a `FindStringInImages` message to
aggregate the results of the image search.
`DidFailToFindString` is still used by `FindStringMatches`, so I couldn’t remove that message yet.
* Source/WebKit/UIProcess/FindStringCallbackAggregator.cpp:
(WebKit::FindStringCallbackAggregator::~FindStringCallbackAggregator):
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::findString):
(WebKit::WebPageProxy::didFindString): Deleted.
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::updateFindUIAfterPageScroll):
(WebKit::FindController::findStringInImages):
(WebKit::FindController::findString):
(WebKit::FindController::findStringMatches):
(WebKit::FindController::findRectsForStringMatches):
* Source/WebKit/WebProcess/WebPage/FindController.h:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::findString):
(WebKit::WebPage::findStringInImages):
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
Canonical link: https://commits.webkit.org/274325@main
More information about the webkit-changes
mailing list