M115 final

other/SSE2/build/config/compiler/BUILD.gn

@@ -1104,6 +1104,7 @@ config("compiler_cpu_abi") {
         "-m64",
         "-O3",
         "-msse2",
+        "-mmmx",
       ]
       ldflags += [ "-m64", "-Wl,-O3", "-msse2", "-Wl,-mllvm,-import-instr-limit=30", "-Wl,-mllvm,-import-hot-multiplier=15", "-Wl,-mllvm,-import-cold-multiplier=4", ]
     } else if (current_cpu == "x86") {

src/build/config/compiler/BUILD.gn

@@ -1116,6 +1116,7 @@ config("compiler_cpu_abi") {
           "-mfpmath=sse",
           "-O3",
           "-msse3",
+          "-mmmx",
         ]
       }
     } else if (target_cpu == "arm64") {

src/chrome/browser/search/search.cc

@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors and Alex313031
+// Copyright 2023 The Chromium Authors and Alex313031
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

src/chromeos/chromeos_strings.grd

@@ -444,7 +444,7 @@
           Use as a personal device
         </message>
         <message name="IDS_ASH_SHELF_OS_INSTALL_BUTTON" desc="Text shown on install ThoriumOS Flex button on login screen.">
-          Install ThoriumOS Flex
+          Install ThoriumOS
         </message>
         <message name="IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE" desc="The title used for the Ash Launcher in the Shelf (not mentioning 'Apps' since this is a general launcher).">
           Launcher

src/media/gpu/vaapi/vaapi_video_decode_accelerator.cc

@@ -1229,11 +1229,13 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
     return BufferAllocationMode::kReduced;
   return BufferAllocationMode::kSuperReduced;
 #else
+
   // NVIDIA blobs use VDPAU
   if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
     LOG(INFO) << "VA-API driver on VDPAU backend";
     return BufferAllocationMode::kWrapVdpau;
   }
+
   // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
   // |output_mode_| as well.
   if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)

src/media/gpu/vaapi/vaapi_video_decode_accelerator.h

@@ -219,6 +219,8 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
     // Using |client_|s provided PictureBuffers and as many internally
     // allocated.
     kNormal,
+
+    // Wrap VA-API driver for VDPAU backend on NVidia
     kWrapVdpau,
   };