mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 81.0.4044.0 (#737173)
This commit is contained in:
@ -10,7 +10,7 @@ index ff7a8ed89e94..77f44956ff22 100644
|
||||
+ GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
|
||||
};
|
||||
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
||||
index 915af795cbf3..8a42dc493faf 100644
|
||||
index 8690ec1fdd21..010156ed9dbc 100644
|
||||
--- third_party/blink/public/platform/platform.h
|
||||
+++ third_party/blink/public/platform/platform.h
|
||||
@@ -679,6 +679,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||
@ -25,29 +25,29 @@ index 915af795cbf3..8a42dc493faf 100644
|
||||
private:
|
||||
static void InitializeCommon(Platform* platform,
|
||||
std::unique_ptr<Thread> main_thread);
|
||||
diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc
|
||||
index 55f1adf5e98a..cee99c67226f 100644
|
||||
--- third_party/blink/renderer/core/dom/dom_implementation.cc
|
||||
+++ third_party/blink/renderer/core/dom/dom_implementation.cc
|
||||
@@ -228,10 +228,11 @@ Document* DOMImplementation::createDocument(const String& type,
|
||||
if (init.GetFrame()->IsMainFrame()) {
|
||||
diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc
|
||||
index 8df9cdf40707..746e15c5884c 100644
|
||||
--- third_party/blink/renderer/core/dom/document_init.cc
|
||||
+++ third_party/blink/renderer/core/dom/document_init.cc
|
||||
@@ -198,11 +198,11 @@ DocumentInit& DocumentInit::WithTypeFrom(const String& type) {
|
||||
if (GetFrame()->IsMainFrame()) {
|
||||
scoped_refptr<const SecurityOrigin> origin =
|
||||
SecurityOrigin::Create(init.Url());
|
||||
- plugin_data = init.GetFrame()->GetPage()->GetPluginData(origin.get());
|
||||
+ plugin_data = init.GetFrame()->GetPage()->GetPluginData(true,
|
||||
+ origin.get());
|
||||
SecurityOrigin::Create(Url());
|
||||
- plugin_data = GetFrame()->GetPage()->GetPluginData(origin.get());
|
||||
+ plugin_data = GetFrame()->GetPage()->GetPluginData(true, origin.get());
|
||||
} else {
|
||||
plugin_data =
|
||||
- init.GetFrame()->GetPage()->GetPluginData(init.GetFrame()
|
||||
+ init.GetFrame()->GetPage()->GetPluginData(false, init.GetFrame()
|
||||
->Tree()
|
||||
.Top()
|
||||
.GetSecurityContext()
|
||||
auto* top_security_origin =
|
||||
GetFrame()->Tree().Top().GetSecurityContext()->GetSecurityOrigin();
|
||||
- plugin_data = GetFrame()->GetPage()->GetPluginData(top_security_origin);
|
||||
+ plugin_data = GetFrame()->GetPage()->GetPluginData(false, top_security_origin);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
|
||||
index 0aa1376a9483..f94c0e7edf7a 100644
|
||||
index 0cf193d31a02..1c62098d3a6a 100644
|
||||
--- third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -1179,7 +1179,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
|
||||
@@ -1199,7 +1199,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
|
||||
PluginData* LocalFrame::GetPluginData() const {
|
||||
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
|
||||
return nullptr;
|
||||
@ -57,7 +57,7 @@ index 0aa1376a9483..f94c0e7edf7a 100644
|
||||
}
|
||||
|
||||
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
index 176aad037ad5..4a16ecd2b67c 100644
|
||||
index ba54df90e309..a902a0d31221 100644
|
||||
--- third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
+++ third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
@@ -8,6 +8,7 @@
|
||||
@ -68,7 +68,7 @@ index 176aad037ad5..4a16ecd2b67c 100644
|
||||
#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
|
||||
#include "third_party/blink/renderer/core/frame/local_frame.h"
|
||||
#include "third_party/blink/renderer/core/inspector/devtools_agent.h"
|
||||
@@ -148,6 +149,7 @@ DevToolsSession::DevToolsSession(
|
||||
@@ -151,6 +152,7 @@ DevToolsSession::DevToolsSession(
|
||||
for (wtf_size_t i = 0; i < agents_.size(); i++)
|
||||
agents_[i]->Restore();
|
||||
}
|
||||
@ -76,7 +76,7 @@ index 176aad037ad5..4a16ecd2b67c 100644
|
||||
}
|
||||
|
||||
DevToolsSession::~DevToolsSession() {
|
||||
@@ -188,6 +190,7 @@ void DevToolsSession::Detach() {
|
||||
@@ -191,6 +193,7 @@ void DevToolsSession::Detach() {
|
||||
agents_.clear();
|
||||
v8_session_.reset();
|
||||
agent_->client_->DebuggerTaskFinished();
|
||||
@ -85,7 +85,7 @@ index 176aad037ad5..4a16ecd2b67c 100644
|
||||
|
||||
void DevToolsSession::FlushProtocolNotifications() {
|
||||
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
|
||||
index 90c4ea4fe9ca..4a335f5bfb79 100644
|
||||
index 569cfb844dfc..29d5d6940c44 100644
|
||||
--- third_party/blink/renderer/core/page/page.cc
|
||||
+++ third_party/blink/renderer/core/page/page.cc
|
||||
@@ -194,7 +194,8 @@ Page::Page(PageClients& page_clients)
|
||||
@ -149,7 +149,7 @@ index 90c4ea4fe9ca..4a335f5bfb79 100644
|
||||
page->NotifyPluginsChanged();
|
||||
}
|
||||
}
|
||||
@@ -859,7 +880,8 @@ void Page::Trace(blink::Visitor* visitor) {
|
||||
@@ -873,7 +894,8 @@ void Page::Trace(blink::Visitor* visitor) {
|
||||
visitor->Trace(link_highlight_);
|
||||
visitor->Trace(spatial_navigation_controller_);
|
||||
visitor->Trace(main_frame_);
|
||||
@ -160,10 +160,10 @@ index 90c4ea4fe9ca..4a335f5bfb79 100644
|
||||
visitor->Trace(agent_metrics_collector_);
|
||||
visitor->Trace(plugins_changed_observers_);
|
||||
diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
|
||||
index e968b10542e7..3f7e151f2f6f 100644
|
||||
index f71d15a750a5..a4b901152085 100644
|
||||
--- third_party/blink/renderer/core/page/page.h
|
||||
+++ third_party/blink/renderer/core/page/page.h
|
||||
@@ -145,7 +145,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
|
||||
@@ -144,7 +144,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
|
||||
ViewportDescription GetViewportDescription() const;
|
||||
|
||||
// Returns the plugin data associated with |main_frame_origin|.
|
||||
@ -173,7 +173,7 @@ index e968b10542e7..3f7e151f2f6f 100644
|
||||
|
||||
// Resets the plugin data for all pages in the renderer process and notifies
|
||||
// PluginsChangedObservers.
|
||||
@@ -394,7 +395,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
|
||||
@@ -393,7 +394,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
|
||||
const Member<LinkHighlight> link_highlight_;
|
||||
Member<SpatialNavigationController> spatial_navigation_controller_;
|
||||
|
||||
@ -184,11 +184,11 @@ index e968b10542e7..3f7e151f2f6f 100644
|
||||
Member<ValidationMessageClient> validation_message_client_;
|
||||
|
||||
diff --git third_party/blink/renderer/core/page/plugin_data.cc third_party/blink/renderer/core/page/plugin_data.cc
|
||||
index 7ea0e09e47a0..69a5c8f8e3d5 100644
|
||||
index 987ed360e0ae..382c833b39d0 100644
|
||||
--- third_party/blink/renderer/core/page/plugin_data.cc
|
||||
+++ third_party/blink/renderer/core/page/plugin_data.cc
|
||||
@@ -91,10 +91,12 @@ void PluginData::RefreshBrowserSidePluginCache() {
|
||||
Platform::Current()->GetInterfaceProvider()->GetInterface(
|
||||
Platform::Current()->GetBrowserInterfaceBroker()->GetInterface(
|
||||
registry.BindNewPipeAndPassReceiver());
|
||||
Vector<mojom::blink::PluginInfoPtr> plugins;
|
||||
- registry->GetPlugins(true, SecurityOrigin::CreateUniqueOpaque(), &plugins);
|
||||
@ -203,7 +203,7 @@ index 7ea0e09e47a0..69a5c8f8e3d5 100644
|
||||
main_frame_origin_ = main_frame_origin;
|
||||
|
||||
@@ -102,7 +104,7 @@ void PluginData::UpdatePluginList(const SecurityOrigin* main_frame_origin) {
|
||||
Platform::Current()->GetInterfaceProvider()->GetInterface(
|
||||
Platform::Current()->GetBrowserInterfaceBroker()->GetInterface(
|
||||
registry.BindNewPipeAndPassReceiver());
|
||||
Vector<mojom::blink::PluginInfoPtr> plugins;
|
||||
- registry->GetPlugins(false, main_frame_origin_, &plugins);
|
||||
|
Reference in New Issue
Block a user