bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 93.0.4577.0 (#902210)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-07-23 12:40:13 -04:00
parent 1ffa5528b3
commit b4ea0496e7
141 changed files with 1188 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/renderer/alloy/alloy_content_renderer_client.cc
View File

@@ -64,7 +64,6 @@
#include "components/spellcheck/renderer/spellcheck_provider.h"
#include "components/visitedlink/renderer/visitedlink_reader.h"
#include "components/web_cache/renderer/web_cache_impl.h"
#include "content/common/frame_messages.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
@@ -309,13 +308,13 @@ void AlloyContentRendererClient::RenderFrameCreated(
}
}
void AlloyContentRendererClient::RenderViewCreated(
content::RenderView* render_view) {
void AlloyContentRendererClient::WebViewCreated(blink::WebView* web_view) {
bool browser_created;
absl::optional<bool> is_windowless;
render_manager_->RenderViewCreated(render_view, browser_created,
is_windowless);
render_manager_->WebViewCreated(web_view, browser_created, is_windowless);
if (browser_created) {
auto render_view = content::RenderView::FromWebView(web_view);
CHECK(render_view);
OnBrowserCreated(render_view, is_windowless);
}
}

2
libcef/renderer/alloy/alloy_content_renderer_client.h
View File

@@ -79,7 +79,7 @@ class AlloyContentRendererClient
void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
void RenderThreadConnected() override;
void RenderFrameCreated(content::RenderFrame* render_frame) override;
void RenderViewCreated(content::RenderView* render_view) override;
void WebViewCreated(blink::WebView* web_view) override;
bool IsPluginHandledExternally(content::RenderFrame* render_frame,
const blink::WebElement& plugin_element,
const GURL& original_url,

8
libcef/renderer/chrome/chrome_content_renderer_client_cef.cc
View File

@@ -53,14 +53,12 @@ void ChromeContentRendererClientCef::RenderFrameCreated(
}
}
void ChromeContentRendererClientCef::RenderViewCreated(
content::RenderView* render_view) {
ChromeContentRendererClient::RenderViewCreated(render_view);
void ChromeContentRendererClientCef::WebViewCreated(blink::WebView* web_view) {
ChromeContentRendererClient::WebViewCreated(web_view);
bool browser_created;
absl::optional<bool> is_windowless;
render_manager_->RenderViewCreated(render_view, browser_created,
is_windowless);
render_manager_->WebViewCreated(web_view, browser_created, is_windowless);
if (is_windowless.has_value() && *is_windowless) {
LOG(ERROR) << "The chrome runtime does not support windowless browsers";
}

2
libcef/renderer/chrome/chrome_content_renderer_client_cef.h
View File

@@ -34,7 +34,7 @@ class ChromeContentRendererClientCef : public ChromeContentRendererClient {
void RenderThreadStarted() override;
void RenderThreadConnected() override;
void RenderFrameCreated(content::RenderFrame* render_frame) override;
void RenderViewCreated(content::RenderView* render_view) override;
void WebViewCreated(blink::WebView* web_view) override;
void DevToolsAgentAttached() override;
void DevToolsAgentDetached() override;
void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;

1
libcef/renderer/extensions/extensions_renderer_client.cc
View File

@@ -8,6 +8,7 @@
#include "libcef/renderer/extensions/extensions_dispatcher_delegate.h"
#include "base/command_line.h"
#include "base/stl_util.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/extensions/extension_process_policy.h"
#include "chrome/renderer/extensions/resource_request_policy.h"

9
libcef/renderer/frame_impl.cc
View File

@@ -279,15 +279,12 @@ std::unique_ptr<blink::WebURLLoader> CefFrameImpl::CreateURLLoader() {
if (!url_loader_factory_)
return nullptr;
// KeepAlive is not supported.
mojo::PendingRemote<blink::mojom::KeepAliveHandle> keep_alive_handle =
mojo::NullRemote();
return url_loader_factory_->CreateURLLoader(
blink::WebURLRequest(),
blink_glue::CreateResourceLoadingTaskRunnerHandle(frame_),
blink_glue::CreateResourceLoadingMaybeUnfreezableTaskRunnerHandle(frame_),
std::move(keep_alive_handle), blink::WebBackForwardCacheLoaderHelper());
/*keep_alive_handle=*/mojo::NullRemote(),
blink::WebBackForwardCacheLoaderHelper());
}
std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
@@ -357,7 +354,7 @@ void CefFrameImpl::OnDraggableRegionsChanged() {
if (browser_frame) {
browser_frame->UpdateDraggableRegions(
regions.empty() ? absl::nullopt
: base::make_optional(std::move(regions)));
: absl::make_optional(std::move(regions)));
}
}

18
libcef/renderer/render_manager.cc
View File

@@ -110,11 +110,19 @@ void CefRenderManager::RenderFrameCreated(
}
}
void CefRenderManager::RenderViewCreated(content::RenderView* render_view,
bool& browser_created,
absl::optional<bool>& is_windowless) {
MaybeCreateBrowser(render_view, render_view->GetMainRenderFrame(),
&browser_created, &is_windowless);
void CefRenderManager::WebViewCreated(blink::WebView* web_view,
bool& browser_created,
absl::optional<bool>& is_windowless) {
auto render_view = content::RenderView::FromWebView(web_view);
CHECK(render_view);
content::RenderFrame* render_frame = nullptr;
if (web_view->MainFrame()->IsWebLocalFrame()) {
render_frame = content::RenderFrame::FromWebFrame(
web_view->MainFrame()->ToWebLocalFrame());
}
MaybeCreateBrowser(render_view, render_frame, &browser_created,
&is_windowless);
}
void CefRenderManager::DevToolsAgentAttached() {

9
libcef/renderer/render_manager.h
View File

@@ -19,7 +19,8 @@
namespace blink {
class WebFrame;
}
class WebView;
} // namespace blink
namespace content {
class RenderFrame;
@@ -50,9 +51,9 @@ class CefRenderManager : public cef::mojom::RenderManager {
CefRenderFrameObserver* render_frame_observer,
bool& browser_created,
absl::optional<bool>& is_windowless);
void RenderViewCreated(content::RenderView* render_view,
bool& browser_created,
absl::optional<bool>& is_windowless);
void WebViewCreated(blink::WebView* web_view,
bool& browser_created,
absl::optional<bool>& is_windowless);
void DevToolsAgentAttached();
void DevToolsAgentDetached();
void ExposeInterfacesToBrowser(mojo::BinderMap* binders);