Skip to content

Commit 9bde8d4

Browse files
committed
Revert "Reduce use of Vector::uncheckedAppend() throughout the code base"
This reverts commit f0545c4.
1 parent 2fff660 commit 9bde8d4

4 files changed

Lines changed: 29 additions & 19 deletions

File tree

Source/WTF/wtf/cf/LanguageCF.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ Vector<String> platformUserPreferredLanguages(ShouldMinimizeLanguages shouldMini
101101
if (!platformLanguagesCount)
102102
return { "en"_s };
103103

104-
Vector<String> languages(platformLanguagesCount, [&](size_t i) {
104+
Vector<String> languages;
105+
languages.reserveInitialCapacity(platformLanguagesCount);
106+
for (CFIndex i = 0; i < platformLanguagesCount; i++) {
105107
auto platformLanguage = static_cast<CFStringRef>(CFArrayGetValueAtIndex(platformLanguages.get(), i));
106-
return httpStyleLanguageCode(platformLanguage, shouldMinimizeLanguages);
107-
});
108+
languages.uncheckedAppend(httpStyleLanguageCode(platformLanguage, shouldMinimizeLanguages));
109+
}
108110

109111
LOG_WITH_STREAM(Language, stream << "After passing through httpStyleLanguageCode: " << languages);
110112

Source/WebCore/Modules/entriesapi/DOMFileSystem.cpp

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,16 @@ static ExceptionOr<Vector<ListedChild>> listDirectoryWithMetadata(const String&
6262
return Exception { NotFoundError, "Path no longer exists or is no longer a directory"_s };
6363

6464
auto childNames = FileSystem::listDirectory(fullPath);
65-
return WTF::compactMap(WTFMove(childNames), [&](auto&& childName) -> std::optional<ListedChild> {
65+
Vector<ListedChild> listedChildren;
66+
listedChildren.reserveInitialCapacity(childNames.size());
67+
for (auto& childName : childNames) {
6668
auto childPath = FileSystem::pathByAppendingComponent(fullPath, childName);
67-
if (auto fileType = fileTypeIgnoringHiddenFiles(childPath))
68-
return ListedChild { WTFMove(childName), *fileType };
69-
return std::nullopt;
70-
});
69+
auto fileType = fileTypeIgnoringHiddenFiles(childPath);
70+
if (!fileType)
71+
continue;
72+
listedChildren.uncheckedAppend(ListedChild { childName, *fileType });
73+
}
74+
return listedChildren;
7175
}
7276

7377
static ExceptionOr<Vector<Ref<FileSystemEntry>>> toFileSystemEntries(ScriptExecutionContext& context, DOMFileSystem& fileSystem, ExceptionOr<Vector<ListedChild>>&& listedChildren, const String& parentVirtualPath)
@@ -76,18 +80,22 @@ static ExceptionOr<Vector<Ref<FileSystemEntry>>> toFileSystemEntries(ScriptExecu
7680
if (listedChildren.hasException())
7781
return listedChildren.releaseException();
7882

79-
return WTF::compactMap(listedChildren.returnValue(), [&](auto& child) -> RefPtr<FileSystemEntry> {
83+
Vector<Ref<FileSystemEntry>> entries;
84+
entries.reserveInitialCapacity(listedChildren.returnValue().size());
85+
for (auto& child : listedChildren.returnValue()) {
8086
String virtualPath = parentVirtualPath + "/" + child.filename;
8187
switch (child.type) {
8288
case FileSystem::FileType::Regular:
83-
return FileSystemFileEntry::create(context, fileSystem, virtualPath);
89+
entries.uncheckedAppend(FileSystemFileEntry::create(context, fileSystem, virtualPath));
90+
break;
8491
case FileSystem::FileType::Directory:
85-
return FileSystemDirectoryEntry::create(context, fileSystem, virtualPath);
92+
entries.uncheckedAppend(FileSystemDirectoryEntry::create(context, fileSystem, virtualPath));
93+
break;
8694
default:
8795
break;
8896
}
89-
return nullptr;
90-
});
97+
}
98+
return entries;
9199
}
92100

93101
// https://wicg.github.io/entries-api/#name

Source/WebCore/Modules/gamepad/Gamepad.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ Gamepad::Gamepad(const PlatformGamepad& platformGamepad)
4343
, m_axes(platformGamepad.axisValues().size(), 0.0)
4444
{
4545
unsigned buttonCount = platformGamepad.buttonValues().size();
46-
m_buttons = Vector<Ref<GamepadButton>>(buttonCount, [](size_t) {
47-
return GamepadButton::create();
48-
});
46+
m_buttons.reserveInitialCapacity(buttonCount);
47+
for (unsigned i = 0; i < buttonCount; ++i)
48+
m_buttons.uncheckedAppend(GamepadButton::create());
4949
}
5050

5151
Gamepad::~Gamepad() = default;

Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpTransformableFrame.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ RTCEncodedAudioFrameMetadata LibWebRTCRtpTransformableFrame::audioMetadata() con
8787
if (!m_isAudioSenderFrame) {
8888
auto* audioFrame = static_cast<webrtc::TransformableAudioFrameInterface*>(m_rtcFrame.get());
8989
auto contributingSources = audioFrame->GetContributingSources();
90-
cssrcs = Vector<uint32_t>(contributingSources.size(), [&](size_t cptr) {
91-
return contributingSources[cptr];
92-
});
90+
cssrcs.reserveInitialCapacity(contributingSources.size());
91+
for (size_t cptr = 0; cptr < contributingSources.size(); ++cptr)
92+
cssrcs.uncheckedAppend(contributingSources[cptr]);
9393
}
9494
return { m_rtcFrame->GetSsrc(), WTFMove(cssrcs) };
9595
}

0 commit comments

Comments
 (0)