[Writing Tools] Replace `ENABLE_UNIFIED_TEXT_REPLACEMENT` with `ENABLE_WRITING_TOOLS` and remove UTRAdditions.h #29728

rr-codes · 2024-06-11T22:36:43Z

`c6800d4`

[Writing Tools] Replace `ENABLE_UNIFIED_TEXT_REPLACEMENT` with `ENABLE_WRITING_TOOLS` and remove UTRAdditions.h
https://bugs.webkit.org/show_bug.cgi?id=275376
rdar://129627552

Reviewed by Megan Gardner.

* Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml:
* Source/WTF/wtf/PlatformEnable.h:
* Source/WTF/wtf/PlatformEnableCocoa.h:
* Source/WebCore/dom/DocumentMarker.h:
(WebCore::DocumentMarker::allMarkers):
(WebCore::DocumentMarker::description const):
* Source/WebCore/dom/DocumentMarkerController.cpp:
(WebCore::shouldInsertAsSeparateMarker):
(WebCore::DocumentMarkerController::addMarker):
(WebCore::DocumentMarkerController::removeMarkers):
(WebCore::DocumentMarkerController::unifiedTextReplacementAnimationTimerFired):
* Source/WebCore/loader/EmptyClients.cpp:
* Source/WebCore/page/ChromeClient.h:
* Source/WebCore/page/ContextMenuClient.h:
* Source/WebCore/page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
(WebCore::ContextMenuController::populate):
* Source/WebCore/page/Page.cpp:
* Source/WebCore/page/Page.h:
* Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.h:
* Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.mm:
* Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementTypes.h:
* Source/WebCore/platform/LocalizedStrings.cpp:
* Source/WebCore/platform/LocalizedStrings.h:
* Source/WebCore/rendering/MarkedText.cpp:
(WebCore::MarkedText::collectForDocumentMarkers):
* Source/WebCore/rendering/MarkedText.h:
* Source/WebCore/rendering/StyledMarkedText.cpp:
(WebCore::resolveStyleForMarkedText):
* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::TextBoxPainter<TextBoxPath>::paintPlatformDocumentMarker):
* Source/WebCore/testing/Internals.cpp:
(WebCore::markerTypeFrom):
* Source/WebCore/testing/Internals.h:
* Source/WebCore/testing/Internals.idl:
* Source/WebKit/Shared/TextIndicatorStyle.serialization.in:
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView _enableTextIndicatorStylingAfterElementWithID:]):
(-[WKWebView _enableTextIndicatorStylingForElementWithID:]):
(-[WKWebView _disableTextIndicatorStylingWithUUID:]):
(-[WKWebView _isUnifiedTextReplacementActive]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration _setUnifiedTextReplacementBehavior:]):
(-[WKWebViewConfiguration _unifiedTextReplacementBehavior]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h:
* Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm:
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h:
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm:
(WebKit::PageClientImplCocoa::unifiedTextReplacementActiveWillChange):
(WebKit::PageClientImplCocoa::unifiedTextReplacementActiveDidChange):
* Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:
* Source/WebKit/UIProcess/PageClient.h:
* Source/WebKit/UIProcess/WKSTextStyleManager.h:
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/UIProcess/WebPageProxyInternals.h:
* Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:
* Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canPerformActionForWebView:withSender:]):
(-[WKContentView _startWritingToolsForWebView:]):
(-[WKContentView _updateTextInputTraits:]):
(-[WKContentView _swapCharactersForWebView:]): Deleted.
* Source/WebKit/UIProcess/ios/WKExtendedTextInputTraits.mm:
(-[WKExtendedTextInputTraits restoreDefaultValues]):
* Source/WebKit/UIProcess/mac/PageClientImplMac.h:
* Source/WebKit/UIProcess/mac/PageClientImplMac.mm:
* Source/WebKit/UIProcess/mac/WKTextIndicatorStyleManager.h:
* Source/WebKit/UIProcess/mac/WKTextIndicatorStyleManager.mm:
* Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::getContextMenuFromItems):
* Source/WebKit/UIProcess/mac/WebViewImpl.h:
* Source/WebKit/UIProcess/mac/WebViewImpl.mm:
(WebKit::WebViewImpl::selectionDidChange):
(WebKit::WebViewImpl::hasContentRelativeChildViews const):
(WebKit::WebViewImpl::suppressContentRelativeChildViews):
(WebKit::WebViewImpl::restoreContentRelativeChildViews):
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h:
* Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.h:
* Source/WebKit/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
* Source/WebKit/WebProcess/WebPage/Cocoa/TextIndicatorStyleController.mm:
* Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
* Source/WebKit/WebProcess/WebPage/TextIndicatorStyleController.h:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didChangeSelection):
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
* Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm:
* Tools/TestWebKitAPI/Tests/WebCore/MarkedText.cpp:
(WebCore::operator<<):

Canonical link: https://commits.webkit.org/279936@main

d96769e

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 wincairo-tests~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🛠 gtk~~
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 tv-sim	~~🧪 mac-wk2-stress~~	~~🧪 api-gtk~~
	✅ 🛠 watch		✅ 🛠 jsc-armv7
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim		~~🧪 jsc-armv7-tests~~

