Skip to content

Commit c5c0cb2

Browse files
megangardnermegangardner
committed
Use a separate animation ID from the session ID in all cases, including initial animation.
https://bugs.webkit.org/show_bug.cgi?id=275700 rdar://130217887 Reviewed by Richard Robinson. Perviously, I was using the sessionUUID for the first animation. This has made it difficult to write clean and compartmentalized code, and caused issues where the wrong UUID was used. This patch separated these into two separate concepts, and added mapping storage in the animation controller. I also clean up some of the naming for the clean up code, and generally make the code easier to understand. * Source/WebCore/page/ChromeClient.h: (WebCore::ChromeClient::removeTextAnimationForAnimationID): (WebCore::ChromeClient::removeTransparentMarkersForSessionID): (WebCore::ChromeClient::removeInitialTextAnimation): (WebCore::ChromeClient::addInitialTextAnimation): (WebCore::ChromeClient::removeTextAnimationForID): Deleted. (WebCore::ChromeClient::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebCore/page/writing-tools/WritingToolsController.mm: (WebCore::WritingToolsController::didBeginWritingToolsSession): (WebCore::WritingToolsController::proofreadingSessionDidReceiveSuggestions): (WebCore::WritingToolsController::compositionSessionDidReceiveTextWithReplacementRange): (WebCore::WritingToolsController::didEndWritingToolsSession): * Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _addTextAnimationForAnimationID:withData:]): (-[WKWebView _removeTextAnimationForAnimationID:]): (-[WKWebView didBeginWritingToolsSession:contexts:]): (-[WKWebView _enableSourceTextAnimationAfterElementWithID:]): (-[WKWebView _enableFinalTextAnimationForElementWithID:]): (-[WKWebView _disableTextAnimationWithUUID:]): (-[WKWebView _addTextAnimationTypeForID:withData:]): Deleted. (-[WKWebView _removeTextAnimationForID:]): Deleted. (-[WKWebView beginWritingToolsAnimationForSessionWithUUID:]): Deleted. (-[WKWebView endWritingToolsAnimationForSessionWithUUID:]): Deleted. * Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h: * Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h: * Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm: (WebKit::PageClientImplCocoa::addTextAnimationForAnimationID): (WebKit::PageClientImplCocoa::removeTextAnimationForAnimationID): (WebKit::PageClientImplCocoa::addTextAnimationTypeForID): Deleted. (WebKit::PageClientImplCocoa::removeTextAnimationForID): Deleted. * Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm: (WebKit::WebPageProxy::addTextAnimationForAnimationID): (WebKit::WebPageProxy::removeTextAnimationForAnimationID): (WebKit::WebPageProxy::addTextAnimationTypeForID): Deleted. (WebKit::WebPageProxy::removeTextAnimationForID): Deleted. * Source/WebKit/UIProcess/PageClient.h: * Source/WebKit/UIProcess/WKSTextAnimationManager.h: * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/WebPageProxy.messages.in: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.h: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView addTextAnimationForAnimationID:withStyleType:]): (-[WKContentView removeTextAnimationForAnimationID:]): (-[WKContentView addTextAnimationTypeForID:withStyleType:]): Deleted. (-[WKContentView removeTextAnimationForID:]): Deleted. * Source/WebKit/UIProcess/mac/WKTextAnimationManager.h: * Source/WebKit/UIProcess/mac/WKTextAnimationManager.mm: (-[WKTextAnimationManager addTextAnimationForAnimationID:withData:]): (-[WKTextAnimationManager removeTextAnimationForAnimationID:]): (-[WKTextAnimationManager restoreTextAnimationType]): (-[WKTextAnimationManager addTextAnimationTypeForID:withData:]): Deleted. (-[WKTextAnimationManager removeTextAnimationForID:]): Deleted. * Source/WebKit/UIProcess/mac/WebViewImpl.h: * Source/WebKit/UIProcess/mac/WebViewImpl.mm: (WebKit::WebViewImpl::addTextAnimationForAnimationID): (WebKit::WebViewImpl::removeTextAnimationForAnimationID): (WebKit::WebViewImpl::addTextAnimationTypeForID): Deleted. (WebKit::WebViewImpl::removeTextAnimationForID): Deleted. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebKitSwift/TextAnimation/TextAnimationManager.swift: (beginEffect(for:style:)): (endEffect(for:)): * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp: (WebKit::WebChromeClient::removeTextAnimationForAnimationID): (WebKit::WebChromeClient::removeTransparentMarkersForSessionID): (WebKit::WebChromeClient::removeInitialTextAnimation): (WebKit::WebChromeClient::addInitialTextAnimation): (WebKit::WebChromeClient::removeTextAnimationForID): Deleted. (WebKit::WebChromeClient::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h: * Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.h: Renamed from Source/WebKit/WebProcess/WebPage/TextAnimationController.h. * Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm: (WebKit::TextAnimationController::contextRangeForTextAnimationID const): (WebKit::TextAnimationController::removeTransparentMarkersForSessionID): (WebKit::TextAnimationController::removeInitialTextAnimation): (WebKit::TextAnimationController::addInitialTextAnimation): (WebKit::TextAnimationController::addSourceTextAnimation): (WebKit::TextAnimationController::addDestinationTextAnimation): (WebKit::TextAnimationController::updateUnderlyingTextVisibilityForTextAnimationID): (WebKit::TextAnimationController::createTextIndicatorForTextAnimationID): (WebKit::TextAnimationController::contextRangeForTextAnimationType const): Deleted. (WebKit::TextAnimationController::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::addTextAnimationForAnimationID): (WebKit::WebPage::removeTextAnimationForAnimationID): (WebKit::WebPage::removeTransparentMarkersForSessionID): (WebKit::WebPage::removeInitialTextAnimation): (WebKit::WebPage::addInitialTextAnimation): (WebKit::WebPage::addTextAnimationTypeForID): Deleted. (WebKit::WebPage::removeTextAnimationForID): Deleted. (WebKit::WebPage::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.h: Canonical link: https://commits.webkit.org/280319@main
1 parent e9ca870 commit c5c0cb2

