FIXUP: Fixes for jumbo build

Change-Id: I8bebca8f938324c33665b8675c4b1288ac455fbe
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/442708
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

6 files changed, 35 insertions, 30 deletions

diff --git a/chromium/content/browser/renderer_host/code_cache_host_impl.h b/chromium/content/browser/renderer_host/code_cache_host_impl.h
index 478b66a6569..bce49f73025 100644
--- a/chromium/content/browser/renderer_host/code_cache_host_impl.h
+++ b/chromium/content/browser/renderer_host/code_cache_host_impl.h
@@ -12,6 +12,8 @@
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
+#include "content/browser/code_cache/generated_code_cache.h"
+#include "content/browser/code_cache/generated_code_cache_context.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/base/big_buffer.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -28,8 +30,8 @@ class Origin;
 
 namespace content {
 
-class GeneratedCodeCache;
-class GeneratedCodeCacheContext;
+// class GeneratedCodeCache;
+// class GeneratedCodeCacheContext;
 
 // The implementation of a CodeCacheHost, which stores and retrieves resource
 // metadata, either bytecode or native code, generated by a renderer process.
diff --git a/chromium/third_party/blink/renderer/core/html/track/text_track.cc b/chromium/third_party/blink/renderer/core/html/track/text_track.cc
index e4e1444ce83..230bb15f754 100644
--- a/chromium/third_party/blink/renderer/core/html/track/text_track.cc
+++ b/chromium/third_party/blink/renderer/core/html/track/text_track.cc
@@ -319,7 +319,7 @@ void TextTrack::InvalidateTrackIndex() {
 }
 
 bool TextTrack::IsRendered() const {
-  if (features::IsTextBasedAudioDescriptionEnabled()) {
+  if (::features::IsTextBasedAudioDescriptionEnabled()) {
     return mode_ == TextTrackMode::kShowing &&
            (IsVisualKind() || IsSpokenKind());
   }
@@ -329,7 +329,7 @@ bool TextTrack::IsRendered() const {
 bool TextTrack::CanBeRendered() const {
   // A track can be displayed when it's of kind captions, subtitles, or
   // descriptions and hasn't failed to load.
-  if (features::IsTextBasedAudioDescriptionEnabled()) {
+  if (::features::IsTextBasedAudioDescriptionEnabled()) {
     return GetReadinessState() != kFailedToLoad &&
            (IsVisualKind() || IsSpokenKind());
   }
diff --git a/chromium/third_party/blink/renderer/modules/webaudio/convolver_handler.cc b/chromium/third_party/blink/renderer/modules/webaudio/convolver_handler.cc
index 0ad9bbd6d65..5ecd2f28112 100644
--- a/chromium/third_party/blink/renderer/modules/webaudio/convolver_handler.cc
+++ b/chromium/third_party/blink/renderer/modules/webaudio/convolver_handler.cc
@@ -31,14 +31,14 @@ namespace {
 constexpr unsigned kMaxFftSize = 32768;
 
 constexpr unsigned kDefaultNumberOfInputChannels = 2;
-constexpr unsigned kDefaultNumberOfOutputChannels = 1;
+constexpr unsigned kDefaultNumberOfOutputChannelsCH = 1;
 
 }  // namespace
 
 ConvolverHandler::ConvolverHandler(AudioNode& node, float sample_rate)
     : AudioHandler(kNodeTypeConvolver, node, sample_rate) {
   AddInput();
-  AddOutput(kDefaultNumberOfOutputChannels);
+  AddOutput(kDefaultNumberOfOutputChannelsCH);
 
   // Node-specific default mixing rules.
   channel_count_ = kDefaultNumberOfInputChannels;
diff --git a/chromium/third_party/blink/renderer/modules/webaudio/dynamics_compressor_handler.cc b/chromium/third_party/blink/renderer/modules/webaudio/dynamics_compressor_handler.cc
index 105157f4673..ed8dfb385e8 100644
--- a/chromium/third_party/blink/renderer/modules/webaudio/dynamics_compressor_handler.cc
+++ b/chromium/third_party/blink/renderer/modules/webaudio/dynamics_compressor_handler.cc
@@ -19,7 +19,7 @@ namespace blink {
 namespace {
 
 // Set output to stereo by default.
-constexpr unsigned kDefaultNumberOfOutputChannels = 2;
+constexpr unsigned kDefaultNumberOfOutputChannelsDCH = 2;
 
 }  // namespace
 
@@ -39,7 +39,7 @@ DynamicsCompressorHandler::DynamicsCompressorHandler(
       attack_(&attack),
       release_(&release) {
   AddInput();
-  AddOutput(kDefaultNumberOfOutputChannels);
+  AddOutput(kDefaultNumberOfOutputChannelsDCH);
 
   SetInternalChannelCountMode(kClampedMax);
 
@@ -108,7 +108,7 @@ void DynamicsCompressorHandler::Initialize() {
 
   AudioHandler::Initialize();
   dynamics_compressor_ = std::make_unique<DynamicsCompressor>(
-      Context()->sampleRate(), kDefaultNumberOfOutputChannels);
+      Context()->sampleRate(), kDefaultNumberOfOutputChannelsDCH);
 }
 
 bool DynamicsCompressorHandler::RequiresTailProcessing() const {
diff --git a/chromium/v8/src/objects/js-temporal-objects.cc b/chromium/v8/src/objects/js-temporal-objects.cc
index 976d3f598ed..4e6385d6235 100644
--- a/chromium/v8/src/objects/js-temporal-objects.cc
+++ b/chromium/v8/src/objects/js-temporal-objects.cc
@@ -203,10 +203,10 @@ enum class Arithmetic { kAdd, kSubtract };
 // Enum for since/until
 enum class TimePreposition { kSince, kUntil };
 
-enum class Offset { kPrefer, kUse, kIgnore, kReject };
-V8_WARN_UNUSED_RESULT Maybe<Offset> ToTemporalOffset(Isolate* isolate,
+enum class OffsetAction { kPrefer, kUse, kIgnore, kReject };
+V8_WARN_UNUSED_RESULT Maybe<OffsetAction> ToTemporalOffset(Isolate* isolate,
                                                      Handle<Object> options,
-                                                     Offset fallback,
+                                                     OffsetAction fallback,
                                                      const char* method_name);
 
 // sec-temporal-totemporalroundingmode
@@ -2182,18 +2182,18 @@ Maybe<ShowOverflow> ToTemporalOverflow(Isolate* isolate, Handle<Object> options,
 }
 
 // #sec-temporal-totemporaloffset
-Maybe<Offset> ToTemporalOffset(Isolate* isolate, Handle<Object> options,
-                               Offset fallback, const char* method_name) {
+Maybe<OffsetAction> ToTemporalOffset(Isolate* isolate, Handle<Object> options,
+                               OffsetAction fallback, const char* method_name) {
   // 1. If options is undefined, return fallback.
   if (options->IsUndefined()) return Just(fallback);
   DCHECK(options->IsJSReceiver());
 
   // 2. Return ? GetOption(options, "offset", « String », « "prefer", "use",
   // "ignore", "reject" », fallback).
-  return GetStringOption<Offset>(
+  return GetStringOption<OffsetAction>(
       isolate, Handle<JSReceiver>::cast(options), "offset", method_name,
       {"prefer", "use", "ignore", "reject"},
-      {Offset::kPrefer, Offset::kUse, Offset::kIgnore, Offset::kReject},
+      {OffsetAction::kPrefer, OffsetAction::kUse, OffsetAction::kIgnore, OffsetAction::kReject},
       fallback);
 }
 
@@ -7997,7 +7997,7 @@ MaybeHandle<BigInt> InterpretISODateTimeOffset(
     Isolate* isolate, const DateTimeRecordCommon& data,
     OffsetBehaviour offset_behaviour, int64_t offset_nanoseconds,
     Handle<JSReceiver> time_zone, Disambiguation disambiguation,
-    Offset offset_option, MatchBehaviour match_behaviour,
+    OffsetAction offset_option, MatchBehaviour match_behaviour,
     const char* method_name);
 
 // #sec-temporal-interprettemporaldatetimefields
@@ -8212,7 +8212,7 @@ MaybeHandle<Object> ToRelativeTemporalObject(Isolate* isolate,
         InterpretISODateTimeOffset(
             isolate, {result.date_time.date, result.date_time.time},
             offset_behaviour, offset_ns, time_zone, Disambiguation::kCompatible,
-            Offset::kReject, match_behaviour, method_name),
+            OffsetAction::kReject, match_behaviour, method_name),
         Object);
 
     // e. Return ? CreateTemporalZonedDateTime(epochNanoseconds, timeZone,
@@ -15975,10 +15975,10 @@ MaybeHandle<JSTemporalZonedDateTime> ToTemporalZonedDateTime(
       Handle<JSTemporalZonedDateTime>());
 
   // 8. Let offset be ? ToTemporalOffset(options, "reject").
-  enum Offset offset;
+  enum OffsetAction offset;
   MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
       isolate, offset,
-      ToTemporalOffset(isolate, options, Offset::kReject, method_name),
+      ToTemporalOffset(isolate, options, OffsetAction::kReject, method_name),
       Handle<JSTemporalZonedDateTime>());
 
   // 9. Let epochNanoseconds be ? InterpretISODateTimeOffset(result.[[Year]],
@@ -16041,10 +16041,10 @@ MaybeHandle<JSTemporalZonedDateTime> JSTemporalZonedDateTime::From(
 
     // c. Perform ? ToTemporalOffset(options, "reject").
     {
-      enum Offset offset;
+      enum OffsetAction offset;
       MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
           isolate, offset,
-          ToTemporalOffset(isolate, options, Offset::kReject, method_name),
+          ToTemporalOffset(isolate, options, OffsetAction::kReject, method_name),
           Handle<JSTemporalZonedDateTime>());
       USE(offset);
     }
@@ -16155,7 +16155,7 @@ MaybeHandle<BigInt> InterpretISODateTimeOffset(
     Isolate* isolate, const DateTimeRecordCommon& data,
     OffsetBehaviour offset_behaviour, int64_t offset_nanoseconds,
     Handle<JSReceiver> time_zone, Disambiguation disambiguation,
-    Offset offset_option, MatchBehaviour match_behaviour,
+    OffsetAction offset_option, MatchBehaviour match_behaviour,
     const char* method_name) {
   TEMPORAL_ENTER_FUNC();
 
@@ -16173,7 +16173,7 @@ MaybeHandle<BigInt> InterpretISODateTimeOffset(
 
   // 4. If offsetBehaviour is wall, or offsetOption is "ignore", then
   if (offset_behaviour == OffsetBehaviour::kWall ||
-      offset_option == Offset::kIgnore) {
+      offset_option == OffsetAction::kIgnore) {
     // a. Let instant be ? BuiltinTimeZoneGetInstantFor(timeZone, dateTime,
     // disambiguation).
     Handle<JSTemporalInstant> instant;
@@ -16187,7 +16187,7 @@ MaybeHandle<BigInt> InterpretISODateTimeOffset(
   }
   // 5. If offsetBehaviour is exact, or offsetOption is "use", then
   if (offset_behaviour == OffsetBehaviour::kExact ||
-      offset_option == Offset::kUse) {
+      offset_option == OffsetAction::kUse) {
     // a. Let epochNanoseconds be ? GetEpochFromISOParts(year, month, day, hour,
     // minute, second, millisecond, microsecond, nanosecond).
     Handle<BigInt> epoch_nanoseconds =
@@ -16209,7 +16209,7 @@ MaybeHandle<BigInt> InterpretISODateTimeOffset(
   // 6. Assert: offsetBehaviour is option.
   DCHECK_EQ(offset_behaviour, OffsetBehaviour::kOption);
   // 7. Assert: offsetOption is "prefer" or "reject".
-  DCHECK(offset_option == Offset::kPrefer || offset_option == Offset::kReject);
+  DCHECK(offset_option == OffsetAction::kPrefer || offset_option == OffsetAction::kReject);
   // 8. Let possibleInstants be ? GetPossibleInstantsFor(timeZone, dateTime).
   Handle<FixedArray> possible_instants;
   ASSIGN_RETURN_ON_EXCEPTION(
@@ -16247,7 +16247,7 @@ MaybeHandle<BigInt> InterpretISODateTimeOffset(
     }
   }
   // 10. If offsetOption is "reject", throw a RangeError exception.
-  if (offset_option == Offset::kReject) {
+  if (offset_option == OffsetAction::kReject) {
     THROW_NEW_ERROR(isolate, NEW_TEMPORAL_INVALID_ARG_RANGE_ERROR(), BigInt);
   }
   // 11. Let instant be ? DisambiguatePossibleInstants(possibleInstants,
@@ -16328,10 +16328,10 @@ MaybeHandle<JSTemporalZonedDateTime> JSTemporalZonedDateTime::With(
       Handle<JSTemporalZonedDateTime>());
 
   // 11. Let offset be ? ToTemporalOffset(options, "prefer").
-  enum Offset offset;
+  enum OffsetAction offset;
   MAYBE_ASSIGN_RETURN_ON_EXCEPTION_VALUE(
       isolate, offset,
-      ToTemporalOffset(isolate, options, Offset::kPrefer, method_name),
+      ToTemporalOffset(isolate, options, OffsetAction::kPrefer, method_name),
       Handle<JSTemporalZonedDateTime>());
 
   // 12. Let timeZone be zonedDateTime.[[TimeZone]].
@@ -17064,7 +17064,7 @@ MaybeHandle<JSTemporalZonedDateTime> JSTemporalZonedDateTime::Round(
       isolate, epoch_nanoseconds,
       InterpretISODateTimeOffset(
           isolate, round_result, OffsetBehaviour::kOption, offset_nanoseconds,
-          time_zone, Disambiguation::kCompatible, Offset::kPrefer,
+          time_zone, Disambiguation::kCompatible, OffsetAction::kPrefer,
           MatchBehaviour::kMatchExactly, method_name),
       JSTemporalZonedDateTime);
 
diff --git a/chromium/v8/src/utils/sha-256.cc b/chromium/v8/src/utils/sha-256.cc
index 4b1d2bd42b8..f55c0b4aecb 100644
--- a/chromium/v8/src/utils/sha-256.cc
+++ b/chromium/v8/src/utils/sha-256.cc
@@ -174,3 +174,6 @@ const uint8_t* SHA256_hash(const void* data, size_t len, uint8_t* digest) {
 
 }  // namespace internal
 }  // namespace v8
+
+#undef ror
+#undef shr