webkit-early-warning-system · 2024-06-11T22:36:49Z

EWS run on previous version of this PR (hash 9648755)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 wincairo-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc	⏳ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🛠 watch		✅ 🛠 jsc-armv7
	✅ 🛠 watch-sim		✅ 🧪 jsc-armv7-tests

megangardner · 2024-06-11T22:41:16Z

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

 _page->enableTextIndicatorStyleAfterElementWithID(elementID, *uuid);

 #if PLATFORM(IOS_FAMILY)
 [_contentView addTextIndicatorStyleForID:nsUUID.get() withStyleType:WKTextIndicatorStyleTypeInitial];
-#elif PLATFORM(MAC) && ENABLE(UNIFIED_TEXT_REPLACEMENT_UI)


Are you just dropping UNIFIED_TEXT_REPLACEMENT_UI?

I think it's okay because it's under ENABLE(WRITING_TOOLS)?

megangardner · 2024-06-11T22:42:22Z

Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm

@@ -299,12 +299,12 @@

 void PageClientImplCocoa::unifiedTextReplacementActiveWillChange()
 {
- [m_webView willChangeValueForKey:unifiedTextReplacementActiveKey];
+ [m_webView willChangeValueForKey:@"writingToolsActive"];


Can this be a static define somewhere? Like I assume unifiedTextReplacementActiveKey was?

megangardner · 2024-06-11T22:42:29Z

Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm

 }

 void PageClientImplCocoa::unifiedTextReplacementActiveDidChange()
 {
- [m_webView didChangeValueForKey:unifiedTextReplacementActiveKey];
+ [m_webView didChangeValueForKey:@"writingToolsActive"];


webkit-early-warning-system · 2024-06-12T04:12:23Z

EWS run on current version of this PR (hash d96769e)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 wincairo-tests~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🛠 gtk~~
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 tv-sim	~~🧪 mac-wk2-stress~~	~~🧪 api-gtk~~
	✅ 🛠 watch		✅ 🛠 jsc-armv7
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim		~~🧪 jsc-armv7-tests~~

…E_WRITING_TOOLS` and remove UTRAdditions.h https://bugs.webkit.org/show_bug.cgi?id=275376 rdar://129627552 Reviewed by Megan Gardner. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WTF/wtf/PlatformEnable.h: * Source/WTF/wtf/PlatformEnableCocoa.h: * Source/WebCore/dom/DocumentMarker.h: (WebCore::DocumentMarker::allMarkers): (WebCore::DocumentMarker::description const): * Source/WebCore/dom/DocumentMarkerController.cpp: (WebCore::shouldInsertAsSeparateMarker): (WebCore::DocumentMarkerController::addMarker): (WebCore::DocumentMarkerController::removeMarkers): (WebCore::DocumentMarkerController::unifiedTextReplacementAnimationTimerFired): * Source/WebCore/loader/EmptyClients.cpp: * Source/WebCore/page/ChromeClient.h: * Source/WebCore/page/ContextMenuClient.h: * Source/WebCore/page/ContextMenuController.cpp: (WebCore::ContextMenuController::contextMenuItemSelected): (WebCore::ContextMenuController::populate): * Source/WebCore/page/Page.cpp: * Source/WebCore/page/Page.h: * Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.h: * Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.mm: * Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementTypes.h: * Source/WebCore/platform/LocalizedStrings.cpp: * Source/WebCore/platform/LocalizedStrings.h: * Source/WebCore/rendering/MarkedText.cpp: (WebCore::MarkedText::collectForDocumentMarkers): * Source/WebCore/rendering/MarkedText.h: * Source/WebCore/rendering/StyledMarkedText.cpp: (WebCore::resolveStyleForMarkedText): * Source/WebCore/rendering/TextBoxPainter.cpp: (WebCore::TextBoxPainter<TextBoxPath>::paintPlatformDocumentMarker): * Source/WebCore/testing/Internals.cpp: (WebCore::markerTypeFrom): * Source/WebCore/testing/Internals.h: * Source/WebCore/testing/Internals.idl: * Source/WebKit/Shared/TextIndicatorStyle.serialization.in: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/UIProcess/API/APIPageConfiguration.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _initializeWithConfiguration:]): (-[WKWebView _enableTextIndicatorStylingAfterElementWithID:]): (-[WKWebView _enableTextIndicatorStylingForElementWithID:]): (-[WKWebView _disableTextIndicatorStylingWithUUID:]): (-[WKWebView _isUnifiedTextReplacementActive]): * Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm: (-[WKWebViewConfiguration _setUnifiedTextReplacementBehavior:]): (-[WKWebViewConfiguration _unifiedTextReplacementBehavior]): * Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h: * Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm: * Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h: * Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm: (WebKit::PageClientImplCocoa::unifiedTextReplacementActiveWillChange): (WebKit::PageClientImplCocoa::unifiedTextReplacementActiveDidChange): * Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm: * Source/WebKit/UIProcess/PageClient.h: * Source/WebKit/UIProcess/WKSTextStyleManager.h: * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/WebPageProxy.messages.in: * Source/WebKit/UIProcess/WebPageProxyInternals.h: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.h: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView canPerformActionForWebView:withSender:]): (-[WKContentView _startWritingToolsForWebView:]): (-[WKContentView _updateTextInputTraits:]): (-[WKContentView _swapCharactersForWebView:]): Deleted. * Source/WebKit/UIProcess/ios/WKExtendedTextInputTraits.mm: (-[WKExtendedTextInputTraits restoreDefaultValues]): * Source/WebKit/UIProcess/mac/PageClientImplMac.h: * Source/WebKit/UIProcess/mac/PageClientImplMac.mm: * Source/WebKit/UIProcess/mac/WKTextIndicatorStyleManager.h: * Source/WebKit/UIProcess/mac/WKTextIndicatorStyleManager.mm: * Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm: (WebKit::WebContextMenuProxyMac::getContextMenuFromItems): * Source/WebKit/UIProcess/mac/WebViewImpl.h: * Source/WebKit/UIProcess/mac/WebViewImpl.mm: (WebKit::WebViewImpl::selectionDidChange): (WebKit::WebViewImpl::hasContentRelativeChildViews const): (WebKit::WebViewImpl::suppressContentRelativeChildViews): (WebKit::WebViewImpl::restoreContentRelativeChildViews): * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp: * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h: * Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.h: * Source/WebKit/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm: * Source/WebKit/WebProcess/WebPage/Cocoa/TextIndicatorStyleController.mm: * Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm: * Source/WebKit/WebProcess/WebPage/TextIndicatorStyleController.h: * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didChangeSelection): * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: * Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h: * Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm: * Tools/TestWebKitAPI/Tests/WebCore/MarkedText.cpp: (WebCore::operator<<): Canonical link: https://commits.webkit.org/279936@main

webkit-commit-queue · 2024-06-12T04:14:37Z

Committed 279936@main (c6800d4): https://commits.webkit.org/279936@main

Reviewed commits have been landed. Closing PR #29728 and removing active labels.

rr-codes requested review from cdumez and rniwa as code owners June 11, 2024 22:36

rr-codes self-assigned this Jun 11, 2024

rr-codes added the HTML Editing For bugs in HTML editing support (including designMode and contentEditable). label Jun 11, 2024

megangardner approved these changes Jun 11, 2024

View reviewed changes

rr-codes force-pushed the eng/129627552 branch from 9648755 to d96769e Compare June 12, 2024 04:12

rr-codes added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 12, 2024

webkit-commit-queue force-pushed the eng/129627552 branch from d96769e to c6800d4 Compare June 12, 2024 04:14

webkit-commit-queue merged commit c6800d4 into WebKit:main Jun 12, 2024

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Writing Tools] Replace `ENABLE_UNIFIED_TEXT_REPLACEMENT` with `ENABLE_WRITING_TOOLS` and remove UTRAdditions.h #29728

[Writing Tools] Replace `ENABLE_UNIFIED_TEXT_REPLACEMENT` with `ENABLE_WRITING_TOOLS` and remove UTRAdditions.h #29728

rr-codes commented Jun 11, 2024 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Jun 11, 2024 •

edited

megangardner Jun 11, 2024

pxlcoder Jun 12, 2024

megangardner Jun 11, 2024

pxlcoder Jun 12, 2024

megangardner Jun 11, 2024

webkit-early-warning-system commented Jun 12, 2024 •

edited

webkit-commit-queue commented Jun 12, 2024

[Writing Tools] Replace ENABLE_UNIFIED_TEXT_REPLACEMENT with ENABLE_WRITING_TOOLS and remove UTRAdditions.h #29728

[Writing Tools] Replace ENABLE_UNIFIED_TEXT_REPLACEMENT with ENABLE_WRITING_TOOLS and remove UTRAdditions.h #29728

Conversation

rr-codes commented Jun 11, 2024 • edited by webkit-early-warning-system

c6800d4

webkit-early-warning-system commented Jun 11, 2024 • edited

megangardner Jun 11, 2024

Choose a reason for hiding this comment

pxlcoder Jun 12, 2024

Choose a reason for hiding this comment

megangardner Jun 11, 2024

Choose a reason for hiding this comment

pxlcoder Jun 12, 2024

Choose a reason for hiding this comment

megangardner Jun 11, 2024

Choose a reason for hiding this comment

webkit-early-warning-system commented Jun 12, 2024 • edited

webkit-commit-queue commented Jun 12, 2024

[Writing Tools] Replace `ENABLE_UNIFIED_TEXT_REPLACEMENT` with `ENABLE_WRITING_TOOLS` and remove UTRAdditions.h #29728

[Writing Tools] Replace `ENABLE_UNIFIED_TEXT_REPLACEMENT` with `ENABLE_WRITING_TOOLS` and remove UTRAdditions.h #29728

rr-codes commented Jun 11, 2024 •

edited by webkit-early-warning-system

`c6800d4`

webkit-early-warning-system commented Jun 11, 2024 •

edited

webkit-early-warning-system commented Jun 12, 2024 •

edited