25 files changed

+160
-133
lines changed

‎Source/WebCore/page/ChromeClient.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,13 @@ class ChromeClient {
668668

669669
virtual void proofreadingSessionUpdateStateForSuggestionWithID(const WritingTools::SessionID&, WritingTools::TextSuggestionState, const WritingTools::TextSuggestionID&) { }
670670

671-
virtual void removeTextAnimationForID(const WritingTools::SessionID&) { }
671+
virtual void removeTextAnimationForAnimationID(const WTF::UUID&) { }
672672

673-
virtual void cleanUpTextAnimationsForSessionID(const WritingTools::SessionID&) { }
673+
virtual void removeTransparentMarkersForSessionID(const WritingTools::SessionID&) { }
674+
675+
virtual void removeInitialTextAnimation(const WritingTools::SessionID&) { }
676+
677+
virtual void addInitialTextAnimation(const WritingTools::SessionID&) { }
674678

675679
virtual void addSourceTextAnimation(const WritingTools::SessionID&, const CharacterRange&) { }
676680

‎Source/WebCore/page/writing-tools/WritingToolsController.mm

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@
203203
void WritingToolsController::didBeginWritingToolsSession(const WritingTools::Session& session, const Vector<WritingTools::Context>& contexts)
204204
{
205205
RELEASE_LOG(WritingTools, "WritingToolsController::didBeginWritingToolsSession (%s) [received contexts: %zu]", session.identifier.toString().utf8().data(), contexts.size());
206+
207+
// Don't animate smart replies, they are animated by UIKit/AppKit.
208+
if (session.compositionType != WebCore::WritingTools::Session::CompositionType::SmartReply)
209+
m_page->chrome().client().addInitialTextAnimation(session.identifier);
206210
}
207211

208212
void WritingToolsController::proofreadingSessionDidReceiveSuggestions(const WritingTools::Session& session, const Vector<WritingTools::TextSuggestion>& suggestions, const WritingTools::Context& context, bool finished)
@@ -215,8 +219,7 @@
215219
return;
216220
}
217221

