FIXUP: Fixes for jumbo build

Change-Id: I77c3986bab58aa047469bf7c4796af4221b069dd
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/448608
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 23 insertions, 22 deletions

diff --git a/chromium/base/BUILD.gn b/chromium/base/BUILD.gn
index 58572bf22b6..80b28c7522c 100644
--- a/chromium/base/BUILD.gn
+++ b/chromium/base/BUILD.gn
@@ -1065,6 +1065,7 @@ jumbo_component("base") {
 
   jumbo_excluded_sources = [
       "logging.cc",
+      "strings/string_piece.cc",
   ]
 
   if (is_win) {
diff --git a/chromium/base/task/single_thread_task_runner.cc b/chromium/base/task/single_thread_task_runner.cc
index f4804337df2..dea1bc10e83 100644
--- a/chromium/base/task/single_thread_task_runner.cc
+++ b/chromium/base/task/single_thread_task_runner.cc
@@ -23,7 +23,7 @@ namespace base {
 namespace {
 
 ThreadLocalPointer<SingleThreadTaskRunner::CurrentDefaultHandle>&
-CurrentDefaultHandleTls() {
+CurrentDefaultHandleTls2() {
   static NoDestructor<
       ThreadLocalPointer<SingleThreadTaskRunner::CurrentDefaultHandle>>
       instance;
@@ -36,7 +36,7 @@ CurrentDefaultHandleTls() {
 const scoped_refptr<SingleThreadTaskRunner>&
 SingleThreadTaskRunner::GetCurrentDefault() {
   const SingleThreadTaskRunner::CurrentDefaultHandle* current_default =
-      CurrentDefaultHandleTls().Get();
+      CurrentDefaultHandleTls2().Get();
   CHECK(current_default)
       << "Error: This caller requires a single-threaded context (i.e. the "
          "current task needs to run from a SingleThreadTaskRunner). If you're "
@@ -52,7 +52,7 @@ SingleThreadTaskRunner::GetCurrentDefault() {
 
 // static
 bool SingleThreadTaskRunner::HasCurrentDefault() {
-  return !!CurrentDefaultHandleTls().Get();
+  return !!CurrentDefaultHandleTls2().Get();
 }
 
 SingleThreadTaskRunner::CurrentDefaultHandle::CurrentDefaultHandle(
@@ -60,14 +60,14 @@ SingleThreadTaskRunner::CurrentDefaultHandle::CurrentDefaultHandle(
     : task_runner_(std::move(task_runner)),
       sequenced_task_runner_current_default_(task_runner_) {
   DCHECK(task_runner_->BelongsToCurrentThread());
-  DCHECK(!CurrentDefaultHandleTls().Get());
-  CurrentDefaultHandleTls().Set(this);
+  DCHECK(!CurrentDefaultHandleTls2().Get());
+  CurrentDefaultHandleTls2().Set(this);
 }
 
 SingleThreadTaskRunner::CurrentDefaultHandle::~CurrentDefaultHandle() {
   DCHECK(task_runner_->BelongsToCurrentThread());
-  DCHECK_EQ(CurrentDefaultHandleTls().Get(), this);
-  CurrentDefaultHandleTls().Set(nullptr);
+  DCHECK_EQ(CurrentDefaultHandleTls2().Get(), this);
+  CurrentDefaultHandleTls2().Set(nullptr);
 }
 
 SingleThreadTaskRunner::CurrentHandleOverride::CurrentHandleOverride(
@@ -90,7 +90,7 @@ SingleThreadTaskRunner::CurrentHandleOverride::CurrentHandleOverride(
   expected_task_runner_before_restore_ = overriding_task_runner.get();
 #endif
   SingleThreadTaskRunner::CurrentDefaultHandle* current_default =
-      CurrentDefaultHandleTls().Get();
+      CurrentDefaultHandleTls2().Get();
   SequencedTaskRunner::SetCurrentDefaultHandleTaskRunner(
       current_default->sequenced_task_runner_current_default_,
       overriding_task_runner);
@@ -109,7 +109,7 @@ SingleThreadTaskRunner::CurrentHandleOverride::CurrentHandleOverride(
 SingleThreadTaskRunner::CurrentHandleOverride::~CurrentHandleOverride() {
   if (task_runner_to_restore_) {
     SingleThreadTaskRunner::CurrentDefaultHandle* current_default =
-        CurrentDefaultHandleTls().Get();
+        CurrentDefaultHandleTls2().Get();
 
 #if DCHECK_IS_ON()
     DCHECK_EQ(expected_task_runner_before_restore_,
diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
index b31cb486406..a5b04d3d46b 100644
--- a/chromium/third_party/blink/renderer/core/dom/document.cc
+++ b/chromium/third_party/blink/renderer/core/dom/document.cc
@@ -8848,7 +8848,7 @@ static wtf_size_t MaxEventNodePathCachedEntriesValue() {
   return kMaxEventNodePathCachedEntriesValue;
 }
 
-static bool EventNodePathCachingEnabled() {
+static bool EventNodePathCachingEnabledD() {
   // Cache the feature value since checking for each event path regresses
   // performance.
   static const bool kEnabled =
@@ -8857,7 +8857,7 @@ static bool EventNodePathCachingEnabled() {
 }
 
 const EventPath::NodePath& Document::GetOrCalculateEventNodePath(Node& node) {
-  DCHECK(EventNodePathCachingEnabled());
+  DCHECK(EventNodePathCachingEnabledD());
   if (event_node_path_dom_tree_version_ != dom_tree_version_) {
     if (!event_node_path_cache_.empty()) {
       event_node_path_cache_.clear();
diff --git a/chromium/third_party/blink/renderer/core/dom/events/event_path.cc b/chromium/third_party/blink/renderer/core/dom/events/event_path.cc
index 7f3b39fed66..1698c063c10 100644
--- a/chromium/third_party/blink/renderer/core/dom/events/event_path.cc
+++ b/chromium/third_party/blink/renderer/core/dom/events/event_path.cc
@@ -111,7 +111,7 @@ EventPath::NodePath EventPath::CalculateNodePath(Node& node) {
   return node_path;
 }
 
-static bool EventNodePathCachingEnabled() {
+static bool EventNodePathCachingEnabledEP() {
   // Cache the feature value since checking for each event path regresses
   // performance.
   static const bool kEnabled =
@@ -123,7 +123,7 @@ void EventPath::CalculatePath() {
   DCHECK(node_);
   DCHECK(node_event_contexts_.empty());
 
-  if (EventNodePathCachingEnabled())
+  if (EventNodePathCachingEnabledEP())
     CalculatePathCachingEnabled();
   else
     CalculatePathCachingDisabled();
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
index 264b1d5b334..50102d928c6 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
@@ -45,11 +45,11 @@ namespace blink {
 
 namespace {
 
-class BaselineAccumulator {
+class BaselineAccumulatorFlex {
   STACK_ALLOCATED();
 
  public:
-  explicit BaselineAccumulator(const ComputedStyle& style)
+  explicit BaselineAccumulatorFlex(const ComputedStyle& style)
       : font_baseline_(style.GetFontBaseline()) {}
 
   void AccumulateItem(const NGBoxFragment& fragment,
@@ -1431,7 +1431,7 @@ NGLayoutResult::EStatus NGFlexLayoutAlgorithm::GiveItemsFinalPositionAndSize(
     }
   }
 
-  BaselineAccumulator baseline_accumulator(Style());
+  BaselineAccumulatorFlex baseline_accumulator(Style());
   NGLayoutResult::EStatus status = NGLayoutResult::kSuccess;
 
   for (wtf_size_t flex_line_idx = 0; flex_line_idx < flex_line_outputs->size();
@@ -1578,7 +1578,7 @@ NGFlexLayoutAlgorithm::GiveItemsFinalPositionAndSizeForFragmentation(
   if (BreakToken())
     previously_consumed_block_size = BreakToken()->ConsumedBlockSize();
 
-  BaselineAccumulator baseline_accumulator(Style());
+  BaselineAccumulatorFlex baseline_accumulator(Style());
   for (auto entry = item_iterator.NextItem(*broke_before_row);
        NGFlexItem* flex_item = entry.flex_item;
        entry = item_iterator.NextItem(*broke_before_row)) {
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
index 789d3eb33ed..41c6eb8d364 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
@@ -2972,11 +2972,11 @@ namespace {
 // opposed to DOM order). The baseline of the grid is determined by the first
 // grid item with baseline alignment in the first row. If no items have
 // baseline alignment, fall back to the first item in row-major order.
-class BaselineAccumulator {
+class BaselineAccumulatorGrid {
   STACK_ALLOCATED();
 
  public:
-  explicit BaselineAccumulator(FontBaseline font_baseline)
+  explicit BaselineAccumulatorGrid(FontBaseline font_baseline)
       : font_baseline_(font_baseline) {}
 
   void Accumulate(const GridItemData& grid_item,
@@ -3120,7 +3120,7 @@ void NGGridLayoutAlgorithm::PlaceGridItems(
         layout_data.Rows()->GetSetCount() + 1, EBreakBetween::kAuto);
   }
 
-  BaselineAccumulator baseline_accumulator(Style().GetFontBaseline());
+  BaselineAccumulatorGrid baseline_accumulator(Style().GetFontBaseline());
 
   for (const auto& grid_item : grid_items) {
     LogicalRect containing_grid_area;
@@ -3317,7 +3317,7 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmentation(
 
   HeapVector<ResultAndOffsets> result_and_offsets;
   HeapVector<GridItemPlacementData*> out_of_fragmentainer_space_item_placement;
-  BaselineAccumulator baseline_accumulator(Style().GetFontBaseline());
+  BaselineAccumulatorGrid baseline_accumulator(Style().GetFontBaseline());
   LayoutUnit max_row_expansion;
   wtf_size_t expansion_row_set_index;
   wtf_size_t breakpoint_row_set_index;
@@ -3343,7 +3343,7 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmentation(
     // Reset our state.
     result_and_offsets.clear();
     out_of_fragmentainer_space_item_placement.clear();
-    baseline_accumulator = BaselineAccumulator(Style().GetFontBaseline());
+    baseline_accumulator = BaselineAccumulatorGrid(Style().GetFontBaseline());
     max_row_expansion = LayoutUnit();
     expansion_row_set_index = kNotFound;
     breakpoint_row_set_index = kNotFound;