Skip to content

WebKit: convert UChar to char16_t #46967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

adetaylor
Copy link
Contributor

@adetaylor adetaylor commented Jun 19, 2025

4de95e2

WebKit: convert UChar to char16_t
https://bugs.webkit.org/show_bug.cgi?id=294733
rdar://153823213

Reviewed by Alex Christensen.

WebKit would like to switch from UChar to the C++ standard char16_t. This PR
makes the change for the Source/WebKit and Source/WebKitLegacy directories.
This is a simple textual substitution of \bUChar\b to char16_t. As these types
are currently typedefed to be identical, no functional changes are expected.

One file was excluded from this:
Source/WebKitLegacy/ios/Misc/WebUIKitSupport.h
because this file is included in plain [objective-C] code as well as C++ code,
where char16_t does not exist (it's a C++ type).

* Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:
(WebKit::NetworkLoadChecker::checkTAO):
* Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp:
(WebKit::WebSocketTask::WebSocketTask):
* Source/WebKit/NetworkProcess/storage/CacheStorageRecord.cpp:
(WebKit::CacheStorageRecordInformation::updateVaryHeaders):
* Source/WebKit/Platform/IPC/ArgumentCoders.cpp:
(IPC::ArgumentCoder<String>::decode):
* Source/WebKit/Platform/IPC/DaemonCoders.h:
(WebKit::Daemon::Coder<WTF::String>::decode):
* Source/WebKit/Shared/API/c/WKString.cpp:
(WKStringGetCharacters):
* Source/WebKit/Shared/Extensions/WebExtensionLocalization.cpp:
(WebKit::WebExtensionLocalization::stringByReplacingPositionalPlaceholdersInString):
* Source/WebKit/Shared/Extensions/WebExtensionUtilities.cpp:
(WebKit::toErrorString):
* Source/WebKit/Shared/win/WebEventFactory.cpp:
(WebKit::textFromEvent):
(WebKit::unmodifiedTextFromEvent):
* Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp:
(API::compiledToFile):
(API::getContentRuleListSourceFromMappedFile):
* Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp:
(WebKit::DropTarget::dataReceived):
* Source/WebKit/UIProcess/API/gtk/DropTargetGtk4.cpp:
(WebKit::DropTarget::accept):
* Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::HistoryEntryDataEncoder::operator<<):
(WebKit::HistoryEntryDataDecoder::operator>>):
* Source/WebKit/WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.mm:
(WebKit::UnifiedPDFPlugin::revealFragmentIfNeeded):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::shouldSkipDecidePolicyForResponse const):
* Source/WebKit/webpushd/PushClientConnection.mm:
(WebPushD::isValidPushPartition):
* Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm:
(WebKitGetLastLineBreakInBuffer):
* Source/WebKitLegacy/mac/Misc/WebKitNSStringExtras.mm:
(-[NSString _web_drawAtPoint:font:textColor:]):
(-[NSString _web_widthWithFont:]):
* Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm:
(WebVisitedLinkStore::addVisitedLink):
* Source/WebKitLegacy/mac/WebView/WebFrame.mm:
(-[WebFrame _smartInsertForString:replacingRange:beforeString:afterString:]):

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

b01ddaa

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ⏳ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@adetaylor adetaylor marked this pull request as ready for review June 19, 2025 15:09
@adetaylor adetaylor requested review from a team, cdumez, b-weinstein and xeenon as code owners June 19, 2025 15:09
@achristensen07 achristensen07 added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 30, 2025
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WebKit-convert-UChar-to-char16_t branch 3 times, most recently from e5e1809 to 194772a Compare June 30, 2025 16:18
@webkit-commit-queue
Copy link
Collaborator

merge-queue failed to commit PR to repository. To retry, remove any blocking labels and re-apply merge-queue label

@adetaylor adetaylor force-pushed the eng/WebKit-convert-UChar-to-char16_t branch from 194772a to b01ddaa Compare July 1, 2025 08:31
@achristensen07 achristensen07 added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing labels Jul 1, 2025
https://bugs.webkit.org/show_bug.cgi?id=294733
rdar://153823213

Reviewed by Alex Christensen.

WebKit would like to switch from UChar to the C++ standard char16_t. This PR
makes the change for the Source/WebKit and Source/WebKitLegacy directories.
This is a simple textual substitution of \bUChar\b to char16_t. As these types
are currently typedefed to be identical, no functional changes are expected.

One file was excluded from this:
Source/WebKitLegacy/ios/Misc/WebUIKitSupport.h
because this file is included in plain [objective-C] code as well as C++ code,
where char16_t does not exist (it's a C++ type).

* Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:
(WebKit::NetworkLoadChecker::checkTAO):
* Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp:
(WebKit::WebSocketTask::WebSocketTask):
* Source/WebKit/NetworkProcess/storage/CacheStorageRecord.cpp:
(WebKit::CacheStorageRecordInformation::updateVaryHeaders):
* Source/WebKit/Platform/IPC/ArgumentCoders.cpp:
(IPC::ArgumentCoder<String>::decode):
* Source/WebKit/Platform/IPC/DaemonCoders.h:
(WebKit::Daemon::Coder<WTF::String>::decode):
* Source/WebKit/Shared/API/c/WKString.cpp:
(WKStringGetCharacters):
* Source/WebKit/Shared/Extensions/WebExtensionLocalization.cpp:
(WebKit::WebExtensionLocalization::stringByReplacingPositionalPlaceholdersInString):
* Source/WebKit/Shared/Extensions/WebExtensionUtilities.cpp:
(WebKit::toErrorString):
* Source/WebKit/Shared/win/WebEventFactory.cpp:
(WebKit::textFromEvent):
(WebKit::unmodifiedTextFromEvent):
* Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp:
(API::compiledToFile):
(API::getContentRuleListSourceFromMappedFile):
* Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp:
(WebKit::DropTarget::dataReceived):
* Source/WebKit/UIProcess/API/gtk/DropTargetGtk4.cpp:
(WebKit::DropTarget::accept):
* Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::HistoryEntryDataEncoder::operator<<):
(WebKit::HistoryEntryDataDecoder::operator>>):
* Source/WebKit/WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.mm:
(WebKit::UnifiedPDFPlugin::revealFragmentIfNeeded):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::shouldSkipDecidePolicyForResponse const):
* Source/WebKit/webpushd/PushClientConnection.mm:
(WebPushD::isValidPushPartition):
* Source/WebKitLegacy/ios/Misc/WebUIKitSupport.mm:
(WebKitGetLastLineBreakInBuffer):
* Source/WebKitLegacy/mac/Misc/WebKitNSStringExtras.mm:
(-[NSString _web_drawAtPoint:font:textColor:]):
(-[NSString _web_widthWithFont:]):
* Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm:
(WebVisitedLinkStore::addVisitedLink):
* Source/WebKitLegacy/mac/WebView/WebFrame.mm:
(-[WebFrame _smartInsertForString:replacingRange:beforeString:afterString:]):

Canonical link: https://commits.webkit.org/296864@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WebKit-convert-UChar-to-char16_t branch from b01ddaa to 4de95e2 Compare July 1, 2025 15:57
@webkit-commit-queue
Copy link
Collaborator

Committed 296864@main (4de95e2): https://commits.webkit.org/296864@main

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

@webkit-commit-queue webkit-commit-queue merged commit 4de95e2 into WebKit:main Jul 1, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants