Update to Chromium version 83.0.4103.14

This commit is contained in:
Marshall Greenblatt
2020-04-15 21:45:24 -04:00
parent 245bc9bfab
commit 56a01f713c
5 changed files with 8 additions and 6 deletions

View File

@@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # 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'
} }

View File

@@ -27,6 +27,7 @@ class CefVideoConsumerOSR : public viz::mojom::FrameSinkVideoConsumer {
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks> mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
callbacks) override; callbacks) override;
void OnStopped() override; void OnStopped() override;
void OnLog(const std::string& message) override {}
CefRenderWidgetHostViewOSR* const view_; CefRenderWidgetHostViewOSR* const view_;
std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_; std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_;

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc 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
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -996,10 +996,6 @@ void LaunchURL(const GURL& url, @@ -996,10 +996,6 @@ void LaunchURL(const GURL& url,

View File

@@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
} // namespace content } // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc 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
+++ 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); view_->set_is_currently_scrolling_viewport(true);
} }

View File

@@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd 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
+++ 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> </message>
</if> </if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy."> <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">