218-
// FIXME: Text indicator styles are not used within this method, so is this still needed?
219-
m_page->chrome().client().removeTextAnimationForID(session.identifier);
222+
m_page->chrome().client().removeInitialTextAnimation(session.identifier);
220223

221224
document->selection().clear();
222225

@@ -362,7 +365,7 @@
362365
return;
363366
}
364367

365-
m_page->chrome().client().removeTextAnimationForID(session.identifier);
368+
m_page->chrome().client().removeInitialTextAnimation(session.identifier);
366369

367370
document->selection().clear();
368371

@@ -586,15 +589,15 @@
586589
return;
587590
}
588591

589-
m_page->chrome().client().removeTextAnimationForID(session.identifier);
592+
m_page->chrome().client().removeInitialTextAnimation(session.identifier);
590593

591594
// At this point, the selection will be the replaced text, which is the desired behavior for
592595
// Smart Reply sessions. However, for others, the entire session context range should be selected.
593596

594597
if (session.compositionType != WritingTools::Session::CompositionType::SmartReply)
595598
document->selection().setSelection({ *sessionRange });
596599

597-
m_page->chrome().client().cleanUpTextAnimationsForSessionID(session.identifier);
600+
m_page->chrome().client().removeTransparentMarkersForSessionID(session.identifier);
598601

599602
m_states.remove(session.identifier);
600603
}

‎Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

Lines changed: 12 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,26 +1801,26 @@ static inline WKTextAnimationType toWKTextAnimationType(WebKit::TextAnimationTyp
18011801
}
18021802

18031803
#if ENABLE(WRITING_TOOLS_UI)
1804-
- (void)_addTextAnimationTypeForID:(NSUUID *)nsUUID withData:(const WebKit::TextAnimationData&)data
1804+
- (void)_addTextAnimationForAnimationID:(NSUUID *)nsUUID withData:(const WebKit::TextAnimationData&)data
18051805
{
18061806
#if PLATFORM(IOS_FAMILY)
1807-
[_contentView addTextAnimationTypeForID:nsUUID withStyleType:toWKTextAnimationType(data.style)];
1807+
[_contentView addTextAnimationForAnimationID:nsUUID withStyleType:toWKTextAnimationType(data.style)];
18081808
#elif PLATFORM(MAC)
18091809
auto uuid = WTF::UUID::fromNSUUID(nsUUID);
18101810
if (!uuid)
18111811
return;
1812-
_impl->addTextAnimationTypeForID(*uuid, data);
1812+
_impl->addTextAnimationForAnimationID(*uuid, data);
18131813
#endif
18141814
}
1815-
- (void)_removeTextAnimationForID:(NSUUID *)nsUUID
1815+
- (void)_removeTextAnimationForAnimationID:(NSUUID *)nsUUID
18161816
{
18171817
#if PLATFORM(IOS_FAMILY)
1818-
[_contentView removeTextAnimationForID:nsUUID];
1818+
[_contentView removeTextAnimationForAnimationID:nsUUID];
18191819
#elif PLATFORM(MAC)
18201820
auto uuid = WTF::UUID::fromNSUUID(nsUUID);
18211821
if (!uuid)
18221822
return;
1823-
_impl->removeTextAnimationForID(*uuid);
1823+
_impl->removeTextAnimationForAnimationID(*uuid);
18241824
#endif
18251825
}
18261826
#endif
@@ -2127,10 +2127,6 @@ - (void)didBeginWritingToolsSession:(WTSession *)session contexts:(NSArray<WTCon
21272127
contextData.append(*webContext);
21282128
}
21292129

