From 56a01f713c09f181d6a648bd12fc42dd06cc7ed7 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 15 Apr 2020 21:45:24 -0400
Subject: [PATCH] Update to Chromium version 83.0.4103.14

---
 CHROMIUM_BUILD_COMPATIBILITY.txt                    | 3 ++-
 libcef/browser/osr/video_consumer_osr.h             | 1 +
 patch/patches/chrome_browser_product_override.patch | 2 +-
 patch/patches/osr_fling_2745.patch                  | 4 ++--
 patch/patches/webview_plugin_2020.patch             | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index 2cb9bed7f..c1eee43a2 100644
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,5 +7,6 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'refs/tags/83.0.4103.0'
+  'chromium_checkout': 'refs/tags/83.0.4103.14',
+  'depot_tools_checkout': 'fc5e103221'
 }
diff --git a/libcef/browser/osr/video_consumer_osr.h b/libcef/browser/osr/video_consumer_osr.h
index e78973b91..a4e27411a 100644
--- a/libcef/browser/osr/video_consumer_osr.h
+++ b/libcef/browser/osr/video_consumer_osr.h
@@ -27,6 +27,7 @@ class CefVideoConsumerOSR : public viz::mojom::FrameSinkVideoConsumer {
       mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
           callbacks) override;
   void OnStopped() override;
+  void OnLog(const std::string& message) override {}
 
   CefRenderWidgetHostViewOSR* const view_;
   std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_;
diff --git a/patch/patches/chrome_browser_product_override.patch b/patch/patches/chrome_browser_product_override.patch
index 0221a73b4..b5e728c17 100644
--- a/patch/patches/chrome_browser_product_override.patch
+++ b/patch/patches/chrome_browser_product_override.patch
@@ -1,5 +1,5 @@
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index b7ff92ae4e58..6c3773b92454 100644
+index b5deda2a1739..cfa14167cc89 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
 @@ -996,10 +996,6 @@ void LaunchURL(const GURL& url,
diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch
index 84a063952..71f20a4c6 100644
--- a/patch/patches/osr_fling_2745.patch
+++ b/patch/patches/osr_fling_2745.patch
@@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
  
  }  // namespace content
 diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
-index 5ad66a6af94f..501a4dc07a9f 100644
+index fc06067480b0..4f313bdb1414 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2746,6 +2746,11 @@ void RenderWidgetHostImpl::DidStartScrollingViewport() {
+@@ -2751,6 +2751,11 @@ void RenderWidgetHostImpl::DidStartScrollingViewport() {
      view_->set_is_currently_scrolling_viewport(true);
  }
  
diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch
index c07a8f593..66d888f98 100644
--- a/patch/patches/webview_plugin_2020.patch
+++ b/patch/patches/webview_plugin_2020.patch
@@ -1,8 +1,8 @@
 diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
-index 7cbbf4a059f1..2d0c85751076 100644
+index 288c442298f6..27e2608d1531 100644
 --- chrome/app/generated_resources.grd
 +++ chrome/app/generated_resources.grd
-@@ -4970,7 +4970,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -4973,7 +4973,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
          </message>
        </if>
        <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">