Replace use of std containers with WTF's equivalents in renderer/*
This CL replaces the use of std::vector of std containers with
WTF::Vector and blink::WebVector in renderer/*.
Bug: 952716
Change-Id: I1b4dfd26d782741442391f93c2ee221dbf7b8f13
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1687532
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#674673}
diff --git a/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc b/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc
index a654d9b..720ae27 100644
--- a/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc
@@ -966,8 +966,7 @@
WebCoalescedInputEvent WebPluginContainerImpl::TransformCoalescedTouchEvent(
const WebCoalescedInputEvent& coalesced_event) {
WebCoalescedInputEvent transformed_event(
- TransformTouchEvent(coalesced_event.Event()),
- std::vector<const WebInputEvent*>(), std::vector<const WebInputEvent*>());
+ TransformTouchEvent(coalesced_event.Event()), {}, {});
for (size_t i = 0; i < coalesced_event.CoalescedEventSize(); ++i) {
transformed_event.AddCoalescedEvent(
TransformTouchEvent(coalesced_event.CoalescedEvent(i)));
diff --git a/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h b/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h
index e4de6deb..af5cc43 100644
--- a/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h
+++ b/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h
@@ -20,7 +20,6 @@
#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
#include <utility>
-#include <vector>
namespace blink {
diff --git a/third_party/blink/renderer/core/layout/scroll_anchor.cc b/third_party/blink/renderer/core/layout/scroll_anchor.cc
index 22e1232b..25d5eda 100644
--- a/third_party/blink/renderer/core/layout/scroll_anchor.cc
+++ b/third_party/blink/renderer/core/layout/scroll_anchor.cc
@@ -230,7 +230,7 @@
SCOPED_BLINK_UMA_HISTOGRAM_TIMER(
"Layout.ScrollAnchor.TimeToComputeAnchorNodeSelector");
- std::vector<String> selector_list;
+ Vector<String> selector_list;
for (Element* element = ElementTraversal::FirstAncestorOrSelf(*anchor_node);
element; element = ElementTraversal::FirstAncestor(*element)) {
selector_list.push_back(UniqueSimpleSelectorAmongSiblings(element));
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc
index bd0161d9..ec554b7 100644
--- a/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc
+++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc
@@ -88,7 +88,7 @@
KURL BackgroundFetchIconLoader::PickBestIconForDisplay(
ExecutionContext* execution_context,
int ideal_size_pixels) {
- std::vector<Manifest::ImageResource> icons;
+ WebVector<Manifest::ImageResource> icons;
for (auto& icon : icons_) {
// Update the src of |icon| to include the base URL in case relative paths
// were used.
@@ -106,7 +106,7 @@
}
return KURL(ManifestIconSelector::FindBestMatchingSquareIcon(
- std::move(icons), ideal_size_pixels, kMinimumIconSizeInPx,
+ icons.ReleaseVector(), ideal_size_pixels, kMinimumIconSizeInPx,
Manifest::ImageResource::Purpose::ANY));
}
diff --git a/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc b/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc
index 1066e30..c048895 100644
--- a/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc
+++ b/third_party/blink/renderer/modules/mediacapturefromelement/html_media_element_capture.cc
@@ -113,9 +113,9 @@
blink::WebMediaStreamSource::Capabilities capabilities;
capabilities.device_id = track_id;
- capabilities.echo_cancellation = std::vector<bool>({false});
- capabilities.auto_gain_control = std::vector<bool>({false});
- capabilities.noise_suppression = std::vector<bool>({false});
+ capabilities.echo_cancellation.emplace_back(false);
+ capabilities.auto_gain_control.emplace_back(false);
+ capabilities.noise_suppression.emplace_back(false);
capabilities.sample_size = {
media::SampleFormatToBitsPerChannel(media::kSampleFormatS16), // min
media::SampleFormatToBitsPerChannel(media::kSampleFormatS16) // max
diff --git a/third_party/blink/renderer/platform/exported/web_url_response.cc b/third_party/blink/renderer/platform/exported/web_url_response.cc
index 1324bc8..e7de3a6 100644
--- a/third_party/blink/renderer/platform/exported/web_url_response.cc
+++ b/third_party/blink/renderer/platform/exported/web_url_response.cc
@@ -278,9 +278,9 @@
resource_response_->GetSecurityDetails();
if (!security_details.has_value())
return base::nullopt;
- std::vector<SignedCertificateTimestamp> sct_list;
+ SignedCertificateTimestampList sct_list;
for (const auto& iter : security_details->sct_list) {
- sct_list.push_back(SignedCertificateTimestamp(
+ sct_list.emplace_back(SignedCertificateTimestamp(
iter.status_, iter.origin_, iter.log_description_, iter.log_id_,
iter.timestamp_, iter.hash_algorithm_, iter.signature_algorithm_,
iter.signature_data_));
@@ -291,7 +291,7 @@
security_details->mac, security_details->subject_name,
security_details->san_list, security_details->issuer,
security_details->valid_from, security_details->valid_to,
- security_details->certificate, SignedCertificateTimestampList(sct_list));
+ security_details->certificate, sct_list);
}
const ResourceResponse& WebURLResponse::ToResourceResponse() const {
diff --git a/third_party/blink/renderer/platform/instrumentation/tracing/web_process_memory_dump.h b/third_party/blink/renderer/platform/instrumentation/tracing/web_process_memory_dump.h
index 31adea9..8273ed8 100644
--- a/third_party/blink/renderer/platform/instrumentation/tracing/web_process_memory_dump.h
+++ b/third_party/blink/renderer/platform/instrumentation/tracing/web_process_memory_dump.h
@@ -8,7 +8,6 @@
#include <map>
#include <memory>
#include <unordered_map>
-#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.h"
@@ -163,8 +162,7 @@
memory_allocator_dumps_;
// Stores SkTraceMemoryDump for the current ProcessMemoryDump.
- std::vector<std::unique_ptr<skia::SkiaTraceMemoryDumpImpl>>
- sk_trace_dump_list_;
+ Vector<std::unique_ptr<skia::SkiaTraceMemoryDumpImpl>> sk_trace_dump_list_;
DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDump);
};