2130-
// Don't animate smart replies, they are animated by UIKit/AppKit.
2131-
if (webSession->compositionType != WebCore::WritingTools::Session::CompositionType::SmartReply)
2132-
[self beginWritingToolsAnimationForSessionWithUUID:session.uuid];
2133-
21342130
_page->didBeginWritingToolsSession(*webSession, contextData);
21352131
}
21362132

@@ -2276,43 +2272,6 @@ - (void)_proofreadingSessionWithUUID:(NSUUID *)sessionUUID updateState:(WebCore:
22762272
[textViewDelegate proofreadingSessionWithUUID:session.uuid updateState:WebKit::convertToPlatformTextSuggestionState(state) forSuggestionWithUUID:replacementUUID];
22772273
}
22782274

2279-
2280-
#pragma mark - Writing Tools Animation
2281-
2282-
- (void)beginWritingToolsAnimationForSessionWithUUID:(NSUUID *)sessionUUID
2283-
{
2284-
#if ENABLE(WRITING_TOOLS_UI)
2285-
#if PLATFORM(MAC)
2286-
auto uuid = WTF::UUID::fromNSUUID(sessionUUID);
2287-
if (!uuid) {
2288-
ASSERT_NOT_REACHED();
2289-
return;
2290-
}
2291-
2292-
_impl->addTextAnimationTypeForID(*uuid, { WebKit::TextAnimationType::Initial, WTF::UUID(WTF::UUID::emptyValue) });
2293-
#else
2294-
[_contentView addTextAnimationTypeForID:sessionUUID withStyleType:WKTextAnimationTypeInitial];
2295-
#endif
2296-
#endif // ENABLE(WRITING_TOOLS_UI)
2297-
}
2298-
2299-
- (void)endWritingToolsAnimationForSessionWithUUID:(NSUUID *)sessionUUID
2300-
{
2301-
#if ENABLE(WRITING_TOOLS_UI)
2302-
#if PLATFORM(MAC)
2303-
auto uuid = WTF::UUID::fromNSUUID(sessionUUID);
2304-
if (!uuid) {
2305-
ASSERT_NOT_REACHED();
2306-
return;
2307-
}
2308-
2309-
_impl->removeTextAnimationForID(*uuid);
2310-
#else
2311-
[_contentView removeTextAnimationForID:sessionUUID];
2312-
#endif
2313-
#endif // ENABLE(WRITING_TOOLS_UI)
2314-
}
2315-
23162275
#endif
23172276

23182277
#if USE(APPLE_INTERNAL_SDK)
@@ -3096,9 +3055,9 @@ - (NSUUID *)_enableSourceTextAnimationAfterElementWithID:(NSString *)elementID
30963055
_page->enableSourceTextAnimationAfterElementWithID(elementID, *uuid);
30973056

30983057
#if PLATFORM(IOS_FAMILY)
3099-
[_contentView addTextAnimationTypeForID:nsUUID.get() withStyleType:WKTextAnimationTypeInitial];
3058+
[_contentView addTextAnimationForAnimationID:nsUUID.get() withStyleType:WKTextAnimationTypeInitial];
31003059
#elif PLATFORM(MAC)
3101-
_impl->addTextAnimationTypeForID(*uuid, { WebKit::TextAnimationType::Initial, WTF::UUID(WTF::UUID::emptyValue) });
3060+
_impl->addTextAnimationForAnimationID(*uuid, { WebKit::TextAnimationType::Initial, WTF::UUID(WTF::UUID::emptyValue) });
31023061
#endif
31033062
return nsUUID.get();
31043063
#else // ENABLE(WRITING_TOOLS_UI)
@@ -3118,9 +3077,9 @@ - (NSUUID *)_enableFinalTextAnimationForElementWithID:(NSString *)elementID
31183077
_page->enableTextAnimationTypeForElementWithID(elementID, *uuid);
31193078

