diff --git a/third_party/blink/renderer/bindings/core/v8/script_streamer_test.cc b/third_party/blink/renderer/bindings/core/v8/script_streamer_test.cc index f67d8dd6d79c9..ac74f1d0fbff3 100644 --- a/third_party/blink/renderer/bindings/core/v8/script_streamer_test.cc +++ b/third_party/blink/renderer/bindings/core/v8/script_streamer_test.cc @@ -175,7 +175,7 @@ class ScriptStreamingTest : public testing::Test { protected: void AppendData(const char* data) { - uint32_t data_len = strlen(data); + uint32_t data_len = base::checked_cast(strlen(data)); MojoResult result = producer_handle_->WriteData( data, &data_len, MOJO_WRITE_DATA_FLAG_ALL_OR_NONE); EXPECT_EQ(result, MOJO_RESULT_OK); diff --git a/third_party/blink/renderer/build/scripts/core/css/properties/templates/style_builder_functions.tmpl b/third_party/blink/renderer/build/scripts/core/css/properties/templates/style_builder_functions.tmpl index b21df2620db3a..20c8df084d88d 100644 --- a/third_party/blink/renderer/build/scripts/core/css/properties/templates/style_builder_functions.tmpl +++ b/third_party/blink/renderer/build/scripts/core/css/properties/templates/style_builder_functions.tmpl @@ -393,7 +393,7 @@ To(resolved_property).{{apply_call}}; NamedGridLinesMap auto_repeat_named_grid_lines; OrderedNamedGridLines auto_repeat_ordered_named_grid_lines; AutoRepeatType autoRepeatType = ComputedStyleInitialValues::InitialGridAutoRepeatType(); - size_t auto_repeat_insertion_point = + wtf_size_t auto_repeat_insertion_point = ComputedStyleInitialValues::InitialGridAutoRepeatInsertionPoint(); StyleBuilderConverter::ConvertGridTrackList( value, track_sizes, named_grid_lines, ordered_named_grid_lines, diff --git a/third_party/blink/renderer/build/scripts/core/style/make_computed_style_base.py b/third_party/blink/renderer/build/scripts/core/style/make_computed_style_base.py index 7fc70a88c8d28..130386e0983b9 100755 --- a/third_party/blink/renderer/build/scripts/core/style/make_computed_style_base.py +++ b/third_party/blink/renderer/build/scripts/core/style/make_computed_style_base.py @@ -80,6 +80,7 @@ 'OutlineValue', 'unsigned', 'size_t', + 'wtf_size_t', 'int', # Aligns like short 'unsigned short', diff --git a/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_initial_values.h.tmpl b/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_initial_values.h.tmpl index 734cc51b06608..2d232180cfac6 100644 --- a/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_initial_values.h.tmpl +++ b/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_initial_values.h.tmpl @@ -50,7 +50,7 @@ class ComputedStyleInitialValues{ } // Grid properties. - static size_t InitialGridAutoRepeatInsertionPoint() { return 0; } + static wtf_size_t InitialGridAutoRepeatInsertionPoint() { return 0; } static AutoRepeatType InitialGridAutoRepeatType() { return AutoRepeatType::kNoAutoRepeat; } diff --git a/third_party/blink/renderer/controller/performance_manager/renderer_resource_coordinator_impl.cc b/third_party/blink/renderer/controller/performance_manager/renderer_resource_coordinator_impl.cc index d917e5bbaacaa..eef45fbba63c1 100644 --- a/third_party/blink/renderer/controller/performance_manager/renderer_resource_coordinator_impl.cc +++ b/third_party/blink/renderer/controller/performance_manager/renderer_resource_coordinator_impl.cc @@ -74,7 +74,7 @@ bool IsExtensionStableWorldId(const String& stable_world_id) { return false; if (stable_world_id.length() != 32) return false; - for (size_t i = 0; i < stable_world_id.length(); ++i) { + for (unsigned i = 0; i < stable_world_id.length(); ++i) { if (stable_world_id[i] < 'a' || stable_world_id[i] > 'p') return false; } diff --git a/third_party/blink/renderer/core/animation/css_custom_list_interpolation_type.cc b/third_party/blink/renderer/core/animation/css_custom_list_interpolation_type.cc index bfe74bd5d2151..aa886124e9b23 100644 --- a/third_party/blink/renderer/core/animation/css_custom_list_interpolation_type.cc +++ b/third_party/blink/renderer/core/animation/css_custom_list_interpolation_type.cc @@ -15,7 +15,7 @@ namespace blink { InterpolationValue CSSCustomListInterpolationType::MaybeConvertNeutral( const InterpolationValue& underlying, ConversionCheckers& conversion_checkers) const { - size_t underlying_length = + wtf_size_t underlying_length = UnderlyingLengthChecker::GetUnderlyingLength(underlying); conversion_checkers.push_back( std::make_unique(underlying_length)); @@ -46,7 +46,7 @@ InterpolationValue CSSCustomListInterpolationType::MaybeConvertValue( ConversionCheckers null_checkers; return ListInterpolationFunctions::CreateList( - list->length(), [this, list, state, &null_checkers](size_t index) { + list->length(), [this, list, state, &null_checkers](wtf_size_t index) { return inner_interpolation_type_->MaybeConvertValue( list->Item(index), state, null_checkers); }); @@ -77,7 +77,7 @@ const CSSValue* CSSCustomListInterpolationType::CreateCSSValue( DCHECK(!non_interpolable_list || interpolable_list.length() == non_interpolable_list->length()); - for (size_t i = 0; i < interpolable_list.length(); ++i) { + for (wtf_size_t i = 0; i < interpolable_list.length(); ++i) { const NonInterpolableValue* non_interpolable_single_value = non_interpolable_list ? non_interpolable_list->Get(i) : nullptr; list->Append(*inner_interpolation_type_->CreateCSSValue( diff --git a/third_party/blink/renderer/core/animation/list_interpolation_functions_test.cc b/third_party/blink/renderer/core/animation/list_interpolation_functions_test.cc index df9b2e3db65b1..ff54bfdfccf29 100644 --- a/third_party/blink/renderer/core/animation/list_interpolation_functions_test.cc +++ b/third_party/blink/renderer/core/animation/list_interpolation_functions_test.cc @@ -78,7 +78,7 @@ class TestUnderlyingValue : public UnderlyingValue { InterpolationValue CreateInterpolableList( const Vector>& values) { return ListInterpolationFunctions::CreateList( - values.size(), [&values](size_t i) { + values.size(), [&values](wtf_size_t i) { return InterpolationValue( std::make_unique(values[i].first), TestNonInterpolableValue::Create(values[i].second)); @@ -89,7 +89,7 @@ InterpolationValue CreateInterpolableList( // but a non-interpolable list of nullptrs. InterpolationValue CreateInterpolableList(const Vector& values) { return ListInterpolationFunctions::CreateList( - values.size(), [&values](size_t i) { + values.size(), [&values](wtf_size_t i) { return InterpolationValue( std::make_unique(values[i]), nullptr); }); @@ -99,7 +99,7 @@ InterpolationValue CreateInterpolableList(const Vector& values) { // values, but an interpolable list of zeroes. InterpolationValue CreateNonInterpolableList(const Vector& values) { return ListInterpolationFunctions::CreateList( - values.size(), [&values](size_t i) { + values.size(), [&values](wtf_size_t i) { return InterpolationValue(std::make_unique(0), TestNonInterpolableValue::Create(values[i])); }); diff --git a/third_party/blink/renderer/core/animation/sampled_effect.cc b/third_party/blink/renderer/core/animation/sampled_effect.cc index f4bf0734b7cfa..e0202437f5358 100644 --- a/third_party/blink/renderer/core/animation/sampled_effect.cc +++ b/third_party/blink/renderer/core/animation/sampled_effect.cc @@ -29,7 +29,8 @@ void SampledEffect::RemoveReplacedInterpolations( [&](const auto& interpolation) { return replaced_properties.Contains(interpolation->GetProperty()); }); - interpolations_.Shrink(new_end - interpolations_.begin()); + interpolations_.Shrink( + static_cast(new_end - interpolations_.begin())); } void SampledEffect::UpdateReplacedProperties( diff --git a/third_party/blink/renderer/core/animation/scroll_timeline.cc b/third_party/blink/renderer/core/animation/scroll_timeline.cc index ea6b1ae9bc5b8..769e1accad3dc 100644 --- a/third_party/blink/renderer/core/animation/scroll_timeline.cc +++ b/third_party/blink/renderer/core/animation/scroll_timeline.cc @@ -288,8 +288,8 @@ bool ScrollTimeline::ScrollOffsetsEqual( const HeapVector>& other) const { if (scroll_offsets_.size() != other.size()) return false; - size_t size = scroll_offsets_.size(); - for (size_t i = 0; i < size; ++i) { + wtf_size_t size = scroll_offsets_.size(); + for (wtf_size_t i = 0; i < size; ++i) { if (!DataEquivalent(scroll_offsets_.at(i), other.at(i))) return false; } diff --git a/third_party/blink/renderer/core/app_history/app_history.cc b/third_party/blink/renderer/core/app_history/app_history.cc index 51bbd54721f85..cb93becef63df 100644 --- a/third_party/blink/renderer/core/app_history/app_history.cc +++ b/third_party/blink/renderer/core/app_history/app_history.cc @@ -126,7 +126,7 @@ AppHistory::AppHistory(LocalDOMWindow& window) void AppHistory::PopulateKeySet() { DCHECK(keys_to_indices_.IsEmpty()); - for (size_t i = 0; i < entries_.size(); i++) + for (wtf_size_t i = 0; i < entries_.size(); i++) keys_to_indices_.insert(entries_[i]->key(), i); } @@ -138,13 +138,14 @@ void AppHistory::InitializeForNavigation( // Construct |entries_|. Any back entries are inserted, then the current // entry, then any forward entries. - entries_.ReserveCapacity(back_entries.size() + forward_entries.size() + 1); + entries_.ReserveCapacity(base::checked_cast( + back_entries.size() + forward_entries.size() + 1)); for (const auto& entry : back_entries) { entries_.emplace_back( MakeGarbageCollected(GetSupplementable(), entry)); } - current_index_ = back_entries.size(); + current_index_ = base::checked_cast(back_entries.size()); entries_.emplace_back( MakeGarbageCollected(GetSupplementable(), ¤t)); @@ -158,7 +159,7 @@ void AppHistory::InitializeForNavigation( void AppHistory::CloneFromPrevious(AppHistory& previous) { DCHECK(entries_.IsEmpty()); entries_.ReserveCapacity(previous.entries_.size()); - for (size_t i = 0; i < previous.entries_.size(); i++) { + for (wtf_size_t i = 0; i < previous.entries_.size(); i++) { // It's possible that |old_item| is indirectly holding a reference to // the old Document. Also, it has a bunch of state we don't need for a // non-current entry. Clone a subset of its state to a |new_item|. @@ -202,7 +203,7 @@ void AppHistory::UpdateForNavigation(HistoryItem& item, WebFrameLoadType type) { // For a new back/forward entry, truncate any forward entries and prepare to // append. current_index_++; - for (size_t i = current_index_; i < entries_.size(); i++) + for (wtf_size_t i = current_index_; i < entries_.size(); i++) keys_to_indices_.erase(entries_[i]->key()); entries_.resize(current_index_ + 1); } diff --git a/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.cc b/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.cc index b533148b1df86..7d2d23166c796 100644 --- a/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.cc +++ b/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.cc @@ -94,7 +94,7 @@ void ContentCaptureTaskHistogramReporter::OnAllCapturedContentSent() { } void ContentCaptureTaskHistogramReporter::RecordsSentContentCountPerDocument( - size_t sent_content_count) { + int sent_content_count) { base::UmaHistogramCounts10000(kSentContentCount, sent_content_count); } diff --git a/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h b/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h index 3372116c6fcc9..d8c74da536a84 100644 --- a/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h +++ b/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h @@ -45,7 +45,7 @@ class CORE_EXPORT ContentCaptureTaskHistogramReporter // Invoked on a capturing session ends, at that time, all captured changes // which include the new, changed and removed content has been sent. void OnAllCapturedContentSent(); - void RecordsSentContentCountPerDocument(size_t sent_content_count); + void RecordsSentContentCountPerDocument(int sent_content_count); private: void MayRecordTaskRunsPerCapture(); @@ -65,7 +65,7 @@ class CORE_EXPORT ContentCaptureTaskHistogramReporter base::TimeTicks task_scheduled_time_; // Counts the task run times to complete a capture which includes capturing // and sending the content. - size_t task_runs_per_capture_ = 0; + int task_runs_per_capture_ = 0; // Records time to capture the content, its range is from 0 to 50,000 // microseconds. diff --git a/third_party/blink/renderer/core/content_capture/content_capture_test.cc b/third_party/blink/renderer/core/content_capture/content_capture_test.cc index 980debec4b59d..518284b069cbc 100644 --- a/third_party/blink/renderer/core/content_capture/content_capture_test.cc +++ b/third_party/blink/renderer/core/content_capture/content_capture_test.cc @@ -68,10 +68,9 @@ void ToNodeIds(const Vector>& nodes, } } -void ToNodeTexts(const Vector>& nodes, - Vector& texts) { +void ToNodeTexts(const Vector>& nodes, Vector& texts) { for (auto& n : nodes) - texts.push_back(n->nodeValue().Utf8()); + texts.push_back(n->nodeValue()); } } // namespace @@ -89,7 +88,7 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient { data_ = data; first_data_ = first_data; for (auto& d : data) { - auto text = d.GetValue().Utf8(); + auto text = d.GetValue(); all_text_.push_back(text); captured_text_.push_back(text); } @@ -98,7 +97,7 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient { void DidUpdateContent(const WebVector& data) override { updated_data_ = data; for (auto& d : data) - updated_text_.push_back(d.GetValue().Utf8()); + updated_text_.push_back(d.GetValue()); } void DidRemoveContent(WebVector data) override { @@ -113,11 +112,11 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient { return updated_data_; } - const Vector& AllText() const { return all_text_; } + const Vector& AllText() const { return all_text_; } - const Vector& CapturedText() const { return captured_text_; } + const Vector& CapturedText() const { return captured_text_; } - const Vector& UpdatedText() const { return updated_text_; } + const Vector& UpdatedText() const { return updated_text_; } const WebVector& RemovedData() const { return removed_data_; } @@ -134,9 +133,9 @@ class WebContentCaptureClientTestHelper : public WebContentCaptureClient { WebVector data_; WebVector updated_data_; WebVector removed_data_; - Vector all_text_; - Vector updated_text_; - Vector captured_text_; + Vector all_text_; + Vector updated_text_; + Vector captured_text_; }; class ContentCaptureTaskTestHelper : public ContentCaptureTask { @@ -247,7 +246,7 @@ class ContentCaptureTest InitScrollingTestData(); } - void SimulateScrolling(size_t step) { + void SimulateScrolling(wtf_size_t step) { CHECK_LT(step, 4u); content_capture_manager_->GetContentCaptureTask() ->SetCapturedContentForTesting(scrolling_node_ids_[step]); @@ -329,7 +328,7 @@ class ContentCaptureTest Node& invisible_node() const { return *invisible_node_; } - const Vector>& scrolling_expected_captured_nodes() { + const Vector>& scrolling_expected_captured_nodes() { return scrolling_expected_captured_nodes_; } @@ -342,11 +341,11 @@ class ContentCaptureTest GetWebContentCaptureClient()->ResetResults(); } - void BuildNodesInfo(const Vector& ids, + void BuildNodesInfo(const Vector& ids, Vector>& nodes, Vector& node_ids) { for (auto id : ids) { - Node* node = GetElementById(id.c_str())->firstChild(); + Node* node = GetDocument().getElementById(AtomicString(id))->firstChild(); CHECK(node); LayoutObject* layout_object = node->GetLayoutObject(); CHECK(layout_object); @@ -361,21 +360,21 @@ class ContentCaptureTest // TODO(michaelbai): Remove this once integrate with LayoutText. void InitNodeHolders() { BuildNodesInfo( - Vector{"p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8"}, - nodes_, node_ids_); + Vector{"p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8"}, nodes_, + node_ids_); invisible_node_ = GetElementById("invisible")->firstChild(); DCHECK(invisible_node_.Get()); } void InitScrollingTestData() { Vector>> nodes{4}; - BuildNodesInfo(Vector{"p1", "p2", "p3"}, nodes[0], + BuildNodesInfo(Vector{"p1", "p2", "p3"}, nodes[0], scrolling_node_ids_[0]); - BuildNodesInfo(Vector{"p3", "p4", "p5"}, nodes[1], + BuildNodesInfo(Vector{"p3", "p4", "p5"}, nodes[1], scrolling_node_ids_[1]); - BuildNodesInfo(Vector{"p6", "p7", "p8"}, nodes[2], + BuildNodesInfo(Vector{"p6", "p7", "p8"}, nodes[2], scrolling_node_ids_[2]); - BuildNodesInfo(Vector{"p2", "p3"}, nodes[3], + BuildNodesInfo(Vector{"p2", "p3"}, nodes[3], scrolling_node_ids_[3]); // Build expected result. if (base::FeatureList::IsEnabled( @@ -406,7 +405,7 @@ class ContentCaptureTest Vector> nodes_; Vector node_ids_; Persistent invisible_node_; - Vector> scrolling_expected_captured_nodes_{4}; + Vector> scrolling_expected_captured_nodes_{4}; Vector> scrolling_expected_removed_nodes_{4}; Vector> scrolling_node_ids_{4}; std::unique_ptr content_capture_client_; @@ -433,7 +432,7 @@ TEST_P(ContentCaptureTest, Basic) { } TEST_P(ContentCaptureTest, Scrolling) { - for (size_t step = 0; step < 4; ++step) { + for (wtf_size_t step = 0; step < 4; ++step) { SimulateScrolling(step); RunContentCaptureTask(); EXPECT_EQ(ContentCaptureTask::TaskState::kStop, @@ -818,8 +817,7 @@ class ContentCaptureSimTest : public SimTest { child_frame_expected_text_.push_back("New Text"); } - void InsertMainFrameEditableContent(const std::string& content, - unsigned offset) { + void InsertMainFrameEditableContent(const String& content, unsigned offset) { InsertNodeContent(GetDocument(), "editable_id", content, offset); } @@ -827,16 +825,16 @@ class ContentCaptureSimTest : public SimTest { DeleteNodeContent(GetDocument(), "editable_id", offset, length); } - const Vector& MainFrameExpectedText() const { + const Vector& MainFrameExpectedText() const { return main_frame_expected_text_; } - const Vector& ChildFrameExpectedText() const { + const Vector& ChildFrameExpectedText() const { return child_frame_expected_text_; } - void ReplaceMainFrameExpectedText(const std::string& old_text, - const std::string& new_text) { + void ReplaceMainFrameExpectedText(const String& old_text, + const String& new_text) { std::replace(main_frame_expected_text_.begin(), main_frame_expected_text_.end(), old_text, new_text); } @@ -913,8 +911,8 @@ class ContentCaptureSimTest : public SimTest { } void InitMainFrameNodeHolders() { - Vector ids = {"p1", "p2", "p3", "p4", "p5", - "p6", "p7", "s8", "editable_id"}; + Vector ids = {"p1", "p2", "p3", "p4", "p5", + "p6", "p7", "s8", "editable_id"}; main_frame_expected_text_ = { "Hello World1", "Hello World2", "Hello World3", "Hello World4", "Hello World5", "Hello World6", @@ -924,18 +922,19 @@ class ContentCaptureSimTest : public SimTest { } void InitChildFrameNodeHolders(const Document& doc) { - Vector ids = {"c1", "c2"}; + Vector ids = {"c1", "c2"}; child_frame_expected_text_ = {"Hello World11", "Hello World12"}; InitNodeHolders(child_frame_content_, ids, doc); EXPECT_EQ(2u, child_frame_content_.size()); } void InitNodeHolders(Vector& buffer, - const Vector& ids, + const Vector& ids, const Document& document) { for (auto id : ids) { - auto* layout_object = - document.getElementById(id.c_str())->firstChild()->GetLayoutObject(); + auto* layout_object = document.getElementById(AtomicString(id)) + ->firstChild() + ->GetLayoutObject(); auto* layout_text = To(layout_object); EXPECT_TRUE(layout_text->HasNodeId()); buffer.push_back( @@ -957,20 +956,19 @@ class ContentCaptureSimTest : public SimTest { } void InsertNodeContent(Document& doc, - const std::string& id, - const std::string& content, + const String& id, + const String& content, unsigned offset) { - To(doc.getElementById(id.c_str())->firstChild()) - ->insertData(offset, String(content.c_str()), - IGNORE_EXCEPTION_FOR_TESTING); + To(doc.getElementById(AtomicString(id))->firstChild()) + ->insertData(offset, content, IGNORE_EXCEPTION_FOR_TESTING); Compositor().BeginFrame(); } void DeleteNodeContent(Document& doc, - const std::string& id, + const String& id, unsigned offset, unsigned length) { - To(doc.getElementById(id.c_str())->firstChild()) + To(doc.getElementById(AtomicString(id))->firstChild()) ->deleteData(offset, length, IGNORE_EXCEPTION_FOR_TESTING); Compositor().BeginFrame(); } @@ -984,8 +982,8 @@ class ContentCaptureSimTest : public SimTest { ->SetCapturedContentForTesting(captured_content); } - Vector main_frame_expected_text_; - Vector child_frame_expected_text_; + Vector main_frame_expected_text_; + Vector child_frame_expected_text_; Vector main_frame_content_; Vector child_frame_content_; WebContentCaptureClientTestHelper client_; @@ -1056,8 +1054,8 @@ TEST_F(ContentCaptureSimTest, ChangeNode) { EXPECT_TRUE(ChildClient().Data().empty()); EXPECT_THAT(Client().AllText(), testing::UnorderedElementsAreArray(MainFrameExpectedText())); - Vector expected_text_update; - std::string insert_text = "content "; + Vector expected_text_update; + String insert_text = "content "; // Changed content to 'content editable'. InsertMainFrameEditableContent(insert_text, 0); @@ -1071,13 +1069,13 @@ TEST_F(ContentCaptureSimTest, ChangeNode) { testing::UnorderedElementsAreArray(expected_text_update)); // Changing content multiple times before capturing. - std::string insert_text1 = "i"; + String insert_text1 = "i"; // Changed content to 'content ieditable'. - InsertMainFrameEditableContent(insert_text1, insert_text.size()); - std::string insert_text2 = "s "; + InsertMainFrameEditableContent(insert_text1, insert_text.length()); + String insert_text2 = "s "; // Changed content to 'content is editable'. InsertMainFrameEditableContent(insert_text2, - insert_text.size() + insert_text1.size()); + insert_text.length() + insert_text1.length()); SetCapturedContent(ContentType::kMainFrame); RunContentCaptureTaskUntil(ContentCaptureTask::TaskState::kStop); @@ -1092,16 +1090,16 @@ TEST_F(ContentCaptureSimTest, ChangeNode) { TEST_F(ContentCaptureSimTest, ChangeNodeBeforeCapture) { // Changed content to 'content editable' before capture. - std::string insert_text = "content "; + String insert_text = "content "; InsertMainFrameEditableContent(insert_text, 0); // Changing content multiple times before capturing. - std::string insert_text1 = "i"; + String insert_text1 = "i"; // Changed content to 'content ieditable'. - InsertMainFrameEditableContent(insert_text1, insert_text.size()); - std::string insert_text2 = "s "; + InsertMainFrameEditableContent(insert_text1, insert_text.length()); + String insert_text2 = "s "; // Changed content to 'content is editable'. InsertMainFrameEditableContent(insert_text2, - insert_text.size() + insert_text1.size()); + insert_text.length() + insert_text1.length()); // The changed content shall be captured as new content. ReplaceMainFrameExpectedText( @@ -1133,7 +1131,7 @@ TEST_F(ContentCaptureSimTest, DeleteNodeContent) { EXPECT_EQ(1u, Client().UpdatedData().size()); EXPECT_FALSE(Client().FirstData()); EXPECT_TRUE(ChildClient().Data().empty()); - Vector expected_text_update; + Vector expected_text_update; expected_text_update.push_back("edit"); EXPECT_THAT(Client().UpdatedText(), testing::UnorderedElementsAreArray(expected_text_update)); diff --git a/third_party/blink/renderer/core/content_capture/task_session.h b/third_party/blink/renderer/core/content_capture/task_session.h index 5dd59835f8ee4..1d610a148c94a 100644 --- a/third_party/blink/renderer/core/content_capture/task_session.h +++ b/third_party/blink/renderer/core/content_capture/task_session.h @@ -48,7 +48,7 @@ class TaskSession final : public GarbageCollected { class DocumentSession final : public GarbageCollected { public: // The callback for total_sent_nodes_ metrics. - using SentNodeCountCallback = base::RepeatingCallback; + using SentNodeCountCallback = base::RepeatingCallback; DocumentSession(const Document& document, SentNodeCountCallback& call_back); @@ -111,7 +111,7 @@ class TaskSession final : public GarbageCollected { bool first_data_has_sent_ = false; // This is for the metrics to record the total node that has been sent. - size_t total_sent_nodes_ = 0; + int total_sent_nodes_ = 0; // Histogram could be disabed in low time resolution OS, see // base::TimeTicks::IsHighResolution and ContentCaptureTask. absl::optional callback_; diff --git a/third_party/blink/renderer/core/css/counter_style.cc b/third_party/blink/renderer/core/css/counter_style.cc index 287d99011ea06..15140d619b90d 100644 --- a/third_party/blink/renderer/core/css/counter_style.cc +++ b/third_party/blink/renderer/core/css/counter_style.cc @@ -229,7 +229,7 @@ String CJKIdeoGraphicAlgorithm(unsigned number, }; if (number == 0) - return String(&table[kDigit0], 1); + return String(&table[kDigit0], 1u); const unsigned kGroupLength = 9; // 4 digits, 3 digit markers, group marker of size 2. @@ -427,7 +427,7 @@ String HebrewAlgorithm(unsigned number) { if (number == 0) { static const UChar kHebrewZero[3] = {0x05D0, 0x05E4, 0x05E1}; - return String(kHebrewZero, 3); + return String(kHebrewZero, 3u); } if (number <= 999) @@ -498,7 +498,7 @@ String EthiopicNumericAlgorithm(unsigned value) { if (!value) return String(); if (value < 10u) - return String(&units[value - 1], 1); + return String(&units[value - 1], 1u); // Generate characters in the reversed ordering Vector result; diff --git a/third_party/blink/renderer/core/css/css_computed_style_declaration.cc b/third_party/blink/renderer/core/css/css_computed_style_declaration.cc index 493b1e09b7120..f6d57c7b01c5c 100644 --- a/third_party/blink/renderer/core/css/css_computed_style_declaration.cc +++ b/third_party/blink/renderer/core/css/css_computed_style_declaration.cc @@ -171,7 +171,7 @@ const Vector* CSSComputedStyleDeclaration::GetVariableNames() return nullptr; } -size_t CSSComputedStyleDeclaration::GetVariableNamesCount() const { +wtf_size_t CSSComputedStyleDeclaration::GetVariableNamesCount() const { if (auto* style = ComputeComputedStyle()) return style->GetVariableNamesCount(); return 0; @@ -314,7 +314,7 @@ unsigned CSSComputedStyleDeclaration::length() const { if (!node_ || !node_->InActiveDocument()) return 0; - size_t variable_count = 0; + wtf_size_t variable_count = 0; if (RuntimeEnabledFeatures::CSSEnumeratedCustomPropertiesEnabled()) { UpdateStyleAndLayoutTreeIfNeeded(nullptr /* property_name */); diff --git a/third_party/blink/renderer/core/css/css_computed_style_declaration.h b/third_party/blink/renderer/core/css/css_computed_style_declaration.h index 63049ef8caf24..635b5027c2e07 100644 --- a/third_party/blink/renderer/core/css/css_computed_style_declaration.h +++ b/third_party/blink/renderer/core/css/css_computed_style_declaration.h @@ -95,7 +95,7 @@ class CORE_EXPORT CSSComputedStyleDeclaration final CSSRule* parentRule() const override; const ComputedStyle* ComputeComputedStyle() const; const Vector* GetVariableNames() const; - size_t GetVariableNamesCount() const; + wtf_size_t GetVariableNamesCount() const; String getPropertyValue(const String& property_name) override; String getPropertyPriority(const String& property_name) override; String GetPropertyShorthand(const String& property_name) override; diff --git a/third_party/blink/renderer/core/css/css_grid_integer_repeat_value.h b/third_party/blink/renderer/core/css/css_grid_integer_repeat_value.h index e7b5c8b56273c..9861bccb8d71c 100644 --- a/third_party/blink/renderer/core/css/css_grid_integer_repeat_value.h +++ b/third_party/blink/renderer/core/css/css_grid_integer_repeat_value.h @@ -22,7 +22,7 @@ namespace cssvalue { // [ ? ]+ ? ) class CSSGridIntegerRepeatValue : public CSSValueList { public: - CSSGridIntegerRepeatValue(size_t repetitions) + CSSGridIntegerRepeatValue(wtf_size_t repetitions) : CSSValueList(kGridIntegerRepeatClass, kSpaceSeparator), repetitions_(repetitions) { DCHECK_GT(repetitions, 0UL); @@ -31,14 +31,14 @@ class CSSGridIntegerRepeatValue : public CSSValueList { String CustomCSSText() const; bool Equals(const CSSGridIntegerRepeatValue&) const; - size_t Repetitions() const { return repetitions_; } + wtf_size_t Repetitions() const { return repetitions_; } void TraceAfterDispatch(blink::Visitor* visitor) const { CSSValueList::TraceAfterDispatch(visitor); } private: - const size_t repetitions_; + const wtf_size_t repetitions_; }; } // namespace cssvalue diff --git a/third_party/blink/renderer/core/css/css_grid_template_areas_value.cc b/third_party/blink/renderer/core/css/css_grid_template_areas_value.cc index 57a7d1e672d75..4c3ffc6becf1e 100644 --- a/third_party/blink/renderer/core/css/css_grid_template_areas_value.cc +++ b/third_party/blink/renderer/core/css/css_grid_template_areas_value.cc @@ -37,8 +37,8 @@ namespace cssvalue { CSSGridTemplateAreasValue::CSSGridTemplateAreasValue( const NamedGridAreaMap& grid_area_map, - size_t row_count, - size_t column_count) + wtf_size_t row_count, + wtf_size_t column_count) : CSSValue(kGridTemplateAreasClass), grid_area_map_(grid_area_map), row_count_(row_count), @@ -48,8 +48,8 @@ CSSGridTemplateAreasValue::CSSGridTemplateAreasValue( } static String StringForPosition(const NamedGridAreaMap& grid_area_map, - size_t row, - size_t column) { + wtf_size_t row, + wtf_size_t column) { for (const auto& item : grid_area_map) { const GridArea& area = item.value; if (row >= area.rows.StartLine() && row < area.rows.EndLine() && @@ -62,9 +62,9 @@ static String StringForPosition(const NamedGridAreaMap& grid_area_map, String CSSGridTemplateAreasValue::CustomCSSText() const { StringBuilder builder; - for (size_t row = 0; row < row_count_; ++row) { + for (wtf_size_t row = 0; row < row_count_; ++row) { builder.Append('"'); - for (size_t column = 0; column < column_count_; ++column) { + for (wtf_size_t column = 0; column < column_count_; ++column) { builder.Append(StringForPosition(grid_area_map_, row, column)); if (column != column_count_ - 1) builder.Append(' '); diff --git a/third_party/blink/renderer/core/css/css_grid_template_areas_value.h b/third_party/blink/renderer/core/css/css_grid_template_areas_value.h index 69e7b35f552e1..10779e6bbbbb1 100644 --- a/third_party/blink/renderer/core/css/css_grid_template_areas_value.h +++ b/third_party/blink/renderer/core/css/css_grid_template_areas_value.h @@ -42,15 +42,15 @@ namespace cssvalue { class CSSGridTemplateAreasValue : public CSSValue { public: CSSGridTemplateAreasValue(const NamedGridAreaMap&, - size_t row_count, - size_t column_count); + wtf_size_t row_count, + wtf_size_t column_count); ~CSSGridTemplateAreasValue() = default; String CustomCSSText() const; const NamedGridAreaMap& GridAreaMap() const { return grid_area_map_; } - size_t RowCount() const { return row_count_; } - size_t ColumnCount() const { return column_count_; } + wtf_size_t RowCount() const { return row_count_; } + wtf_size_t ColumnCount() const { return column_count_; } bool Equals(const CSSGridTemplateAreasValue&) const; @@ -60,8 +60,8 @@ class CSSGridTemplateAreasValue : public CSSValue { private: NamedGridAreaMap grid_area_map_; - size_t row_count_; - size_t column_count_; + wtf_size_t row_count_; + wtf_size_t column_count_; }; } // namespace cssvalue diff --git a/third_party/blink/renderer/core/css/css_numeric_literal_value.cc b/third_party/blink/renderer/core/css/css_numeric_literal_value.cc index 7fd5c34f0cab2..eb3bffe794cea 100644 --- a/third_party/blink/renderer/core/css/css_numeric_literal_value.cc +++ b/third_party/blink/renderer/core/css/css_numeric_literal_value.cc @@ -247,7 +247,7 @@ String CSSNumericLiteralValue::CustomCSSText() const { int int_value = value; const char* unit_type = UnitTypeToString(GetType()); builder.AppendNumber(int_value); - builder.Append(unit_type, strlen(unit_type)); + builder.Append(unit_type, static_cast(strlen(unit_type))); text = builder.ToString(); } } break; diff --git a/third_party/blink/renderer/core/css/css_property_value_set.cc b/third_party/blink/renderer/core/css/css_property_value_set.cc index fa8a22ed041bd..d9dd89ec5fac8 100644 --- a/third_party/blink/renderer/core/css/css_property_value_set.cc +++ b/third_party/blink/renderer/core/css/css_property_value_set.cc @@ -433,7 +433,8 @@ bool MutableCSSPropertyValueSet::SetProperty(const CSSPropertyValue& property, const CSSProperty& prop = CSSProperty::Get(property.Id()); if (prop.IsInLogicalPropertyGroup()) { DCHECK(property_vector_.Contains(*to_replace)); - int to_replace_index = to_replace - property_vector_.begin(); + int to_replace_index = + static_cast(to_replace - property_vector_.begin()); for (int n = property_vector_.size() - 1; n > to_replace_index; --n) { if (prop.IsInSameLogicalPropertyGroupWithDifferentMappingLogic( PropertyAt(n).Id())) { diff --git a/third_party/blink/renderer/core/css/font_face_cache_test.cc b/third_party/blink/renderer/core/css/font_face_cache_test.cc index faa75bc744643..91fe60a993da0 100644 --- a/third_party/blink/renderer/core/css/font_face_cache_test.cc +++ b/third_party/blink/renderer/core/css/font_face_cache_test.cc @@ -72,7 +72,7 @@ void FontFaceCacheTest::AppendTestFaceForCapabilities(const CSSValue& stretch, *family_name), CSSPropertyValue(CSSPropertyName(CSSPropertyID::kSrc), *src_value_list)}; auto* font_face_descriptor = MakeGarbageCollected( - properties, base::size(properties)); + properties, static_cast(base::size(properties))); font_face_descriptor->SetProperty(CSSPropertyID::kFontStretch, stretch); font_face_descriptor->SetProperty(CSSPropertyID::kFontStyle, style); diff --git a/third_party/blink/renderer/core/css/parser/css_parser_context.cc b/third_party/blink/renderer/core/css/parser/css_parser_context.cc index da70cdc5f5beb..16de152cc3acc 100644 --- a/third_party/blink/renderer/core/css/parser/css_parser_context.cc +++ b/third_party/blink/renderer/core/css/parser/css_parser_context.cc @@ -261,7 +261,7 @@ void CSSParserContext::ReportLayoutAnimationsViolationIfNeeded( const StyleRuleKeyframe& rule) const { if (!document_ || !document_->GetExecutionContext()) return; - for (size_t i = 0; i < rule.Properties().PropertyCount(); ++i) { + for (unsigned i = 0; i < rule.Properties().PropertyCount(); ++i) { CSSPropertyID id = rule.Properties().PropertyAt(i).Id(); if (id == CSSPropertyID::kVariable) continue; diff --git a/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc b/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc index 94ad881a5d4d5..da3d47c865ff7 100644 --- a/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc +++ b/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc @@ -366,7 +366,8 @@ static bool ParseColorNumberOrPercentage(const CharacterType*& string, } template -static inline bool IsTenthAlpha(const CharacterType* string, const int length) { +static inline bool IsTenthAlpha(const CharacterType* string, + const wtf_size_t length) { // "0.X" if (length == 3 && string[0] == '0' && string[1] == '.' && IsASCIIDigit(string[2])) @@ -396,7 +397,7 @@ static inline bool ParseAlphaValue(const CharacterType*& string, value = 0; - size_t length = end - string; + wtf_size_t length = static_cast(end - string); if (length < 2) return false; diff --git a/third_party/blink/renderer/core/css/properties/computed_style_utils.cc b/third_party/blink/renderer/core/css/properties/computed_style_utils.cc index 1392d1b365edd..789e7d51b33bc 100644 --- a/third_party/blink/renderer/core/css/properties/computed_style_utils.cc +++ b/third_party/blink/renderer/core/css/properties/computed_style_utils.cc @@ -1306,18 +1306,17 @@ void PopulateGridTrackList(CSSValueList* list, OrderedNamedLinesCollector& collector, const Vector& tracks, F getTrackSize, - int start, - int end, + wtf_size_t start, + wtf_size_t end, int offset = 0) { - DCHECK_LE(0, start); DCHECK_LE(start, end); - DCHECK_LE((unsigned)end, tracks.size()); - for (int i = start; i < end; ++i) { - if (i + offset >= 0) + DCHECK_LE(end, tracks.size()); + for (wtf_size_t i = start; i < end; ++i) { + if (offset >= 0 || i >= static_cast(-offset)) AddValuesForNamedGridLinesAtIndex(collector, i + offset, *list); list->Append(*getTrackSize(tracks[i])); } - if (end + offset >= 0) + if (offset >= 0 || end >= static_cast(-offset)) AddValuesForNamedGridLinesAtIndex(collector, end + offset, *list); } @@ -1374,7 +1373,8 @@ CSSValue* ComputedStyleUtils::ValueForGridTrackList( // Named grid line indices are relative to the explicit grid, but we are // including all tracks. So we need to subtract the number of leading // implicit tracks in order to get the proper line index. - int offset = -grid->ExplicitGridStartForDirection(direction); + int offset = -base::checked_cast( + grid->ExplicitGridStartForDirection(direction)); PopulateGridTrackList( list, collector, grid->TrackSizesForComputedStyle(direction), [&](const LayoutUnit& v) { return ZoomAdjustedPixelValue(v, style); }, @@ -1395,7 +1395,7 @@ CSSValue* ComputedStyleUtils::ValueForGridTrackList( } // Add the line names and track sizes that precede the auto repeat(). - size_t auto_repeat_insertion_point = + wtf_size_t auto_repeat_insertion_point = is_row_axis ? style.GridAutoRepeatColumnsInsertionPoint() : style.GridAutoRepeatRowsInsertionPoint(); PopulateGridTrackList(list, collector, track_sizes, getTrackSize, 0, diff --git a/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc b/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc index 295536ea3f923..e121e52b58bdd 100644 --- a/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc +++ b/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc @@ -4033,7 +4033,7 @@ bool ConsumeGridTrackRepeatFunction(CSSParserTokenRange& range, repetitions = std::min(repetitions, kGridMaxTracks / number_of_tracks); auto* integer_repeated_values = MakeGarbageCollected(repetitions); - for (size_t i = 0; i < repeated_values->length(); ++i) + for (wtf_size_t i = 0; i < repeated_values->length(); ++i) integer_repeated_values->Append(repeated_values->Item(i)); list.Append(*integer_repeated_values); } @@ -4052,8 +4052,8 @@ bool ConsumeGridTemplateRowsAndAreasAndColumns(bool important, DCHECK(!template_areas); NamedGridAreaMap grid_area_map; - size_t row_count = 0; - size_t column_count = 0; + wtf_size_t row_count = 0; + wtf_size_t column_count = 0; CSSValueList* template_rows_value_list = CSSValueList::CreateSpaceSeparated(); // Persists between loop iterations so we can use the same value for @@ -4208,8 +4208,8 @@ CSSValue* ConsumeGridTrackList(CSSParserTokenRange& range, bool ParseGridTemplateAreasRow(const String& grid_row_names, NamedGridAreaMap& grid_area_map, - const size_t row_count, - size_t& column_count) { + const wtf_size_t row_count, + wtf_size_t& column_count) { if (grid_row_names.ContainsOnlyWhitespaceOrEmpty()) return false; @@ -4225,7 +4225,7 @@ bool ParseGridTemplateAreasRow(const String& grid_row_names, return false; } - for (size_t current_column = 0; current_column < column_count; + for (wtf_size_t current_column = 0; current_column < column_count; ++current_column) { const String& grid_area_name = column_names[current_column]; @@ -4233,7 +4233,7 @@ bool ParseGridTemplateAreasRow(const String& grid_row_names, if (grid_area_name == ".") continue; - size_t look_ahead_column = current_column + 1; + wtf_size_t look_ahead_column = current_column + 1; while (look_ahead_column < column_count && column_names[look_ahead_column] == grid_area_name) look_ahead_column++; diff --git a/third_party/blink/renderer/core/css/properties/css_parsing_utils.h b/third_party/blink/renderer/core/css/properties/css_parsing_utils.h index bb92825d85eed..4e7041347644b 100644 --- a/third_party/blink/renderer/core/css/properties/css_parsing_utils.h +++ b/third_party/blink/renderer/core/css/properties/css_parsing_utils.h @@ -384,8 +384,8 @@ CSSValue* ConsumeGridTrackList(CSSParserTokenRange&, TrackListType); bool ParseGridTemplateAreasRow(const WTF::String& grid_row_names, NamedGridAreaMap&, - const size_t row_count, - size_t& column_count); + const wtf_size_t row_count, + wtf_size_t& column_count); CSSValue* ConsumeGridTemplatesRowsOrColumns(CSSParserTokenRange&, const CSSParserContext&); bool ConsumeGridItemPositionShorthand(bool important, diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc index e9cfa6854a319..b1855df6adf84 100644 --- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc +++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc @@ -3333,8 +3333,8 @@ const CSSValue* GridTemplateAreas::ParseSingleValue( return css_parsing_utils::ConsumeIdent(range); NamedGridAreaMap grid_area_map; - size_t row_count = 0; - size_t column_count = 0; + wtf_size_t row_count = 0; + wtf_size_t column_count = 0; while (range.Peek().GetType() == kStringToken) { if (!css_parsing_utils::ParseGridTemplateAreasRow( diff --git a/third_party/blink/renderer/core/css/resolver/cascade_expansion.cc b/third_party/blink/renderer/core/css/resolver/cascade_expansion.cc index d801816989d0d..1c7e39d503685 100644 --- a/third_party/blink/renderer/core/css/resolver/cascade_expansion.cc +++ b/third_party/blink/renderer/core/css/resolver/cascade_expansion.cc @@ -56,7 +56,7 @@ CascadeFilter AmendFilter(CascadeFilter filter, CascadeExpansion::CascadeExpansion(const MatchedProperties& matched_properties, const Document& document, CascadeFilter filter, - size_t matched_properties_index) + wtf_size_t matched_properties_index) : document_(document), matched_properties_(matched_properties), size_(matched_properties.properties->PropertyCount()), @@ -192,7 +192,7 @@ void CascadeExpansion::AdvanceAll() { } CSSPropertyValueSet::PropertyReference CascadeExpansion::PropertyAt( - size_t index) const { + wtf_size_t index) const { DCHECK(!AtEnd()); return matched_properties_.properties->PropertyAt(index_); } diff --git a/third_party/blink/renderer/core/css/resolver/cascade_expansion.h b/third_party/blink/renderer/core/css/resolver/cascade_expansion.h index 34c6145e135f2..9f1f908eebd51 100644 --- a/third_party/blink/renderer/core/css/resolver/cascade_expansion.h +++ b/third_party/blink/renderer/core/css/resolver/cascade_expansion.h @@ -21,11 +21,11 @@ inline uint32_t EncodeMatchResultPosition(uint16_t block, return (static_cast(block) << 16) | declaration; } -inline size_t DecodeMatchedPropertiesIndex(uint32_t position) { +inline wtf_size_t DecodeMatchedPropertiesIndex(uint32_t position) { return (position >> 16) & 0xFFFF; } -inline size_t DecodeDeclarationIndex(uint32_t position) { +inline wtf_size_t DecodeDeclarationIndex(uint32_t position) { return position & 0xFFFF; } @@ -69,15 +69,15 @@ class CORE_EXPORT CascadeExpansion { public: // CascadeExpansion objects which exceed these limits will emit nothing. - static constexpr size_t kMaxDeclarationIndex = + static constexpr wtf_size_t kMaxDeclarationIndex = std::numeric_limits::max(); - static constexpr size_t kMaxMatchedPropertiesIndex = + static constexpr wtf_size_t kMaxMatchedPropertiesIndex = std::numeric_limits::max(); CascadeExpansion(const MatchedProperties&, const Document&, CascadeFilter, - size_t matched_properties_index); + wtf_size_t matched_properties_index); // We need an explicit copy constructor, since CascadeExpansion has self- // pointers. CascadeExpansion(const CascadeExpansion& o); @@ -111,7 +111,7 @@ class CORE_EXPORT CascadeExpansion { bool AdvanceVisited(); void AdvanceAll(); - CSSPropertyValueSet::PropertyReference PropertyAt(size_t) const; + CSSPropertyValueSet::PropertyReference PropertyAt(wtf_size_t) const; const Document& document_; State state_ = State::kInit; @@ -128,11 +128,11 @@ class CORE_EXPORT CascadeExpansion { // // Note that this is initialized to ~0 such that the first call to Next() // (done by the constructor) will produce ~0+1 = 0. - size_t index_ = std::numeric_limits::max(); - size_t size_; + wtf_size_t index_ = std::numeric_limits::max(); + wtf_size_t size_; CascadeFilter filter_; - const size_t matched_properties_index_; + const wtf_size_t matched_properties_index_; // The id/property of the current "virtual" declaration. In other words, // the id/property will be updated when expanding 'all', etc. diff --git a/third_party/blink/renderer/core/css/resolver/cascade_expansion_test.cc b/third_party/blink/renderer/core/css/resolver/cascade_expansion_test.cc index a45487282f49a..42c0229ae3607 100644 --- a/third_party/blink/renderer/core/css/resolver/cascade_expansion_test.cc +++ b/third_party/blink/renderer/core/css/resolver/cascade_expansion_test.cc @@ -47,7 +47,7 @@ const CSSPropertyID kVisitedPropertySamples[] = { class CascadeExpansionTest : public PageTestBase { public: CascadeExpansion ExpansionAt(const MatchResult& result, - size_t i, + wtf_size_t i, CascadeFilter filter = CascadeFilter()) { return CascadeExpansion(result.GetMatchedProperties()[i], GetDocument(), filter, i); @@ -717,7 +717,7 @@ TEST_F(CascadeExpansionTest, Position) { } TEST_F(CascadeExpansionTest, MatchedPropertiesLimit) { - constexpr size_t max = std::numeric_limits::max(); + constexpr wtf_size_t max = std::numeric_limits::max(); static_assert(CascadeExpansion::kMaxMatchedPropertiesIndex == max, "Unexpected max. If the limit increased, evaluate whether it " @@ -726,12 +726,12 @@ TEST_F(CascadeExpansionTest, MatchedPropertiesLimit) { auto* set = ParseDeclarationBlock("left:1px"); MatchResult result; - for (size_t i = 0; i < max + 3; ++i) + for (wtf_size_t i = 0; i < max + 3; ++i) result.AddMatchedProperties(set); ASSERT_EQ(max + 3u, result.GetMatchedProperties().size()); - for (size_t i = 0; i < max + 1; ++i) + for (wtf_size_t i = 0; i < max + 1; ++i) EXPECT_FALSE(ExpansionAt(result, i).AtEnd()); // The indices beyond the max should not yield anything. @@ -740,7 +740,7 @@ TEST_F(CascadeExpansionTest, MatchedPropertiesLimit) { } TEST_F(CascadeExpansionTest, MatchedDeclarationsLimit) { - constexpr size_t max = std::numeric_limits::max(); + constexpr wtf_size_t max = std::numeric_limits::max(); static_assert(CascadeExpansion::kMaxDeclarationIndex == max, "Unexpected max. If the limit increased, evaluate whether it " diff --git a/third_party/blink/renderer/core/css/resolver/cascade_map_test.cc b/third_party/blink/renderer/core/css/resolver/cascade_map_test.cc index c2d0af1e462a5..386ddb38865ee 100644 --- a/third_party/blink/renderer/core/css/resolver/cascade_map_test.cc +++ b/third_party/blink/renderer/core/css/resolver/cascade_map_test.cc @@ -12,13 +12,13 @@ namespace blink { namespace { -CascadePriority UaPriority(size_t position) { +CascadePriority UaPriority(wtf_size_t position) { return CascadePriority(CascadeOrigin::kUserAgent, false, 0, position); } -CascadePriority UserPriority(size_t position) { +CascadePriority UserPriority(wtf_size_t position) { return CascadePriority(CascadeOrigin::kUser, false, 0, position); } -CascadePriority AuthorPriority(size_t position) { +CascadePriority AuthorPriority(wtf_size_t position) { return CascadePriority(CascadeOrigin::kAuthor, false, 0, position); } diff --git a/third_party/blink/renderer/core/css/resolver/css_variable_data_test.cc b/third_party/blink/renderer/core/css/resolver/css_variable_data_test.cc index d56194ea41232..79559b71f2bce 100644 --- a/third_party/blink/renderer/core/css/resolver/css_variable_data_test.cc +++ b/third_party/blink/renderer/core/css/resolver/css_variable_data_test.cc @@ -50,7 +50,7 @@ TEST(CSSVariableDataTest, Serialize) { } TEST(CSSVariableDataTest, SerializeSpecialCases) { - const String replacement_character_string = String(&kReplacementCharacter, 1); + const String replacement_character_string(&kReplacementCharacter, 1u); const std::pair test_cases[] = { {"value\\", "value" + replacement_character_string}, {"\"value\\", "\"value\""}, diff --git a/third_party/blink/renderer/core/css/resolver/match_result.h b/third_party/blink/renderer/core/css/resolver/match_result.h index b8ab85958737f..23b278612691b 100644 --- a/third_party/blink/renderer/core/css/resolver/match_result.h +++ b/third_party/blink/renderer/core/css/resolver/match_result.h @@ -80,7 +80,7 @@ class MatchedExpansionsIterator { MatchedExpansionsIterator(Iterator iterator, const Document& document, CascadeFilter filter, - size_t index) + wtf_size_t index) : iterator_(iterator), document_(document), filter_(filter), @@ -105,7 +105,7 @@ class MatchedExpansionsIterator { Iterator iterator_; const Document& document_; CascadeFilter filter_; - size_t index_; + wtf_size_t index_; }; class MatchedExpansionsRange { diff --git a/third_party/blink/renderer/core/css/resolver/match_result_test.cc b/third_party/blink/renderer/core/css/resolver/match_result_test.cc index af8f3d618a4dd..3164f5fbf0e90 100644 --- a/third_party/blink/renderer/core/css/resolver/match_result_test.cc +++ b/third_party/blink/renderer/core/css/resolver/match_result_test.cc @@ -26,12 +26,12 @@ class MatchResultTest : public PageTestBase { return result.GetMatchedProperties().size(); } - CascadeOrigin OriginAt(const MatchResult& result, size_t index) const { + CascadeOrigin OriginAt(const MatchResult& result, wtf_size_t index) const { DCHECK_LT(index, LengthOf(result)); return result.GetMatchedProperties()[index].types_.origin; } - const TreeScope& TreeScopeAt(const MatchResult& result, size_t index) { + const TreeScope& TreeScopeAt(const MatchResult& result, wtf_size_t index) { DCHECK_EQ(CascadeOrigin::kAuthor, OriginAt(result, index)); return result.ScopeFromTreeOrder( result.GetMatchedProperties()[index].types_.tree_order); @@ -204,8 +204,8 @@ TEST_F(MatchResultTest, ExpansionsRange) { CascadeFilter filter; - size_t i = 0; - size_t size = result.GetMatchedProperties().size(); + wtf_size_t i = 0; + wtf_size_t size = result.GetMatchedProperties().size(); for (auto actual : result.Expansions(GetDocument(), filter)) { ASSERT_LT(i, size); CascadeExpansion expected(result.GetMatchedProperties()[i], GetDocument(), diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc index cb1016265b8fb..f53373e53315e 100644 --- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc +++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc @@ -948,7 +948,7 @@ GridTrackSize StyleBuilderConverter::ConvertGridTrackSize( static void ConvertGridLineNamesList( const CSSValue& value, - size_t current_named_grid_line, + wtf_size_t current_named_grid_line, NamedGridLinesMap& named_grid_lines, OrderedNamedGridLines& ordered_named_grid_lines) { DCHECK(value.IsGridLineNamesValue()); @@ -957,7 +957,7 @@ static void ConvertGridLineNamesList( String named_grid_line = To(*named_grid_line_value).Value(); NamedGridLinesMap::AddResult result = - named_grid_lines.insert(named_grid_line, Vector()); + named_grid_lines.insert(named_grid_line, Vector()); result.stored_value->value.push_back(current_named_grid_line); OrderedNamedGridLines::AddResult ordered_insertion_result = ordered_named_grid_lines.insert(current_named_grid_line, @@ -988,7 +988,7 @@ void StyleBuilderConverter::ConvertGridTrackList( Vector& auto_repeat_track_sizes, NamedGridLinesMap& auto_repeat_named_grid_lines, OrderedNamedGridLines& auto_repeat_ordered_named_grid_lines, - size_t& auto_repeat_insertion_point, + wtf_size_t& auto_repeat_insertion_point, AutoRepeatType& auto_repeat_type, StyleResolverState& state) { if (auto* identifier_value = DynamicTo(value)) { @@ -996,7 +996,7 @@ void StyleBuilderConverter::ConvertGridTrackList( return; } - size_t current_named_grid_line = 0; + wtf_size_t current_named_grid_line = 0; auto convert_line_name_or_track_size = [&](const CSSValue& curr_value) { if (curr_value.IsGridLineNamesValue()) { ConvertGridLineNamesList(curr_value, current_named_grid_line, @@ -1012,7 +1012,7 @@ void StyleBuilderConverter::ConvertGridTrackList( if (auto* grid_auto_repeat_value = DynamicTo(curr_value.Get())) { Vector repeated_track_sizes; - size_t auto_repeat_index = 0; + wtf_size_t auto_repeat_index = 0; CSSValueID auto_repeat_id = grid_auto_repeat_value->AutoRepeatID(); DCHECK(auto_repeat_id == CSSValueID::kAutoFill || auto_repeat_id == CSSValueID::kAutoFit); @@ -1043,8 +1043,8 @@ void StyleBuilderConverter::ConvertGridTrackList( if (auto* repeated_values = DynamicTo(curr_value.Get())) { - size_t repetitions = repeated_values->Repetitions(); - for (size_t i = 0; i < repetitions; ++i) { + wtf_size_t repetitions = repeated_values->Repetitions(); + for (wtf_size_t i = 0; i < repetitions; ++i) { for (auto curr_repeat_value : *repeated_values) convert_line_name_or_track_size(*curr_repeat_value); } @@ -1085,14 +1085,14 @@ void StyleBuilderConverter::CreateImplicitNamedGridLinesFromGridArea( : named_grid_area_entry.value.columns; { NamedGridLinesMap::AddResult start_result = named_grid_lines.insert( - named_grid_area_entry.key + "-start", Vector()); + named_grid_area_entry.key + "-start", Vector()); start_result.stored_value->value.push_back(area_span.StartLine()); std::sort(start_result.stored_value->value.begin(), start_result.stored_value->value.end()); } { NamedGridLinesMap::AddResult end_result = named_grid_lines.insert( - named_grid_area_entry.key + "-end", Vector()); + named_grid_area_entry.key + "-end", Vector()); end_result.stored_value->value.push_back(area_span.EndLine()); std::sort(end_result.stored_value->value.begin(), end_result.stored_value->value.end()); diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h index e749942c12aa2..7e0d2c25aae46 100644 --- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h +++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h @@ -233,7 +233,7 @@ class StyleBuilderConverter { Vector& auto_repeat_track_sizes, NamedGridLinesMap&, OrderedNamedGridLines&, - size_t& auto_repeat_insertion_point, + wtf_size_t& auto_repeat_insertion_point, AutoRepeatType&, StyleResolverState&); static void CreateImplicitNamedGridLinesFromGridArea( diff --git a/third_party/blink/renderer/core/css/resolver/style_cascade.cc b/third_party/blink/renderer/core/css/resolver/style_cascade.cc index af2f821330e7a..90d1d3f993e2d 100644 --- a/third_party/blink/renderer/core/css/resolver/style_cascade.cc +++ b/third_party/blink/renderer/core/css/resolver/style_cascade.cc @@ -75,15 +75,15 @@ const CSSValue* Parse(const CSSProperty& property, } const CSSValue* ValueAt(const MatchResult& result, uint32_t position) { - size_t matched_properties_index = DecodeMatchedPropertiesIndex(position); - size_t declaration_index = DecodeDeclarationIndex(position); + wtf_size_t matched_properties_index = DecodeMatchedPropertiesIndex(position); + wtf_size_t declaration_index = DecodeDeclarationIndex(position); const MatchedPropertiesVector& vector = result.GetMatchedProperties(); const CSSPropertyValueSet* set = vector[matched_properties_index].properties; return &set->PropertyAt(declaration_index).Value(); } const TreeScope& TreeScopeAt(const MatchResult& result, uint32_t position) { - size_t matched_properties_index = DecodeMatchedPropertiesIndex(position); + wtf_size_t matched_properties_index = DecodeMatchedPropertiesIndex(position); const MatchedProperties& properties = result.GetMatchedProperties()[matched_properties_index]; DCHECK_EQ(properties.types_.origin, CascadeOrigin::kAuthor); @@ -301,7 +301,7 @@ void StyleCascade::AnalyzeMatchResult() { void StyleCascade::AnalyzeInterpolations() { const auto& entries = interpolations_.GetEntries(); - for (size_t i = 0; i < entries.size(); ++i) { + for (wtf_size_t i = 0; i < entries.size(); ++i) { for (const auto& active_interpolation : *entries[i].map) { auto name = active_interpolation.key.GetCSSPropertyName(); uint32_t position = EncodeInterpolationPosition( @@ -423,7 +423,7 @@ void StyleCascade::ApplyMatchResult(CascadeResolver& resolver) { void StyleCascade::ApplyInterpolations(CascadeResolver& resolver) { const auto& entries = interpolations_.GetEntries(); - for (size_t i = 0; i < entries.size(); ++i) { + for (wtf_size_t i = 0; i < entries.size(); ++i) { const auto& entry = entries[i]; ApplyInterpolationMap(*entry.map, entry.origin, i, resolver); } @@ -562,7 +562,7 @@ void StyleCascade::LookupAndApplyInterpolation(const CSSProperty& property, if (property.IsVisited()) return; DCHECK(priority.GetOrigin() >= CascadeOrigin::kAnimation); - size_t index = DecodeInterpolationIndex(priority.GetPosition()); + wtf_size_t index = DecodeInterpolationIndex(priority.GetPosition()); DCHECK_LE(index, interpolations_.GetEntries().size()); const ActiveInterpolationsMap& map = *interpolations_.GetEntries()[index].map; PropertyHandle handle = ToPropertyHandle(property, priority); diff --git a/third_party/blink/renderer/core/editing/commands/editing_commands_utilities.cc b/third_party/blink/renderer/core/editing/commands/editing_commands_utilities.cc index 5d720120359fb..560d4b188545f 100644 --- a/third_party/blink/renderer/core/editing/commands/editing_commands_utilities.cc +++ b/third_party/blink/renderer/core/editing/commands/editing_commands_utilities.cc @@ -498,7 +498,7 @@ VisibleSelection SelectionForParagraphIteration( const String& NonBreakingSpaceString() { DEFINE_STATIC_LOCAL(String, non_breaking_space_string, - (&kNoBreakSpaceCharacter, 1)); + (&kNoBreakSpaceCharacter, 1u)); return non_breaking_space_string; } diff --git a/third_party/blink/renderer/core/editing/iterators/text_iterator_text_state.cc b/third_party/blink/renderer/core/editing/iterators/text_iterator_text_state.cc index 3c6b368ff8f20..bdbb9211fc904 100644 --- a/third_party/blink/renderer/core/editing/iterators/text_iterator_text_state.cc +++ b/third_party/blink/renderer/core/editing/iterators/text_iterator_text_state.cc @@ -75,7 +75,7 @@ UChar TextIteratorTextState::CharacterAt(unsigned index) const { String TextIteratorTextState::GetTextForTesting() const { if (single_character_buffer_) - return String(&single_character_buffer_, 1); + return String(&single_character_buffer_, 1u); return text_.Substring(text_start_offset_, length()); } diff --git a/third_party/blink/renderer/core/editing/iterators/text_searcher_icu_test.cc b/third_party/blink/renderer/core/editing/iterators/text_searcher_icu_test.cc index 1bc9a279fd650..6b01bc60baa2a 100644 --- a/third_party/blink/renderer/core/editing/iterators/text_searcher_icu_test.cc +++ b/third_party/blink/renderer/core/editing/iterators/text_searcher_icu_test.cc @@ -118,13 +118,13 @@ TEST(TextSearcherICUTest, BrokenSurrogate) { TextSearcherICU searcher; UChar one[1]; one[0] = 0xDB00; - const String pattern(one, 1); + const String pattern(one, 1u); searcher.SetPattern(pattern, kWholeWord); UChar two[2]; two[0] = 0x0022; two[1] = 0xDB00; - const String text(two, 2); + const String text(two, 2u); searcher.SetText(text.Characters16(), text.length()); // Note: Because even if ICU find U+DB00 but ICU doesn't think U+DB00 as diff --git a/third_party/blink/renderer/core/html/forms/date_time_edit_element.cc b/third_party/blink/renderer/core/html/forms/date_time_edit_element.cc index a44a6df44e0a6..b87ca328fd811 100644 --- a/third_party/blink/renderer/core/html/forms/date_time_edit_element.cc +++ b/third_party/blink/renderer/core/html/forms/date_time_edit_element.cc @@ -486,9 +486,10 @@ void DateTimeEditBuilder::VisitLiteral(const String& text) { WTF::unicode::CharDirection dir = WTF::unicode::Direction(text[0]); if (dir == WTF::unicode::kSegmentSeparator || dir == WTF::unicode::kWhiteSpaceNeutral || - dir == WTF::unicode::kOtherNeutral) - element->AppendChild(Text::Create(EditElement().GetDocument(), - String(&kRightToLeftMarkCharacter, 1))); + dir == WTF::unicode::kOtherNeutral) { + element->AppendChild(Text::Create( + EditElement().GetDocument(), String(&kRightToLeftMarkCharacter, 1u))); + } } element->AppendChild(Text::Create(EditElement().GetDocument(), text)); EditElement().FieldsWrapperElement()->AppendChild(element); diff --git a/third_party/blink/renderer/core/html/forms/date_time_numeric_field_element.cc b/third_party/blink/renderer/core/html/forms/date_time_numeric_field_element.cc index 5fb6190b255cc..60e51662873ba 100644 --- a/third_party/blink/renderer/core/html/forms/date_time_numeric_field_element.cc +++ b/third_party/blink/renderer/core/html/forms/date_time_numeric_field_element.cc @@ -123,7 +123,7 @@ void DateTimeNumericFieldElement::HandleKeyboardEvent( UChar char_code = static_cast(keyboard_event.charCode()); String number = - LocaleForOwner().ConvertFromLocalizedNumber(String(&char_code, 1)); + LocaleForOwner().ConvertFromLocalizedNumber(String(&char_code, 1u)); const int digit = number[0] - '0'; if (digit < 0 || digit > 9) return; diff --git a/third_party/blink/renderer/core/html/forms/type_ahead.cc b/third_party/blink/renderer/core/html/forms/type_ahead.cc index 580160f3d2c01..7f09009bf958f 100644 --- a/third_party/blink/renderer/core/html/forms/type_ahead.cc +++ b/third_party/blink/renderer/core/html/forms/type_ahead.cc @@ -80,7 +80,7 @@ int TypeAhead::HandleEvent(const KeyboardEvent& event, if (match_mode & kCycleFirstChar && c == repeating_char_) { // The user is likely trying to cycle through all the items starting // with this character, so just search on the character. - prefix = String(&c, 1); + prefix = String(&c, 1u); repeating_char_ = c; } else if (match_mode & kMatchPrefix) { prefix = buffer_.ToString(); diff --git a/third_party/blink/renderer/core/inspector/protocol_parser_test.cc b/third_party/blink/renderer/core/inspector/protocol_parser_test.cc index 8be6ecb2376aa..d8aa716d49297 100644 --- a/third_party/blink/renderer/core/inspector/protocol_parser_test.cc +++ b/third_party/blink/renderer/core/inspector/protocol_parser_test.cc @@ -463,14 +463,14 @@ TEST(ProtocolParserTest, Reading) { EXPECT_EQ(Value::TypeString, root->type()); EXPECT_TRUE(root->asString(&str_val)); UChar tmp2[] = {0x20ac, 0x33, 0x2c, 0x31, 0x34}; - EXPECT_EQ(String(tmp2, 5), str_val); + EXPECT_EQ(String(tmp2, 5u), str_val); root = ParseJSON("\"\\ud83d\\udca9\\ud83d\\udc6c\""); ASSERT_TRUE(root.get()); EXPECT_EQ(Value::TypeString, root->type()); EXPECT_TRUE(root->asString(&str_val)); UChar tmp3[] = {0xd83d, 0xdca9, 0xd83d, 0xdc6c}; - EXPECT_EQ(String(tmp3, 4), str_val); + EXPECT_EQ(String(tmp3, 4u), str_val); // Test literal root objects. root = ParseJSON("null"); diff --git a/third_party/blink/renderer/core/layout/layout_box.cc b/third_party/blink/renderer/core/layout/layout_box.cc index 478ab37ab0be9..c9d5e36dec9a7 100644 --- a/third_party/blink/renderer/core/layout/layout_box.cc +++ b/third_party/blink/renderer/core/layout/layout_box.cc @@ -242,7 +242,7 @@ LayoutUnit FileUploadControlIntrinsicInlineSize(const HTMLInputElement& input, // characters (using "0" as the nominal character). constexpr int kDefaultWidthNumChars = 34; constexpr UChar kCharacter = '0'; - const String character_as_string = String(&kCharacter, 1); + const String character_as_string = String(&kCharacter, 1u); const Font& font = box.StyleRef().GetFont(); const float min_default_label_width = kDefaultWidthNumChars * diff --git a/third_party/blink/renderer/core/layout/layout_text.cc b/third_party/blink/renderer/core/layout/layout_text.cc index 6cbee829f9ba5..9b7c46bbbcda0 100644 --- a/third_party/blink/renderer/core/layout/layout_text.cc +++ b/third_party/blink/renderer/core/layout/layout_text.cc @@ -2131,7 +2131,7 @@ void LayoutText::SecureText(UChar mask) { text_.Fill(mask); if (last_typed_character_offset_to_reveal >= 0) { text_.replace(last_typed_character_offset_to_reveal, 1, - String(&revealed_text, 1)); + String(&revealed_text, 1u)); // m_text may be updated later before timer fires. We invalidate the // lastTypedCharacterOffset to avoid inconsistency. secure_text_timer->Invalidate(); diff --git a/third_party/blink/renderer/core/layout/layout_text_control.cc b/third_party/blink/renderer/core/layout/layout_text_control.cc index 85ac80c29ef13..b686cade76091 100644 --- a/third_party/blink/renderer/core/layout/layout_text_control.cc +++ b/third_party/blink/renderer/core/layout/layout_text_control.cc @@ -201,7 +201,7 @@ float LayoutTextControl::GetAvgCharWidth(const ComputedStyle& style) { } const UChar kCh = '0'; - const String str = String(&kCh, 1); + const String str = String(&kCh, 1u); TextRun text_run = ConstructTextRun(font, str, style, TextRun::kAllowTrailingExpansion); return font.Width(text_run); diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_line_truncator.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_line_truncator.cc index a7260a454ed1e..812dce2ca2fbd 100644 --- a/third_party/blink/renderer/core/layout/ng/inline/ng_line_truncator.cc +++ b/third_party/blink/renderer/core/layout/ng/inline/ng_line_truncator.cc @@ -51,7 +51,7 @@ void NGLineTruncator::SetupEllipsis() { ellipsis_text_ = ellipsis_font_data_ && ellipsis_font_data_->GlyphForCharacter( kHorizontalEllipsisCharacter) - ? String(&kHorizontalEllipsisCharacter, 1) + ? String(&kHorizontalEllipsisCharacter, 1u) : String(u"..."); HarfBuzzShaper shaper(ellipsis_text_); ellipsis_shape_result_ = diff --git a/third_party/blink/renderer/core/style/computed_style.cc b/third_party/blink/renderer/core/style/computed_style.cc index 14bb4d27ee7f4..e563700c68f04 100644 --- a/third_party/blink/renderer/core/style/computed_style.cc +++ b/third_party/blink/renderer/core/style/computed_style.cc @@ -1869,7 +1869,7 @@ bool ComputedStyle::HasVariables() const { HasInitialVariables(InitialDataInternal().get()); } -size_t ComputedStyle::GetVariableNamesCount() const { +wtf_size_t ComputedStyle::GetVariableNamesCount() const { if (!HasVariables()) return 0; return GetVariableNames().size(); diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h index 7b6f2f5d032ec..c0c96d53ec381 100644 --- a/third_party/blink/renderer/core/style/computed_style.h +++ b/third_party/blink/renderer/core/style/computed_style.h @@ -1160,7 +1160,7 @@ class ComputedStyle : public ComputedStyleBase, // Variables. bool HasVariables() const; - CORE_EXPORT size_t GetVariableNamesCount() const; + CORE_EXPORT wtf_size_t GetVariableNamesCount() const; CORE_EXPORT const Vector& GetVariableNames() const; CORE_EXPORT const StyleInheritedVariables* InheritedVariables() const; CORE_EXPORT const StyleNonInheritedVariables* NonInheritedVariables() const; diff --git a/third_party/blink/renderer/core/style/computed_style_extra_fields.json5 b/third_party/blink/renderer/core/style/computed_style_extra_fields.json5 index 1805f1279a3df..f4e9d49ff015d 100644 --- a/third_party/blink/renderer/core/style/computed_style_extra_fields.json5 +++ b/third_party/blink/renderer/core/style/computed_style_extra_fields.json5 @@ -868,14 +868,14 @@ { name: "NamedGridAreaRowCount", field_template: "primitive", - type_name: "size_t", + type_name: "wtf_size_t", field_group: "*->grid", default_value: "0", }, { name: "NamedGridAreaColumnCount", field_template: "primitive", - type_name: "size_t", + type_name: "wtf_size_t", field_group: "*->grid", default_value: "0", }, @@ -900,14 +900,14 @@ { name: "GridAutoRepeatColumnsInsertionPoint", field_template: "primitive", - type_name: "size_t", + type_name: "wtf_size_t", field_group: "*->grid", default_value: "0", }, { name: "GridAutoRepeatRowsInsertionPoint", field_template: "primitive", - type_name: "size_t", + type_name: "wtf_size_t", field_group: "*->grid", default_value: "0", }, diff --git a/third_party/blink/renderer/core/style/grid_area.h b/third_party/blink/renderer/core/style/grid_area.h index 8071c00cc683c..0b4bf121ea2ad 100644 --- a/third_party/blink/renderer/core/style/grid_area.h +++ b/third_party/blink/renderer/core/style/grid_area.h @@ -59,13 +59,13 @@ struct GridSpan { return GridSpan(start_line, end_line, kUntranslatedDefinite); } - static GridSpan TranslatedDefiniteGridSpan(size_t start_line, - size_t end_line) { + static GridSpan TranslatedDefiniteGridSpan(wtf_size_t start_line, + wtf_size_t end_line) { return GridSpan(start_line, end_line, kTranslatedDefinite); } - static GridSpan IndefiniteGridSpan(size_t span_size = 1) { - return GridSpan(static_cast(0), span_size, kIndefinite); + static GridSpan IndefiniteGridSpan(wtf_size_t span_size = 1) { + return GridSpan(wtf_size_t{0}, span_size, kIndefinite); } bool operator==(const GridSpan& o) const { @@ -84,13 +84,13 @@ struct GridSpan { return *this < o || *this == o; } - size_t IntegerSpan() const { + wtf_size_t IntegerSpan() const { DCHECK(IsTranslatedDefinite()); DCHECK_GT(end_line_, start_line_); return end_line_ - start_line_; } - size_t IndefiniteSpanSize() const { + wtf_size_t IndefiniteSpanSize() const { DCHECK(IsIndefinite()); DCHECK_EQ(start_line_, 0); DCHECK_GT(end_line_, 0); @@ -107,28 +107,28 @@ struct GridSpan { return end_line_; } - size_t StartLine() const { + wtf_size_t StartLine() const { DCHECK(IsTranslatedDefinite()); DCHECK_GE(start_line_, 0); return start_line_; } - size_t EndLine() const { + wtf_size_t EndLine() const { DCHECK(IsTranslatedDefinite()); DCHECK_GT(end_line_, 0); return end_line_; } struct GridSpanIterator { - GridSpanIterator(size_t v) : value(v) {} + GridSpanIterator(wtf_size_t v) : value(v) {} - size_t operator*() const { return value; } - size_t operator++() { return value++; } + wtf_size_t operator*() const { return value; } + wtf_size_t operator++() { return value++; } bool operator!=(GridSpanIterator other) const { return value != other.value; } - size_t value; + wtf_size_t value; }; GridSpanIterator begin() const { @@ -145,7 +145,7 @@ struct GridSpan { bool IsTranslatedDefinite() const { return type_ == kTranslatedDefinite; } bool IsIndefinite() const { return type_ == kIndefinite; } - void Translate(size_t offset) { + void Translate(wtf_size_t offset) { DCHECK_EQ(type_, kUntranslatedDefinite); type_ = kTranslatedDefinite; diff --git a/third_party/blink/renderer/core/style/grid_positions_resolver.cc b/third_party/blink/renderer/core/style/grid_positions_resolver.cc index 32104e9a10b57..fb92a2d9d372e 100644 --- a/third_party/blink/renderer/core/style/grid_positions_resolver.cc +++ b/third_party/blink/renderer/core/style/grid_positions_resolver.cc @@ -27,8 +27,8 @@ NamedLineCollection::NamedLineCollection( const ComputedStyle& grid_container_style, const String& named_line, GridTrackSizingDirection direction, - size_t last_line, - size_t auto_repeat_tracks_count) + wtf_size_t last_line, + wtf_size_t auto_repeat_tracks_count) : last_line_(last_line), auto_repeat_total_tracks_(auto_repeat_tracks_count) { bool is_row_axis = direction == kForColumns; @@ -76,20 +76,20 @@ bool NamedLineCollection::HasNamedLines() { return HasExplicitNamedLines() || implicit_named_lines_indexes_; } -bool NamedLineCollection::Contains(size_t line) { +bool NamedLineCollection::Contains(wtf_size_t line) { CHECK(HasNamedLines()); if (line > last_line_) return false; - auto find = [](const Vector* indexes, size_t line) { + auto find = [](const Vector* indexes, wtf_size_t line) { return indexes && indexes->Find(line) != kNotFound; }; if (find(implicit_named_lines_indexes_, line)) return true; - if (auto_repeat_track_list_length_ == 0LU || line < insertion_point_) + if (auto_repeat_track_list_length_ == 0 || line < insertion_point_) return find(named_lines_indexes_, line); DCHECK(auto_repeat_total_tracks_); @@ -108,7 +108,7 @@ bool NamedLineCollection::Contains(size_t line) { find(named_lines_indexes_, insertion_point_ + 1); } - size_t auto_repeat_index_in_first_repetition = + wtf_size_t auto_repeat_index_in_first_repetition = (line - insertion_point_) % auto_repeat_track_list_length_; if (!auto_repeat_index_in_first_repetition && find(auto_repeat_named_lines_indexes_, auto_repeat_track_list_length_)) @@ -117,10 +117,10 @@ bool NamedLineCollection::Contains(size_t line) { auto_repeat_index_in_first_repetition); } -size_t NamedLineCollection::FirstExplicitPosition() { +wtf_size_t NamedLineCollection::FirstExplicitPosition() { DCHECK(HasExplicitNamedLines()); - size_t first_line = 0; + wtf_size_t first_line = 0; // If there is no auto repeat(), there must be some named line outside, return // the 1st one. Also return it if it precedes the auto-repeat(). @@ -137,10 +137,10 @@ size_t NamedLineCollection::FirstExplicitPosition() { return named_lines_indexes_->at(first_line) + auto_repeat_total_tracks_ - 1; } -size_t NamedLineCollection::FirstPosition() { +wtf_size_t NamedLineCollection::FirstPosition() { CHECK(HasNamedLines()); - size_t first_line = 0; + wtf_size_t first_line = 0; if (!implicit_named_lines_indexes_) return FirstExplicitPosition(); @@ -188,16 +188,17 @@ static void InitialAndFinalPositionsFromStyle( initial_position.SetSpanPosition(1, g_null_atom); } -static size_t LookAheadForNamedGridLine(int start, - size_t number_of_lines, - size_t grid_last_line, - NamedLineCollection& lines_collection) { +static wtf_size_t LookAheadForNamedGridLine( + int start, + wtf_size_t number_of_lines, + wtf_size_t grid_last_line, + NamedLineCollection& lines_collection) { DCHECK(number_of_lines); // Only implicit lines on the search direction are assumed to have the given // name, so we can start to look from first line. // See: https://drafts.csswg.org/css-grid/#grid-placement-span-int - size_t end = std::max(start, 0); + wtf_size_t end = std::max(start, 0); if (!lines_collection.HasNamedLines()) { end = std::max(end, grid_last_line + 1); @@ -214,7 +215,7 @@ static size_t LookAheadForNamedGridLine(int start, } static int LookBackForNamedGridLine(int end, - size_t number_of_lines, + wtf_size_t number_of_lines, int grid_last_line, NamedLineCollection& lines_collection) { DCHECK(number_of_lines); @@ -257,10 +258,10 @@ static GridSpan DefiniteGridSpanWithNamedSpanAgainstOpposite( return GridSpan::UntranslatedDefiniteGridSpan(start, end); } -size_t GridPositionsResolver::ExplicitGridColumnCount( +wtf_size_t GridPositionsResolver::ExplicitGridColumnCount( const ComputedStyle& grid_container_style, - size_t auto_repeat_tracks_count) { - return std::min( + wtf_size_t auto_repeat_tracks_count) { + return std::min( std::max( grid_container_style.GridTemplateColumns().LegacyTrackList().size() + auto_repeat_tracks_count, @@ -268,10 +269,10 @@ size_t GridPositionsResolver::ExplicitGridColumnCount( kGridMaxTracks); } -size_t GridPositionsResolver::ExplicitGridRowCount( +wtf_size_t GridPositionsResolver::ExplicitGridRowCount( const ComputedStyle& grid_container_style, - size_t auto_repeat_tracks_count) { - return std::min( + wtf_size_t auto_repeat_tracks_count) { + return std::min( std::max( grid_container_style.GridTemplateRows().LegacyTrackList().size() + auto_repeat_tracks_count, @@ -279,9 +280,10 @@ size_t GridPositionsResolver::ExplicitGridRowCount( kGridMaxTracks); } -static size_t ExplicitGridSizeForSide(const ComputedStyle& grid_container_style, - GridPositionSide side, - size_t auto_repeat_tracks_count) { +static wtf_size_t ExplicitGridSizeForSide( + const ComputedStyle& grid_container_style, + GridPositionSide side, + wtf_size_t auto_repeat_tracks_count) { return (side == kColumnStartSide || side == kColumnEndSide) ? GridPositionsResolver::ExplicitGridColumnCount( grid_container_style, auto_repeat_tracks_count) @@ -293,7 +295,7 @@ static GridSpan ResolveNamedGridLinePositionAgainstOppositePosition( const ComputedStyle& grid_container_style, int opposite_line, const GridPosition& position, - size_t auto_repeat_tracks_count, + wtf_size_t auto_repeat_tracks_count, GridPositionSide side) { DCHECK(position.IsSpan()); DCHECK(!position.NamedGridLine().IsNull()); @@ -301,8 +303,8 @@ static GridSpan ResolveNamedGridLinePositionAgainstOppositePosition( // been handled during parsing. DCHECK_GT(position.SpanPosition(), 0); - size_t last_line = ExplicitGridSizeForSide(grid_container_style, side, - auto_repeat_tracks_count); + wtf_size_t last_line = ExplicitGridSizeForSide(grid_container_style, side, + auto_repeat_tracks_count); NamedLineCollection lines_collection( grid_container_style, position.NamedGridLine(), DirectionFromSide(side), last_line, auto_repeat_tracks_count); @@ -314,7 +316,7 @@ static GridSpan DefiniteGridSpanWithSpanAgainstOpposite( int opposite_line, const GridPosition& position, GridPositionSide side) { - size_t position_offset = position.SpanPosition(); + wtf_size_t position_offset = position.SpanPosition(); if (side == kColumnStartSide || side == kRowStartSide) return GridSpan::UntranslatedDefiniteGridSpan( opposite_line - position_offset, opposite_line); @@ -328,7 +330,7 @@ static GridSpan ResolveGridPositionAgainstOppositePosition( int opposite_line, const GridPosition& position, GridPositionSide side, - size_t auto_repeat_tracks_count) { + wtf_size_t auto_repeat_tracks_count) { if (position.IsAuto()) { if (side == kColumnStartSide || side == kRowStartSide) return GridSpan::UntranslatedDefiniteGridSpan(opposite_line - 1, @@ -351,8 +353,8 @@ static GridSpan ResolveGridPositionAgainstOppositePosition( return DefiniteGridSpanWithSpanAgainstOpposite(opposite_line, position, side); } -static size_t SpanSizeFromPositions(const GridPosition& initial_position, - const GridPosition& final_position) { +static wtf_size_t SpanSizeFromPositions(const GridPosition& initial_position, + const GridPosition& final_position) { // This method will only be used when both positions need to be resolved // against the opposite one. DCHECK(initial_position.ShouldBeResolvedAgainstOppositePosition() && @@ -367,7 +369,7 @@ static size_t SpanSizeFromPositions(const GridPosition& initial_position, return span_position.SpanPosition(); } -size_t GridPositionsResolver::SpanSizeForAutoPlacedItem( +wtf_size_t GridPositionsResolver::SpanSizeForAutoPlacedItem( const ComputedStyle& grid_item_style, GridTrackSizingDirection direction) { GridPosition initial_position, final_position; @@ -380,11 +382,11 @@ static int ResolveNamedGridLinePositionFromStyle( const ComputedStyle& grid_container_style, const GridPosition& position, GridPositionSide side, - size_t auto_repeat_tracks_count) { + wtf_size_t auto_repeat_tracks_count) { DCHECK(!position.NamedGridLine().IsNull()); - size_t last_line = ExplicitGridSizeForSide(grid_container_style, side, - auto_repeat_tracks_count); + wtf_size_t last_line = ExplicitGridSizeForSide(grid_container_style, side, + auto_repeat_tracks_count); NamedLineCollection lines_collection( grid_container_style, position.NamedGridLine(), DirectionFromSide(side), last_line, auto_repeat_tracks_count); @@ -401,7 +403,7 @@ static int ResolveGridPositionFromStyle( const ComputedStyle& grid_container_style, const GridPosition& position, GridPositionSide side, - size_t auto_repeat_tracks_count) { + wtf_size_t auto_repeat_tracks_count) { switch (position.GetType()) { case kExplicitPosition: { DCHECK(position.IntegerPosition()); @@ -414,9 +416,9 @@ static int ResolveGridPositionFromStyle( if (position.IsPositive()) return position.IntegerPosition() - 1; - size_t resolved_position = abs(position.IntegerPosition()) - 1; - size_t end_of_track = ExplicitGridSizeForSide(grid_container_style, side, - auto_repeat_tracks_count); + wtf_size_t resolved_position = abs(position.IntegerPosition()) - 1; + wtf_size_t end_of_track = ExplicitGridSizeForSide( + grid_container_style, side, auto_repeat_tracks_count); return end_of_track - resolved_position; } @@ -428,8 +430,8 @@ static int ResolveGridPositionFromStyle( String named_grid_line = position.NamedGridLine(); DCHECK(!position.NamedGridLine().IsNull()); - size_t last_line = ExplicitGridSizeForSide(grid_container_style, side, - auto_repeat_tracks_count); + wtf_size_t last_line = ExplicitGridSizeForSide(grid_container_style, side, + auto_repeat_tracks_count); NamedLineCollection implicit_lines( grid_container_style, ImplicitNamedGridLineForSide(named_grid_line, side), @@ -464,7 +466,7 @@ GridSpan GridPositionsResolver::ResolveGridPositionsFromStyle( const ComputedStyle& grid_container_style, const ComputedStyle& grid_item_style, GridTrackSizingDirection direction, - size_t auto_repeat_tracks_count) { + wtf_size_t auto_repeat_tracks_count) { GridPosition initial_position, final_position; InitialAndFinalPositionsFromStyle(grid_item_style, direction, initial_position, final_position); diff --git a/third_party/blink/renderer/core/style/grid_positions_resolver.h b/third_party/blink/renderer/core/style/grid_positions_resolver.h index 13bc36500501d..54a6ffddca2b9 100644 --- a/third_party/blink/renderer/core/style/grid_positions_resolver.h +++ b/third_party/blink/renderer/core/style/grid_positions_resolver.h @@ -28,25 +28,25 @@ class NamedLineCollection { NamedLineCollection(const ComputedStyle&, const String& named_line, GridTrackSizingDirection, - size_t last_line, - size_t auto_repeat_tracks_count); + wtf_size_t last_line, + wtf_size_t auto_repeat_tracks_count); bool HasNamedLines(); - size_t FirstPosition(); + wtf_size_t FirstPosition(); - bool Contains(size_t line); + bool Contains(wtf_size_t line); private: bool HasExplicitNamedLines(); - size_t FirstExplicitPosition(); - const Vector* named_lines_indexes_ = nullptr; - const Vector* auto_repeat_named_lines_indexes_ = nullptr; - const Vector* implicit_named_lines_indexes_ = nullptr; + wtf_size_t FirstExplicitPosition(); + const Vector* named_lines_indexes_ = nullptr; + const Vector* auto_repeat_named_lines_indexes_ = nullptr; + const Vector* implicit_named_lines_indexes_ = nullptr; - size_t insertion_point_; - size_t last_line_; - size_t auto_repeat_total_tracks_; - size_t auto_repeat_track_list_length_; + wtf_size_t insertion_point_; + wtf_size_t last_line_; + wtf_size_t auto_repeat_total_tracks_; + wtf_size_t auto_repeat_track_list_length_; NamedLineCollection(const NamedLineCollection&) = delete; NamedLineCollection& operator=(const NamedLineCollection&) = delete; @@ -58,21 +58,22 @@ class GridPositionsResolver { DISALLOW_NEW(); public: - static size_t ExplicitGridColumnCount(const ComputedStyle&, - size_t auto_repeat_columns_count); - static size_t ExplicitGridRowCount(const ComputedStyle&, - size_t auto_repeat_rows_count); + static wtf_size_t ExplicitGridColumnCount( + const ComputedStyle&, + wtf_size_t auto_repeat_columns_count); + static wtf_size_t ExplicitGridRowCount(const ComputedStyle&, + wtf_size_t auto_repeat_rows_count); static GridPositionSide InitialPositionSide(GridTrackSizingDirection); static GridPositionSide FinalPositionSide(GridTrackSizingDirection); - static size_t SpanSizeForAutoPlacedItem(const ComputedStyle&, - GridTrackSizingDirection); + static wtf_size_t SpanSizeForAutoPlacedItem(const ComputedStyle&, + GridTrackSizingDirection); static GridSpan ResolveGridPositionsFromStyle( const ComputedStyle&, const ComputedStyle&, GridTrackSizingDirection, - size_t auto_repeat_tracks_count); + wtf_size_t auto_repeat_tracks_count); }; } // namespace blink diff --git a/third_party/blink/renderer/core/style/named_grid_lines_map.h b/third_party/blink/renderer/core/style/named_grid_lines_map.h index 55f5866757fe9..daa76199494ca 100644 --- a/third_party/blink/renderer/core/style/named_grid_lines_map.h +++ b/third_party/blink/renderer/core/style/named_grid_lines_map.h @@ -11,7 +11,7 @@ namespace blink { -using NamedGridLinesMap = HashMap>; +using NamedGridLinesMap = HashMap>; } // namespace blink diff --git a/third_party/blink/renderer/core/style/quotes_data.cc b/third_party/blink/renderer/core/style/quotes_data.cc index c6bf42ef00648..4e39eb0213971 100644 --- a/third_party/blink/renderer/core/style/quotes_data.cc +++ b/third_party/blink/renderer/core/style/quotes_data.cc @@ -28,8 +28,8 @@ scoped_refptr QuotesData::Create(UChar open1, UChar open2, UChar close2) { scoped_refptr data = QuotesData::Create(); - data->AddPair(std::make_pair(String(&open1, 1), String(&close1, 1))); - data->AddPair(std::make_pair(String(&open2, 1), String(&close2, 1))); + data->AddPair(std::make_pair(String(&open1, 1u), String(&close1, 1u))); + data->AddPair(std::make_pair(String(&open2, 1u), String(&close2, 1u))); return data; } diff --git a/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc b/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc index 8c7b206db1879..4910fd0f67931 100644 --- a/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc +++ b/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc @@ -20,7 +20,7 @@ class LowLatencyVideoRendererAlgorithmTest : public testing::Test { ~LowLatencyVideoRendererAlgorithmTest() override = default; scoped_refptr CreateFrame( - size_t maximum_composition_delay_in_frames) { + int maximum_composition_delay_in_frames) { const gfx::Size natural_size(8, 8); scoped_refptr frame = frame_pool_.CreateFrame( media::PIXEL_FORMAT_I420, natural_size, gfx::Rect(natural_size), diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn index 802196399fd6b..af284e43a04f6 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -2362,8 +2362,6 @@ test("blink_platform_perftests") { ] configs += [ - # TODO(crbug.com/879657): Fix size_t to int truncations. - "//build/config/compiler:no_shorten_64_warnings", "//third_party/blink/renderer/platform/wtf:wtf_config", "//third_party/blink/renderer:config", ] diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc index e450fe216cb1d..6e8ae7166e958 100644 --- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc +++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc @@ -284,7 +284,7 @@ TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsUnicodeVariants) { TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsDevanagariCommon) { SelectDevanagariFont(); UChar devanagari_common_string[] = {0x915, 0x94d, 0x930, 0x28, 0x20, 0x29}; - String devanagari_common_latin(devanagari_common_string, 6); + String devanagari_common_latin(devanagari_common_string, 6u); HarfBuzzShaper shaper(devanagari_common_latin); scoped_refptr result = shaper.Shape(&font, TextDirection::kLtr); @@ -305,7 +305,7 @@ TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsDevanagariCommonLatinCommon) { SelectDevanagariFont(); UChar devanagari_common_latin_string[] = {0x915, 0x94d, 0x930, 0x20, 0x61, 0x62, 0x2E}; - HarfBuzzShaper shaper(String(devanagari_common_latin_string, 7)); + HarfBuzzShaper shaper(String(devanagari_common_latin_string, 7u)); scoped_refptr result = shaper.Shape(&font, TextDirection::kLtr); // Ensure that there are only two scripts, Devanagari first, then Latin. @@ -324,7 +324,7 @@ TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsDevanagariCommonLatinCommon) { TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsArabicThaiHanLatin) { UChar mixed_string[] = {0x628, 0x64A, 0x629, 0xE20, 0x65E5, 0x62}; - HarfBuzzShaper shaper(String(mixed_string, 6)); + HarfBuzzShaper shaper(String(mixed_string, 6u)); scoped_refptr result = shaper.Shape(&font, TextDirection::kLtr); EXPECT_EQ(4u, TestInfo(result)->NumberOfRunsForTesting()); @@ -355,7 +355,7 @@ TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsArabicThaiHanLatin) { TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsArabicThaiHanLatinTwice) { UChar mixed_string[] = {0x628, 0x64A, 0x629, 0xE20, 0x65E5, 0x62}; - HarfBuzzShaper shaper(String(mixed_string, 6)); + HarfBuzzShaper shaper(String(mixed_string, 6u)); scoped_refptr result = shaper.Shape(&font, TextDirection::kLtr); EXPECT_EQ(4u, TestInfo(result)->NumberOfRunsForTesting()); @@ -367,7 +367,7 @@ TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsArabicThaiHanLatinTwice) { TEST_F(HarfBuzzShaperTest, ResolveCandidateRunsArabic) { UChar arabic_string[] = {0x628, 0x64A, 0x629}; - HarfBuzzShaper shaper(String(arabic_string, 3)); + HarfBuzzShaper shaper(String(arabic_string, 3u)); scoped_refptr result = shaper.Shape(&font, TextDirection::kRtl); EXPECT_EQ(1u, TestInfo(result)->NumberOfRunsForTesting()); @@ -441,7 +441,7 @@ TEST_F(HarfBuzzShaperTest, ShapeLatinSegment) { #endif TEST_F(HarfBuzzShaperTest, MAYBE_ShapeArabicWithContext) { UChar arabic_string[] = {0x647, 0x64A}; - HarfBuzzShaper shaper(String(arabic_string, 2)); + HarfBuzzShaper shaper(String(arabic_string, 2u)); scoped_refptr combined = shaper.Shape(&font, TextDirection::kRtl); @@ -908,7 +908,7 @@ TEST_F(HarfBuzzShaperTest, PositionForOffsetArabic) { UChar arabic_string[] = {0x628, 0x64A, 0x629}; TextDirection direction = TextDirection::kRtl; - HarfBuzzShaper shaper(String(arabic_string, 3)); + HarfBuzzShaper shaper(String(arabic_string, 3u)); scoped_refptr result = shaper.Shape(&font, direction); EXPECT_EQ(0.0f, result->PositionForOffset(3)); @@ -977,7 +977,7 @@ TEST_P(IncludePartialGlyphsTest, TEST_P(IncludePartialGlyphsTest, OffsetForPositionMatchesPositionForOffsetArabic) { UChar arabic_string[] = {0x628, 0x64A, 0x629}; - String string(arabic_string, 3); + String string(arabic_string, 3u); TextDirection direction = TextDirection::kRtl; HarfBuzzShaper shaper(string); @@ -997,7 +997,7 @@ TEST_P(IncludePartialGlyphsTest, TEST_P(IncludePartialGlyphsTest, OffsetForPositionMatchesPositionForOffsetMixed) { UChar mixed_string[] = {0x628, 0x64A, 0x629, 0xE20, 0x65E5, 0x62}; - String string(mixed_string, 6); + String string(mixed_string, 6u); HarfBuzzShaper shaper(string); scoped_refptr result = shaper.Shape(&font, TextDirection::kLtr); @@ -1045,7 +1045,7 @@ TEST_F(HarfBuzzShaperTest, CachedOffsetPositionMappingArabic) { UChar arabic_string[] = {0x628, 0x64A, 0x629}; TextDirection direction = TextDirection::kRtl; - HarfBuzzShaper shaper(String(arabic_string, 3)); + HarfBuzzShaper shaper(String(arabic_string, 3u)); scoped_refptr sr = shaper.Shape(&font, direction); sr->EnsurePositionData(); @@ -1057,7 +1057,7 @@ TEST_F(HarfBuzzShaperTest, CachedOffsetPositionMappingArabic) { TEST_F(HarfBuzzShaperTest, CachedOffsetPositionMappingMixed) { UChar mixed_string[] = {0x628, 0x64A, 0x629, 0xE20, 0x65E5, 0x62}; - HarfBuzzShaper shaper(String(mixed_string, 6)); + HarfBuzzShaper shaper(String(mixed_string, 6u)); scoped_refptr sr = shaper.Shape(&font, TextDirection::kLtr); sr->EnsurePositionData(); @@ -1253,7 +1253,7 @@ TEST_F(HarfBuzzShaperTest, ShapeResultCopyRangeIntoArabicThaiHanLatin) { UChar mixed_string[] = {0x628, 0x20, 0x64A, 0x629, 0x20, 0xE20, 0x65E5, 0x62}; TextDirection direction = TextDirection::kLtr; - HarfBuzzShaper shaper(String(mixed_string, 8)); + HarfBuzzShaper shaper(String(mixed_string, 8u)); scoped_refptr result = shaper.Shape(&font, direction); scoped_refptr composite_result = diff --git a/third_party/blink/renderer/platform/heap/collection_support/heap_linked_stack.h b/third_party/blink/renderer/platform/heap/collection_support/heap_linked_stack.h index 2a94b264498ef..0a864f1033e13 100644 --- a/third_party/blink/renderer/platform/heap/collection_support/heap_linked_stack.h +++ b/third_party/blink/renderer/platform/heap/collection_support/heap_linked_stack.h @@ -50,7 +50,7 @@ class HeapLinkedStack final : public GarbageCollected> { public: HeapLinkedStack() { CheckType(); } - inline size_t size() const; + inline wtf_size_t size() const; inline bool IsEmpty() const; inline void Push(const T&); @@ -81,7 +81,7 @@ class HeapLinkedStack final : public GarbageCollected> { } Member head_; - size_t size_ = 0; + wtf_size_t size_ = 0; }; template @@ -113,7 +113,7 @@ void HeapLinkedStack::Pop() { } template -size_t HeapLinkedStack::size() const { +wtf_size_t HeapLinkedStack::size() const { return size_; } diff --git a/third_party/blink/renderer/platform/heap/impl/heap.h b/third_party/blink/renderer/platform/heap/impl/heap.h index cbb12786857ac..687463dad0c46 100644 --- a/third_party/blink/renderer/platform/heap/impl/heap.h +++ b/third_party/blink/renderer/platform/heap/impl/heap.h @@ -502,8 +502,8 @@ class GarbageCollected { // Used for passing custom sizes to MakeGarbageCollected. struct AdditionalBytes { - explicit AdditionalBytes(size_t bytes) : value(bytes) {} - const size_t value; + explicit AdditionalBytes(wtf_size_t bytes) : value(bytes) {} + const wtf_size_t value; }; template diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc b/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc index 575030d37f52c..392bf50ddd3ab 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc +++ b/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc @@ -995,7 +995,7 @@ void RTCVideoEncoder::Impl::BitstreamBufferReady( metadata.vp9->spatial_layer_resolutions; } - const size_t spatial_index = metadata.vp9->spatial_idx; + const uint8_t spatial_index = metadata.vp9->spatial_idx; if (spatial_index >= current_spatial_layer_resolutions_.size()) { LogAndNotifyError( FROM_HERE, "invalid spatial index", diff --git a/third_party/blink/renderer/platform/text/platform_locale.cc b/third_party/blink/renderer/platform/text/platform_locale.cc index c977cae672cfc..06448c770ac40 100644 --- a/third_party/blink/renderer/platform/text/platform_locale.cc +++ b/third_party/blink/renderer/platform/text/platform_locale.cc @@ -520,7 +520,7 @@ bool Locale::IsDigit(UChar ch) { if (ch >= '0' && ch <= '9') return true; // Check each digit otherwise - String ch_str(&ch, 1); + String ch_str(&ch, 1u); return (ch_str == decimal_symbols_[0] || ch_str == decimal_symbols_[1] || ch_str == decimal_symbols_[2] || ch_str == decimal_symbols_[3] || ch_str == decimal_symbols_[4] || ch_str == decimal_symbols_[5] || @@ -532,7 +532,7 @@ bool Locale::IsDigit(UChar ch) { bool Locale::IsDecimalSeparator(UChar ch) { if (ch == '.') return true; - return LocalizedDecimalSeparator() == String(&ch, 1); + return LocalizedDecimalSeparator() == String(&ch, 1u); } // Is there a decimal separator in a string? diff --git a/third_party/blink/renderer/platform/text/segmented_string.cc b/third_party/blink/renderer/platform/text/segmented_string.cc index 320d877be6e2b..d3d71e00ec348 100644 --- a/third_party/blink/renderer/platform/text/segmented_string.cc +++ b/third_party/blink/renderer/platform/text/segmented_string.cc @@ -73,7 +73,7 @@ void SegmentedString::Push(UChar c) { if (current_string_.PushIfPossible(c)) return; - Prepend(SegmentedString(String(&c, 1)), PrependType::kUnconsume); + Prepend(SegmentedString(String(&c, 1u)), PrependType::kUnconsume); } void SegmentedString::Prepend(const SegmentedSubstring& s, PrependType type) { diff --git a/third_party/blink/renderer/platform/weborigin/kurl.cc b/third_party/blink/renderer/platform/weborigin/kurl.cc index ef97c83307825..39a2705996245 100644 --- a/third_party/blink/renderer/platform/weborigin/kurl.cc +++ b/third_party/blink/renderer/platform/weborigin/kurl.cc @@ -104,8 +104,9 @@ class KURLCharsetConverter final : public url::CharsetConverter { void ConvertFromUTF16(const char16_t* input, int input_length, url::CanonOutput* output) override { - std::string encoded = encoding_->Encode( - String(input, input_length), WTF::kURLEncodedEntitiesForUnencodables); + std::string encoded = + encoding_->Encode(String(input, static_cast(input_length)), + WTF::kURLEncodedEntitiesForUnencodables); output->Append(encoded.c_str(), static_cast(encoded.length())); } @@ -773,7 +774,7 @@ String EncodeWithURLEscapeSequences(const String& not_encoded_string) { UTF8Encoding().Encode(not_encoded_string, WTF::kNoUnencodables); url::RawCanonOutputT buffer; - int input_length = utf8.length(); + int input_length = base::checked_cast(utf8.length()); if (buffer.capacity() < input_length * 3) buffer.Resize(input_length * 3); diff --git a/third_party/blink/renderer/platform/weborigin/kurl_test.cc b/third_party/blink/renderer/platform/weborigin/kurl_test.cc index 91a5b9eb29201..53b1b80de41b3 100644 --- a/third_party/blink/renderer/platform/weborigin/kurl_test.cc +++ b/third_party/blink/renderer/platform/weborigin/kurl_test.cc @@ -261,7 +261,7 @@ TEST(KURLTest, DecodeURLEscapeSequences) { UChar invalid_expected_helper[6] = {0x00e4, 0x00a0, 0x00e5, 0x00a5, 0x00bd, 0}; String invalid_expected( - reinterpret_cast(invalid_expected_helper), 5); + reinterpret_cast(invalid_expected_helper), 5u); EXPECT_EQ(invalid_expected, invalid); } @@ -299,7 +299,7 @@ TEST(KURLTest, EncodeWithURLEscapeSequences) { // Also test that it gets converted to UTF-8 properly. UChar wide_input_helper[3] = {0x4f60, 0x597d, 0}; - String wide_input(reinterpret_cast(wide_input_helper), 2); + String wide_input(reinterpret_cast(wide_input_helper), 2u); String wide_reference("%E4%BD%A0%E5%A5%BD"); String wide_output = EncodeWithURLEscapeSequences(wide_input); EXPECT_EQ(wide_reference, wide_output); diff --git a/third_party/blink/renderer/platform/wtf/BUILD.gn b/third_party/blink/renderer/platform/wtf/BUILD.gn index 929d31f569d82..e49c9a982a741 100644 --- a/third_party/blink/renderer/platform/wtf/BUILD.gn +++ b/third_party/blink/renderer/platform/wtf/BUILD.gn @@ -346,9 +346,6 @@ source_set("wtf_unittests_sources") { "vector_test.cc", ] - # TODO(crbug.com/879657): Fix size_t to int truncations. - configs += [ "//build/config/compiler:no_shorten_64_warnings" ] - if (is_win) { cflags = [ "/wd4068" ] # Unknown pragma. } diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_replacement.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_replacement.cc index 20e23cfa5de6f..c2e5196ff8464 100644 --- a/third_party/blink/renderer/platform/wtf/text/text_codec_replacement.cc +++ b/third_party/blink/renderer/platform/wtf/text/text_codec_replacement.cc @@ -50,7 +50,7 @@ String TextCodecReplacement::Decode(const char*, if (!replacement_error_returned_) { replacement_error_returned_ = true; saw_error = true; - return String(&kReplacementCharacter, 1); + return String(&kReplacementCharacter, 1u); } // 3. Return finished. diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_utf16.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_utf16.cc index d628b1b7c44d5..46a68260cba25 100644 --- a/third_party/blink/renderer/platform/wtf/text/text_codec_utf16.cc +++ b/third_party/blink/renderer/platform/wtf/text/text_codec_utf16.cc @@ -78,7 +78,7 @@ String TextCodecUTF16::Decode(const char* bytes, if (really_flush && (have_lead_byte_ || have_lead_surrogate_)) { have_lead_byte_ = have_lead_surrogate_ = false; saw_error = true; - return String(&kReplacementCharacter, 1); + return String(&kReplacementCharacter, 1u); } return String(); } diff --git a/third_party/blink/renderer/platform/wtf/text/wtf_string.cc b/third_party/blink/renderer/platform/wtf/text/wtf_string.cc index 493ec16e1b0d5..014fedfdb76f1 100644 --- a/third_party/blink/renderer/platform/wtf/text/wtf_string.cc +++ b/third_party/blink/renderer/platform/wtf/text/wtf_string.cc @@ -70,6 +70,9 @@ String::String(const char* characters, unsigned length) : nullptr) {} #if defined(ARCH_CPU_64_BITS) +String::String(const UChar* characters, size_t length) + : String(characters, SafeCast(length)) {} + String::String(const char* characters, size_t length) : String(characters, SafeCast(length)) {} #endif // defined(ARCH_CPU_64_BITS) diff --git a/third_party/blink/renderer/platform/wtf/text/wtf_string.h b/third_party/blink/renderer/platform/wtf/text/wtf_string.h index a71ac694dc442..dd160cc933c04 100644 --- a/third_party/blink/renderer/platform/wtf/text/wtf_string.h +++ b/third_party/blink/renderer/platform/wtf/text/wtf_string.h @@ -89,8 +89,9 @@ class WTF_EXPORT String { String(const char* characters, unsigned length); #if defined(ARCH_CPU_64_BITS) - // Only define a size_t constructor if size_t is 64 bit otherwise + // Only define size_t constructors if size_t is 64 bit otherwise // we'd have a duplicate define. + String(const UChar* characters, size_t length); String(const char* characters, size_t length); #endif // defined(ARCH_CPU_64_BITS) diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h index a13731badaf31..e45b88b924703 100644 --- a/third_party/blink/renderer/platform/wtf/vector.h +++ b/third_party/blink/renderer/platform/wtf/vector.h @@ -2084,7 +2084,7 @@ inline auto Vector::erase(iterator first, -> iterator { DCHECK_LE(first, last); const wtf_size_t index = static_cast(first - begin()); - const wtf_size_t diff = std::distance(first, last); + const wtf_size_t diff = static_cast(std::distance(first, last)); EraseAt(index, diff); return begin() + index; }