BASELINE: Update Chromium to 85.0.4183.14085-based

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

10 files changed, 11 insertions, 8 deletions

diff --git a/chromium/components/exo/wayland/clients/blur.cc b/chromium/components/exo/wayland/clients/blur.cc
index 4b37d4db4d3..e30e562cd8a 100644
--- a/chromium/components/exo/wayland/clients/blur.cc
+++ b/chromium/components/exo/wayland/clients/blur.cc
@@ -215,7 +215,7 @@ void Blur::Run(double sigma_x,
     }
 
     if (gr_context_) {
-      gr_context_->flush();
+      gr_context_->flushAndSubmit();
       glFinish();
     }
 
diff --git a/chromium/components/exo/wayland/clients/blur_main.cc b/chromium/components/exo/wayland/clients/blur_main.cc
index 477041346cd..f1718f8dfe6 100644
--- a/chromium/components/exo/wayland/clients/blur_main.cc
+++ b/chromium/components/exo/wayland/clients/blur_main.cc
@@ -8,6 +8,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task/single_thread_task_executor.h"
diff --git a/chromium/components/exo/wayland/clients/client_base.cc b/chromium/components/exo/wayland/clients/client_base.cc
index e2f0dd9ac27..95323b80b57 100644
--- a/chromium/components/exo/wayland/clients/client_base.cc
+++ b/chromium/components/exo/wayland/clients/client_base.cc
@@ -968,7 +968,7 @@ std::unique_ptr<ClientBase::Buffer> ClientBase::CreateDrmBuffer(
     texture_info.fFormat = kSizedInternalFormat;
     GrBackendTexture backend_texture(size.width(), size.height(),
                                      GrMipMapped::kNo, texture_info);
-    buffer->sk_surface = SkSurface::MakeFromBackendTextureAsRenderTarget(
+    buffer->sk_surface = SkSurface::MakeFromBackendTexture(
         gr_context_.get(), backend_texture, kTopLeft_GrSurfaceOrigin,
         /* sampleCnt */ 0, kColorType, /* colorSpace */ nullptr,
         /* props */ nullptr);
diff --git a/chromium/components/exo/wayland/clients/color_space.cc b/chromium/components/exo/wayland/clients/color_space.cc
index 6e366d84a06..27931638ef4 100644
--- a/chromium/components/exo/wayland/clients/color_space.cc
+++ b/chromium/components/exo/wayland/clients/color_space.cc
@@ -11,6 +11,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
diff --git a/chromium/components/exo/wayland/clients/explicit_synchronization.cc b/chromium/components/exo/wayland/clients/explicit_synchronization.cc
index cc346d2c231..a54d2cc0f94 100644
--- a/chromium/components/exo/wayland/clients/explicit_synchronization.cc
+++ b/chromium/components/exo/wayland/clients/explicit_synchronization.cc
@@ -88,7 +88,7 @@ void ExplicitSynchronizationClient::Run() {
             .toSkColor());
 
     // Create an EGLSyncKHR object to signal when rendering is done.
-    gr_context_->flush();
+    gr_context_->flushAndSubmit();
     buffer->egl_sync.reset(new ScopedEglSync(
         eglCreateSyncKHR(eglGetCurrentDisplay(), egl_sync_type_, nullptr)));
     DCHECK(buffer->egl_sync->is_valid());
diff --git a/chromium/components/exo/wayland/clients/fullscreen_shell.cc b/chromium/components/exo/wayland/clients/fullscreen_shell.cc
index 19024dafae2..59a5a76022e 100644
--- a/chromium/components/exo/wayland/clients/fullscreen_shell.cc
+++ b/chromium/components/exo/wayland/clients/fullscreen_shell.cc
@@ -112,7 +112,7 @@ void FullscreenClient::Paint(const wl_callback_listener& frame_listener) {
   canvas->drawRect(rect, paint);
 
   if (gr_context_) {
-    gr_context_->flush();
+    gr_context_->flushAndSubmit();
     glFinish();
   }
 
diff --git a/chromium/components/exo/wayland/clients/rects.cc b/chromium/components/exo/wayland/clients/rects.cc
index d4d101cc03d..8f34046b6b9 100644
--- a/chromium/components/exo/wayland/clients/rects.cc
+++ b/chromium/components/exo/wayland/clients/rects.cc
@@ -438,7 +438,7 @@ int RectsClient::Run(const ClientBase::InitParams& params,
       }
       GrContext* gr_context = gr_context_.get();
       if (gr_context) {
-        gr_context->flush();
+        gr_context->flushAndSubmit();
 
 #if defined(USE_GBM)
         if (egl_sync_type_) {
diff --git a/chromium/components/exo/wayland/clients/simple.cc b/chromium/components/exo/wayland/clients/simple.cc
index 1a517247ca2..37015530eb2 100644
--- a/chromium/components/exo/wayland/clients/simple.cc
+++ b/chromium/components/exo/wayland/clients/simple.cc
@@ -140,7 +140,7 @@ void Simple::Run(int frames,
     canvas->clear(kColors[++frame_count % base::size(kColors)]);
 
     if (gr_context_) {
-      gr_context_->flush();
+      gr_context_->flushAndSubmit();
       glFinish();
     }
 
diff --git a/chromium/components/exo/wayland/clients/subsurface.cc b/chromium/components/exo/wayland/clients/subsurface.cc
index 0ef02b65bc0..41afd463c22 100644
--- a/chromium/components/exo/wayland/clients/subsurface.cc
+++ b/chromium/components/exo/wayland/clients/subsurface.cc
@@ -98,7 +98,7 @@ void SubSurfaceClient::Run(const ClientBase::InitParams& params) {
       canvas->drawIRect(rect, paint);
       canvas->restore();
       if (gr_context_) {
-        gr_context_->flush();
+        gr_context_->flushAndSubmit();
         glFinish();
       }
       wl_surface_damage(child_surface.get(), 0, 0, kSubsurfaceWidth,
@@ -114,7 +114,7 @@ void SubSurfaceClient::Run(const ClientBase::InitParams& params) {
       static const SkColor kColors[] = {SK_ColorRED, SK_ColorBLACK};
       canvas->clear(kColors[frame_count % base::size(kColors)]);
       if (gr_context_) {
-        gr_context_->flush();
+        gr_context_->flushAndSubmit();
         glFinish();
       }
       wl_surface_set_buffer_scale(surface_.get(), scale_);
diff --git a/chromium/components/exo/wayland/clients/yuv.cc b/chromium/components/exo/wayland/clients/yuv.cc
index 026c8091448..e626a58f129 100644
--- a/chromium/components/exo/wayland/clients/yuv.cc
+++ b/chromium/components/exo/wayland/clients/yuv.cc
@@ -9,6 +9,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/task/single_thread_task_executor.h"
 #include "components/exo/wayland/clients/client_base.h"