mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 80.0.3987.0 (#722274)
This commit is contained in:
Alexander Guettler
committed by
Marshall Greenblatt
Marshall Greenblatt
parent
ed39922f85
commit
71768ea6c3
@@ -12,7 +12,7 @@ index 2d5b195caecb..827fcc962640 100644
|
||||
if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) {
|
||||
// The GetPlugins call causes the plugin list to be refreshed. Once that's
|
||||
diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
|
||||
index 8916d9329a6c..bd1174231578 100644
|
||||
index e46003ea5e4a..503876cf7725 100644
|
||||
--- chrome/browser/plugins/chrome_plugin_service_filter.cc
|
||||
+++ chrome/browser/plugins/chrome_plugin_service_filter.cc
|
||||
@@ -163,6 +163,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
|
||||
@@ -49,7 +49,7 @@ index 8d7b5276955d..787f338e7ca6 100644
|
||||
false /* allow_wildcard */, is_stale, &plugin_info,
|
||||
nullptr /* actual_mime_type */);
|
||||
diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
|
||||
index e7f241e8db68..fe0b6e546b86 100644
|
||||
index 000ce05d8712..5806aef4d696 100644
|
||||
--- chrome/browser/ui/views/frame/browser_root_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_root_view.cc
|
||||
@@ -69,8 +69,8 @@ void OnFindURLMimeType(const GURL& url,
|
||||
@@ -64,7 +64,7 @@ index e7f241e8db68..fe0b6e546b86 100644
|
||||
|
||||
bool GetURLForDrop(const ui::DropTargetEvent& event, GURL* url) {
|
||||
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
|
||||
index 367855448a71..c9e0ecffe5f6 100644
|
||||
index 23565fc63987..88caf430a0c9 100644
|
||||
--- content/browser/devtools/devtools_http_handler.cc
|
||||
+++ content/browser/devtools/devtools_http_handler.cc
|
||||
@@ -570,7 +570,7 @@ void DevToolsHttpHandler::OnJsonRequest(
|
||||
@@ -77,10 +77,10 @@ index 367855448a71..c9e0ecffe5f6 100644
|
||||
GetContentClient()->browser()->GetUserAgent());
|
||||
version.SetString("V8-Version", V8_VERSION_STRING);
|
||||
diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
|
||||
index e4972dba25a6..1f39e4d115c6 100644
|
||||
index c194f7a03838..450b6cb2c3ca 100644
|
||||
--- content/browser/frame_host/render_frame_message_filter.cc
|
||||
+++ content/browser/frame_host/render_frame_message_filter.cc
|
||||
@@ -328,6 +328,7 @@ void RenderFrameMessageFilter::OnAre3DAPIsBlocked(int render_frame_id,
|
||||
@@ -308,6 +308,7 @@ void RenderFrameMessageFilter::OnAre3DAPIsBlocked(int render_frame_id,
|
||||
void RenderFrameMessageFilter::OnGetPluginInfo(
|
||||
int render_frame_id,
|
||||
const GURL& url,
|
||||
@@ -88,7 +88,7 @@ index e4972dba25a6..1f39e4d115c6 100644
|
||||
const url::Origin& main_frame_origin,
|
||||
const std::string& mime_type,
|
||||
bool* found,
|
||||
@@ -335,8 +336,9 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
|
||||
@@ -315,8 +316,9 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
|
||||
std::string* actual_mime_type) {
|
||||
bool allow_wildcard = true;
|
||||
*found = plugin_service_->GetPluginInfo(
|
||||
@@ -113,10 +113,10 @@ index 307a119bb9d8..c522bfcf3298 100644
|
||||
const std::string& mime_type,
|
||||
bool* found,
|
||||
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
|
||||
index 874fb88cb970..bc6cfa7aab2e 100644
|
||||
index a223fcaccd46..9ca82d7c1c8d 100644
|
||||
--- content/browser/loader/navigation_url_loader_impl.cc
|
||||
+++ content/browser/loader/navigation_url_loader_impl.cc
|
||||
@@ -666,6 +666,13 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||
@@ -697,6 +697,13 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||
resource_request_->has_user_gesture,
|
||||
resource_request_->request_initiator, &loader_factory);
|
||||
|
||||
@@ -130,18 +130,15 @@ index 874fb88cb970..bc6cfa7aab2e 100644
|
||||
if (loader_factory) {
|
||||
factory =
|
||||
base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
|
||||
@@ -880,8 +887,9 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||
@@ -905,7 +912,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||
frame_tree_node->current_frame_host()->GetProcess()->GetID();
|
||||
int routing_id = frame_tree_node->current_frame_host()->GetRoutingID();
|
||||
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
|
||||
- render_process_id, routing_id, resource_request_->url, url::Origin(),
|
||||
- head.mime_type, false /* allow_wildcard */, &stale, &plugin, nullptr);
|
||||
+ render_process_id, routing_id, resource_request_->url, true,
|
||||
+ url::Origin(), head.mime_type, false /* allow_wildcard */, &stale,
|
||||
+ &plugin, nullptr);
|
||||
+ render_process_id, routing_id, resource_request_->url, true, url::Origin(),
|
||||
head->mime_type, false /* allow_wildcard */, &stale, &plugin, nullptr);
|
||||
|
||||
if (stale) {
|
||||
// Refresh the plugins asynchronously.
|
||||
diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
|
||||
index 4461a489227e..fea615b44abe 100644
|
||||
--- content/browser/plugin_service_impl.cc
|
||||
@@ -229,10 +226,10 @@ index 632ae86c6fd6..55b749ec1242 100644
|
||||
const std::vector<WebPluginInfo>& all_plugins);
|
||||
|
||||
diff --git content/common/frame_messages.h content/common/frame_messages.h
|
||||
index 24decdbf52a6..6438c92db226 100644
|
||||
index 06c8e08ba8d5..1e349e3c06b6 100644
|
||||
--- content/common/frame_messages.h
|
||||
+++ content/common/frame_messages.h
|
||||
@@ -1134,9 +1134,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
|
||||
@@ -1060,9 +1060,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
|
||||
// type. If there is no matching plugin, |found| is false.
|
||||
// |actual_mime_type| is the actual mime type supported by the
|
||||
// found plugin.
|
||||
@@ -245,20 +242,20 @@ index 24decdbf52a6..6438c92db226 100644
|
||||
std::string /* mime_type */,
|
||||
bool /* found */,
|
||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||
index 7a02c260cc99..333f3e32824b 100644
|
||||
index b70473936db0..0cb62733520b 100644
|
||||
--- content/public/browser/content_browser_client.h
|
||||
+++ content/public/browser/content_browser_client.h
|
||||
@@ -25,6 +25,7 @@
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "content/common/content_export.h"
|
||||
#include "content/public/browser/certificate_request_result_type.h"
|
||||
#include "content/public/browser/generated_code_cache_settings.h"
|
||||
#include "content/public/browser/page_visibility_state.h"
|
||||
+#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/common/page_visibility_state.h"
|
||||
#include "content/public/common/previews_state.h"
|
||||
#include "content/public/common/window_container_type.mojom-forward.h"
|
||||
#include "media/base/video_codecs.h"
|
||||
@@ -1570,6 +1571,14 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1611,6 +1612,14 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
const base::Optional<url::Origin>& initiating_origin,
|
||||
network::mojom::URLLoaderFactoryPtr* out_factory);
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
|
||||
|
||||
+ // Same as above, but exposing the whole ResourceRequest object.
|
||||
+ virtual bool HandleExternalProtocol(
|
||||
@@ -266,12 +263,12 @@ index 7a02c260cc99..333f3e32824b 100644
|
||||
+ int frame_tree_node_id,
|
||||
+ NavigationUIData* navigation_data,
|
||||
+ const network::ResourceRequest& request,
|
||||
+ network::mojom::URLLoaderFactoryPtr* out_factory) { return false; }
|
||||
+ mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) { return false; }
|
||||
+
|
||||
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
|
||||
// will house the content shown when in Picture-in-Picture mode. This will
|
||||
// return a new OverlayWindow.
|
||||
@@ -1633,6 +1642,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1674,6 +1683,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Used as part of the user agent string.
|
||||
virtual std::string GetProduct();
|
||||
|
||||
@@ -307,12 +304,12 @@ index 98c59005599e..69752184745d 100644
|
||||
WebPluginInfo* plugin) = 0;
|
||||
|
||||
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
|
||||
index c1ed9f008b49..d055159b66f9 100644
|
||||
index 6002ce70bb17..4198134b1b73 100644
|
||||
--- content/public/renderer/content_renderer_client.h
|
||||
+++ content/public/renderer/content_renderer_client.h
|
||||
@@ -72,6 +72,9 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
// Notifies us that the RenderThread has been created.
|
||||
virtual void RenderThreadStarted() {}
|
||||
@@ -80,6 +80,9 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
// binding requests from RenderProcessHost::BindReceiver().
|
||||
virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
|
||||
|
||||
+ // Notifies that the RenderThread can now send sync IPC messages.
|
||||
+ virtual void RenderThreadConnected() {}
|
||||
@@ -320,7 +317,7 @@ index c1ed9f008b49..d055159b66f9 100644
|
||||
// Notifies that a new RenderFrame has been created.
|
||||
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
|
||||
|
||||
@@ -308,6 +311,10 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
@@ -328,6 +331,10 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
// This method may invalidate the frame.
|
||||
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
|
||||
|
||||
@@ -331,25 +328,11 @@ index c1ed9f008b49..d055159b66f9 100644
|
||||
// Allows subclasses to enable some runtime features before Blink has
|
||||
// started.
|
||||
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
|
||||
diff --git content/public/renderer/render_frame_observer.h content/public/renderer/render_frame_observer.h
|
||||
index f764efa250cc..9b2e8c053367 100644
|
||||
--- content/public/renderer/render_frame_observer.h
|
||||
+++ content/public/renderer/render_frame_observer.h
|
||||
@@ -215,6 +215,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
|
||||
virtual void DidReceiveTransferSizeUpdate(int resource_id,
|
||||
int received_data_length) {}
|
||||
|
||||
+ // Called when this frame gains focus.
|
||||
+ virtual void FrameFocused() {}
|
||||
+
|
||||
// Called when the focused element has changed to |element|.
|
||||
virtual void FocusedElementChanged(const blink::WebElement& element) {}
|
||||
|
||||
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
|
||||
index 8163ba87762e..54978cfe503a 100644
|
||||
index 32a6927eaa93..540a6cbf450b 100644
|
||||
--- content/renderer/render_frame_impl.cc
|
||||
+++ content/renderer/render_frame_impl.cc
|
||||
@@ -4149,7 +4149,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
||||
@@ -3892,7 +3892,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
||||
std::string mime_type;
|
||||
bool found = false;
|
||||
Send(new FrameHostMsg_GetPluginInfo(
|
||||
@@ -359,22 +342,13 @@ index 8163ba87762e..54978cfe503a 100644
|
||||
params.mime_type.Utf8(), &found, &info, &mime_type));
|
||||
if (!found)
|
||||
return nullptr;
|
||||
@@ -4562,6 +4563,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
|
||||
|
||||
void RenderFrameImpl::FrameFocused() {
|
||||
GetFrameHost()->FrameFocused();
|
||||
+ for (auto& observer : observers_)
|
||||
+ observer.FrameFocused();
|
||||
}
|
||||
|
||||
void RenderFrameImpl::DidChangeName(const blink::WebString& name) {
|
||||
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
||||
index e2cb076d3a69..939cc09915c2 100644
|
||||
index 078c895fe5cd..f763acde4d66 100644
|
||||
--- content/renderer/render_thread_impl.cc
|
||||
+++ content/renderer/render_thread_impl.cc
|
||||
@@ -810,6 +810,8 @@ void RenderThreadImpl::Init() {
|
||||
|
||||
StartServiceManagerConnection();
|
||||
@@ -624,6 +624,8 @@ void RenderThreadImpl::Init() {
|
||||
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
|
||||
URLLoaderThrottleProviderType::kFrame);
|
||||
|
||||
+ GetContentClient()->renderer()->RenderThreadConnected();
|
||||
+
|
||||
@@ -382,10 +356,10 @@ index e2cb076d3a69..939cc09915c2 100644
|
||||
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
|
||||
|
||||
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
|
||||
index 541268de0cc0..4572feb2e954 100644
|
||||
index 17e84479f922..6bf6c2ab93ac 100644
|
||||
--- content/renderer/renderer_blink_platform_impl.cc
|
||||
+++ content/renderer/renderer_blink_platform_impl.cc
|
||||
@@ -981,6 +981,15 @@ RendererBlinkPlatformImpl::GetGpuFactories() {
|
||||
@@ -918,6 +918,15 @@ RendererBlinkPlatformImpl::GetGpuFactories() {
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -402,10 +376,10 @@ index 541268de0cc0..4572feb2e954 100644
|
||||
if (!code_cache_host_) {
|
||||
code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
|
||||
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
|
||||
index 68be1b765491..8468b1b42b79 100644
|
||||
index edbf232175e4..27e4c87dd4c1 100644
|
||||
--- content/renderer/renderer_blink_platform_impl.h
|
||||
+++ content/renderer/renderer_blink_platform_impl.h
|
||||
@@ -209,6 +209,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||
@@ -197,6 +197,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||
|
||||
media::GpuVideoAcceleratorFactories* GetGpuFactories() override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user