31203079
#if PLATFORM(IOS_FAMILY)
3121-
[_contentView addTextAnimationTypeForID:nsUUID.get() withStyleType:WKTextAnimationTypeFinal];
3080+
[_contentView addTextAnimationForAnimationID:nsUUID.get() withStyleType:WKTextAnimationTypeFinal];
31223081
#elif PLATFORM(MAC)
3123-
_impl->addTextAnimationTypeForID(*uuid, { WebKit::TextAnimationType::Final, WTF::UUID(WTF::UUID::emptyValue) });
3082+
_impl->addTextAnimationForAnimationID(*uuid, { WebKit::TextAnimationType::Final, WTF::UUID(WTF::UUID::emptyValue) });
31243083
#endif
31253084
return nsUUID.get();
31263085
#else // ENABLE(WRITING_TOOLS_UI)
@@ -3132,12 +3091,12 @@ - (void)_disableTextAnimationWithUUID:(NSUUID *)nsUUID
31323091
{
31333092
#if ENABLE(WRITING_TOOLS_UI)
31343093
#if PLATFORM(IOS_FAMILY)
3135-
[_contentView removeTextAnimationForID:nsUUID];
3094+
[_contentView removeTextAnimationForAnimationID:nsUUID];
31363095
#elif PLATFORM(MAC)
31373096
auto uuid = WTF::UUID::fromNSUUID(nsUUID);
31383097
if (!uuid)
31393098
return;
3140-
_impl->removeTextAnimationForID(*uuid);
3099+
_impl->removeTextAnimationForAnimationID(*uuid);
31413100
#endif
31423101
#endif // ENABLE(WRITING_TOOLS_UI)
31433102
}

