BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 6 insertions, 4 deletions

diff --git a/chromium/v8/src/asmjs/asm-scanner.cc b/chromium/v8/src/asmjs/asm-scanner.cc
index 73140867084..3ac9ef2d6fe 100644
--- a/chromium/v8/src/asmjs/asm-scanner.cc
+++ b/chromium/v8/src/asmjs/asm-scanner.cc
@@ -99,7 +99,7 @@ void AsmJsScanner::Next() {
         preceded_by_newline_ = true;
         break;
 
-      case kEndOfInput:
+      case kEndOfInputU:
         token_ = kEndOfInput;
         return;
 
@@ -354,7 +354,7 @@ bool AsmJsScanner::ConsumeCComment() {
     if (ch == '\n') {
       preceded_by_newline_ = true;
     }
-    if (ch == kEndOfInput) {
+    if (ch == kEndOfInputU) {
       return false;
     }
   }
@@ -367,7 +367,7 @@ void AsmJsScanner::ConsumeCPPComment() {
       preceded_by_newline_ = true;
       return;
     }
-    if (ch == kEndOfInput) {
+    if (ch == kEndOfInputU) {
       return;
     }
   }
@@ -377,7 +377,7 @@ void AsmJsScanner::ConsumeString(uc32 quote) {
   // Only string allowed is 'use asm' / "use asm".
   const char* expected = "use asm";
   for (; *expected != '\0'; ++expected) {
-    if (stream_->Advance() != *expected) {
+    if (stream_->Advance() != static_cast<uc32>(*expected)) {
       token_ = kParseError;
       return;
     }
diff --git a/chromium/v8/src/asmjs/asm-scanner.h b/chromium/v8/src/asmjs/asm-scanner.h
index 076a7607e38..9e7250ff2cd 100644
--- a/chromium/v8/src/asmjs/asm-scanner.h
+++ b/chromium/v8/src/asmjs/asm-scanner.h
@@ -135,6 +135,8 @@ class V8_EXPORT_PRIVATE AsmJsScanner {
   };
   // clang-format on
 
+  static constexpr uc32 kEndOfInputU = static_cast<uc32>(kEndOfInput);
+
  private:
   Utf16CharacterStream* stream_;
   token_t token_;