‎Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ struct PerWebProcessState {
415415
#endif // ENABLE(WRITING_TOOLS)
416416

417417
#if ENABLE(WRITING_TOOLS_UI)
418-
- (void)_addTextAnimationTypeForID:(NSUUID *)uuid withData:(const WebKit::TextAnimationData&)styleData;
419-
- (void)_removeTextAnimationForID:(NSUUID *)uuid;
418+
- (void)_addTextAnimationForAnimationID:(NSUUID *)uuid withData:(const WebKit::TextAnimationData&)styleData;
419+
- (void)_removeTextAnimationForAnimationID:(NSUUID *)uuid;
420420
#endif
421421

422422
- (void)_internalDoAfterNextPresentationUpdate:(void (^)(void))updateBlock withoutWaitingForPainting:(BOOL)withoutWaitingForPainting withoutWaitingForAnimatedResize:(BOOL)withoutWaitingForAnimatedResize;

‎Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ class PageClientImplCocoa : public PageClient {
100100
#endif
101101

102102
#if ENABLE(WRITING_TOOLS_UI)
103-
void addTextAnimationTypeForID(const WTF::UUID&, const WebKit::TextAnimationData&) final;
104-
void removeTextAnimationForID(const WTF::UUID&) final;
103+
void addTextAnimationForAnimationID(const WTF::UUID&, const WebKit::TextAnimationData&) final;
104+
void removeTextAnimationForAnimationID(const WTF::UUID&) final;
105105
#endif
106106

107107
void microphoneCaptureWillChange() final;

‎Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@
157157
#endif // ENABLE(APP_HIGHLIGHTS)
158158

159159
#if ENABLE(WRITING_TOOLS_UI)
160-
void PageClientImplCocoa::addTextAnimationTypeForID(const WTF::UUID& uuid, const WebKit::TextAnimationData& data)
160+
void PageClientImplCocoa::addTextAnimationForAnimationID(const WTF::UUID& uuid, const WebKit::TextAnimationData& data)
161161
{
162-
[m_webView _addTextAnimationTypeForID:uuid withData:data];
162+
[m_webView _addTextAnimationForAnimationID:uuid withData:data];
163163
}
164164

165-
void PageClientImplCocoa::removeTextAnimationForID(const WTF::UUID& uuid)
165+
void PageClientImplCocoa::removeTextAnimationForAnimationID(const WTF::UUID& uuid)
166166
{
167-
[m_webView _removeTextAnimationForID:uuid];
167+
[m_webView _removeTextAnimationForAnimationID:uuid];
168168
}
169169
#endif
170170

‎Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,13 +1215,13 @@ static bool exceedsRenderTreeSizeSizeThreshold(uint64_t thresholdSize, uint64_t
12151215
legacyMainFrameProcess().send(Messages::WebPage::EnableTextAnimationTypeForElementWithID(elementID, uuid), webPageIDInMainFrameProcess());
12161216
}
12171217

1218-
void WebPageProxy::addTextAnimationTypeForID(IPC::Connection& connection, const WTF::UUID& uuid, const TextAnimationData& styleData, const WebCore::TextIndicatorData& indicatorData)
1218+
void WebPageProxy::addTextAnimationForAnimationID(IPC::Connection& connection, const WTF::UUID& uuid, const TextAnimationData& styleData, const WebCore::TextIndicatorData& indicatorData)
12191219
{
12201220
MESSAGE_CHECK(uuid.isValid());
12211221

12221222
internals().textIndicatorDataForChunk.add(uuid, indicatorData);
12231223

1224-
protectedPageClient()->addTextAnimationTypeForID(uuid, styleData);
1224+
protectedPageClient()->addTextAnimationForAnimationID(uuid, styleData);
12251225
}
12261226

12271227
void WebPageProxy::getTextIndicatorForID(const WTF::UUID& uuid, CompletionHandler<void(std::optional<WebCore::TextIndicatorData>&&)>&& completionHandler)
@@ -1251,11 +1251,11 @@ static bool exceedsRenderTreeSizeSizeThreshold(uint64_t thresholdSize, uint64_t
12511251
legacyMainFrameProcess().sendWithAsyncReply(Messages::WebPage::updateUnderlyingTextVisibilityForTextAnimationID(uuid, visible), WTFMove(completionHandler), webPageIDInMainFrameProcess());
12521252
}
12531253

1254-
void WebPageProxy::removeTextAnimationForID(IPC::Connection& connection, const WTF::UUID& uuid)
1254+
void WebPageProxy::removeTextAnimationForAnimationID(IPC::Connection& connection, const WTF::UUID& uuid)
12551255
{
12561256
MESSAGE_CHECK(uuid.isValid());
12571257

1258-
protectedPageClient()->removeTextAnimationForID(uuid);
1258+
protectedPageClient()->removeTextAnimationForAnimationID(uuid);
12591259
}
12601260

12611261
#endif // ENABLE(WRITING_TOOLS_UI)

‎Source/WebKit/UIProcess/PageClient.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,8 @@ class PageClient : public CanMakeWeakPtr<PageClient> {
716716
virtual void storeAppHighlight(const WebCore::AppHighlight&) = 0;
717717
#endif
718718
#if ENABLE(WRITING_TOOLS_UI)
719-
virtual void addTextAnimationTypeForID(const WTF::UUID&, const WebKit::TextAnimationData&) = 0;
720-
virtual void removeTextAnimationForID(const WTF::UUID&) = 0;
719+
virtual void addTextAnimationForAnimationID(const WTF::UUID&, const WebKit::TextAnimationData&) = 0;
720+
virtual void removeTextAnimationForAnimationID(const WTF::UUID&) = 0;
721721
#endif
722722
virtual void requestScrollToRect(const WebCore::FloatRect& targetRect, const WebCore::FloatPoint& origin) { }
723723

‎Source/WebKit/UIProcess/WKSTextAnimationManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
@interface WKSTextAnimationManager : NSObject
3333

3434
- (instancetype)initWithDelegate:(id <WKSTextAnimationSourceDelegate>)delegate NS_DESIGNATED_INITIALIZER;
35-
- (void)addTextAnimationTypeForID:(NSUUID *)uuid withStyleType:(WKTextAnimationType)styleType;
36-
- (void)removeTextAnimationForID:(NSUUID *)uuid;
35+
- (void)addTextAnimationForAnimationID:(NSUUID *)uuid withStyleType:(WKTextAnimationType)styleType;
36+
- (void)removeTextAnimationForAnimationID:(NSUUID *)uuid;
3737
@end
3838

3939
#endif // ENABLE(WRITING_TOOLS)

‎Source/WebKit/UIProcess/WebPageProxy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,8 +2438,8 @@ class WebPageProxy final : public API::ObjectImpl<API::Object::Type::Page>, publ
24382438
#endif // ENABLE(WRITING_TOOLS)
24392439

24402440
#if ENABLE(WRITING_TOOLS_UI)
2441-
void addTextAnimationTypeForID(IPC::Connection&, const WTF::UUID&, const WebKit::TextAnimationData&, const WebCore::TextIndicatorData&);
2442-
void removeTextAnimationForID(IPC::Connection&, const WTF::UUID&);
2441+
void addTextAnimationForAnimationID(IPC::Connection&, const WTF::UUID&, const WebKit::TextAnimationData&, const WebCore::TextIndicatorData&);
2442+
void removeTextAnimationForAnimationID(IPC::Connection&, const WTF::UUID&);
24432443
void enableSourceTextAnimationAfterElementWithID(const String& elementID, const WTF::UUID&);
24442444
void enableTextAnimationTypeForElementWithID(const String& elementID, const WTF::UUID&);
24452445

‎Source/WebKit/UIProcess/WebPageProxy.messages.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@ messages -> WebPageProxy {
520520
#endif
521521

522522
#if ENABLE(WRITING_TOOLS_UI)
523-
AddTextAnimationTypeForID(WTF::UUID uuid, struct WebKit::TextAnimationData styleData, struct WebCore::TextIndicatorData indicatorData)
524-
removeTextAnimationForID(WTF::UUID uuid)
523+
AddTextAnimationForAnimationID(WTF::UUID uuid, struct WebKit::TextAnimationData styleData, struct WebCore::TextIndicatorData indicatorData)
524+
RemoveTextAnimationForAnimationID(WTF::UUID uuid)
525525
#endif
526526

527527
CreateAppHighlightInSelectedRange)

‎Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,8 +846,8 @@ FOR_EACH_PRIVATE_WKCONTENTVIEW_ACTION(DECLARE_WKCONTENTVIEW_ACTION_FOR_WEB_VIEW)
846846
- (void)clearTextIndicator:(WebCore::TextIndicatorDismissalAnimation)animation;
847847

848848
#if ENABLE(WRITING_TOOLS_UI)
849-
- (void)addTextAnimationTypeForID:(NSUUID *)uuid withStyleType:(WKTextAnimationType)styleType;
850-
- (void)removeTextAnimationForID:(NSUUID *)uuid;
849+
- (void)addTextAnimationForAnimationID:(NSUUID *)uuid withStyleType:(WKTextAnimationType)styleType;
850+
- (void)removeTextAnimationForAnimationID:(NSUUID *)uuid;
851851
#endif
852852

853853
@property (nonatomic, readonly) BOOL _shouldUseContextMenus;

‎Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11754,26 +11754,26 @@ - (void)startFadeOut
1175411754

1175511755
#if ENABLE(WRITING_TOOLS_UI)
1175611756

11757-
- (void)addTextAnimationTypeForID:(NSUUID *)uuid withStyleType:(WKTextAnimationType)styleType
11757+
- (void)addTextAnimationForAnimationID:(NSUUID *)uuid withStyleType:(WKTextAnimationType)styleType
1175811758
{
1175911759
if (!_page->preferences().textAnimationsEnabled())
1176011760
return;
1176111761

1176211762
if (!_textAnimationManager)
1176311763
_textAnimationManager = adoptNS([WebKit::allocWKSTextAnimationManagerInstance() initWithDelegate:self]);
1176411764

11765-
[_textAnimationManager addTextAnimationTypeForID:uuid withStyleType:styleType];
11765+
[_textAnimationManager addTextAnimationForAnimationID:uuid withStyleType:styleType];
1176611766
}
1176711767

11768-
- (void)removeTextAnimationForID:(NSUUID *)uuid
11768+
- (void)removeTextAnimationForAnimationID:(NSUUID *)uuid
1176911769
{
1177011770
if (!_page->preferences().textAnimationsEnabled())
1177111771
return;
1177211772

1177311773
if (!_textAnimationManager)
1177411774
return;
1177511775

11776-
[_textAnimationManager removeTextAnimationForID:uuid];
11776+
[_textAnimationManager removeTextAnimationForAnimationID:uuid];
1177711777
}
1177811778

1177911779
#endif

‎Source/WebKit/UIProcess/mac/WKTextAnimationManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class WebViewImpl;
3838
@interface WKTextAnimationManager : NSObject
3939

4040
- (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl&)view;
41-
- (void)addTextAnimationTypeForID:(NSUUID *)uuid withData:(const WebKit::TextAnimationData&)data;
42-
- (void)removeTextAnimationForID:(NSUUID *)uuid;
41+
- (void)addTextAnimationForAnimationID:(NSUUID *)uuid withData:(const WebKit::TextAnimationData&)data;
42+
- (void)removeTextAnimationForAnimationID:(NSUUID *)uuid;
4343

4444
- (BOOL)hasActiveTextAnimationType;
4545

‎Source/WebKit/UIProcess/mac/WKTextAnimationManager.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ - (instancetype)initWithWebViewImpl:(WebKit::WebViewImpl&)webView
8585
return self;
8686
}
8787

88-
- (void)addTextAnimationTypeForID:(NSUUID *)uuid withData:(const WebKit::TextAnimationData&)data
88+
- (void)addTextAnimationForAnimationID:(NSUUID *)uuid withData:(const WebKit::TextAnimationData&)data
8989
{
9090
RetainPtr<id<_WTTextEffect>> effect;
9191
RetainPtr chunk = adoptNS([PAL::alloc_WTTextChunkInstance() initChunkWithIdentifier:uuid.UUIDString]);
@@ -118,7 +118,7 @@ - (void)addTextAnimationTypeForID:(NSUUID *)uuid withData:(const WebKit::TextAni
118118
[_chunkToEffect setObject:effectData.get() forKey:uuid];
119119
}
120120

121-
- (void)removeTextAnimationForID:(NSUUID *)uuid
121+
- (void)removeTextAnimationForAnimationID:(NSUUID *)uuid
122122
{
123123
RetainPtr effectData = [_chunkToEffect objectForKey:uuid];
124124
if (effectData) {
@@ -148,7 +148,7 @@ - (void)restoreTextAnimationType
148148
for (NSUUID *chunkID in [_chunkToEffect allKeys]) {
149149
RetainPtr effectData = [_chunkToEffect objectForKey:chunkID];
150150
if ([effectData type] == WebKit::TextAnimationType::Initial)
151-
[self addTextAnimationTypeForID:chunkID withData: { WebKit::TextAnimationType::Initial, WTF::UUID(WTF::UUID::emptyValue) }];
151+
[self addTextAnimationForAnimationID:chunkID withData: { WebKit::TextAnimationType::Initial, WTF::UUID(WTF::UUID::emptyValue) }];
152152
}
153153
}
154154

‎Source/WebKit/UIProcess/mac/WebViewImpl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -747,8 +747,8 @@ class WebViewImpl final : public CanMakeWeakPtr<WebViewImpl>, public CanMakeChec
747747
#endif
748748

749749
#if ENABLE(WRITING_TOOLS_UI)
750-
void addTextAnimationTypeForID(WTF::UUID, const WebKit::TextAnimationData&);
751-
void removeTextAnimationForID(WTF::UUID);
750+
void addTextAnimationForAnimationID(WTF::UUID, const WebKit::TextAnimationData&);
751+
void removeTextAnimationForAnimationID(WTF::UUID);
752752
#endif
753753

754754
#if HAVE(INLINE_PREDICTIONS)

0 commit comments

Comments
 (0)