mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 74.0.3706.0 (#632463)
This commit is contained in:
@ -10,10 +10,10 @@ index 92e9cb865204..4628c56882b4 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 bfc4a95febcf..1d06dbbb09b0 100644
|
||||
index 55bd97c5ddae..5d69388be783 100644
|
||||
--- third_party/blink/public/platform/platform.h
|
||||
+++ third_party/blink/public/platform/platform.h
|
||||
@@ -754,6 +754,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||
@@ -732,6 +732,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||
// runs during Chromium's build step).
|
||||
virtual bool IsTakingV8ContextSnapshot() { return false; }
|
||||
|
||||
@ -44,10 +44,10 @@ index 31d7915a56b1..3867128de143 100644
|
||||
.Top()
|
||||
.GetSecurityContext()
|
||||
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
|
||||
index 9c8ffb99f78e..baa128f55603 100644
|
||||
index daf6c8f000dd..ca2ac98edf8a 100644
|
||||
--- third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -1323,7 +1323,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||
@@ -1322,7 +1322,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||
PluginData* LocalFrame::GetPluginData() const {
|
||||
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
|
||||
return nullptr;
|
||||
@ -57,7 +57,7 @@ index 9c8ffb99f78e..baa128f55603 100644
|
||||
}
|
||||
|
||||
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
index 347b9a74d341..aa71fb8de4a4 100644
|
||||
index 3eb429271b95..3ebd2ac75f4d 100644
|
||||
--- third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
+++ third_party/blink/renderer/core/inspector/devtools_session.cc
|
||||
@@ -4,6 +4,7 @@
|
||||
@ -68,7 +68,7 @@ index 347b9a74d341..aa71fb8de4a4 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/frame/use_counter.h"
|
||||
@@ -112,6 +113,7 @@ DevToolsSession::DevToolsSession(
|
||||
@@ -146,6 +147,7 @@ DevToolsSession::DevToolsSession(
|
||||
for (wtf_size_t i = 0; i < agents_.size(); i++)
|
||||
agents_[i]->Restore();
|
||||
}
|
||||
@ -76,7 +76,7 @@ index 347b9a74d341..aa71fb8de4a4 100644
|
||||
}
|
||||
|
||||
DevToolsSession::~DevToolsSession() {
|
||||
@@ -150,6 +152,7 @@ void DevToolsSession::Detach() {
|
||||
@@ -184,6 +186,7 @@ void DevToolsSession::Detach() {
|
||||
agents_.clear();
|
||||
v8_session_.reset();
|
||||
agent_->client_->DebuggerTaskFinished();
|
||||
@ -85,10 +85,10 @@ index 347b9a74d341..aa71fb8de4a4 100644
|
||||
|
||||
void DevToolsSession::FlushProtocolNotifications() {
|
||||
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
|
||||
index ff579698b831..b42856d0d3c9 100644
|
||||
index b1533fe6db9a..6c006296ef9e 100644
|
||||
--- third_party/blink/renderer/core/page/page.cc
|
||||
+++ third_party/blink/renderer/core/page/page.cc
|
||||
@@ -170,7 +170,8 @@ Page::Page(PageClients& page_clients)
|
||||
@@ -171,7 +171,8 @@ Page::Page(PageClients& page_clients)
|
||||
overscroll_controller_(
|
||||
OverscrollController::Create(GetVisualViewport(), GetChromeClient())),
|
||||
link_highlights_(LinkHighlights::Create(*this)),
|
||||
@ -98,7 +98,7 @@ index ff579698b831..b42856d0d3c9 100644
|
||||
// TODO(pdr): Initialize |validation_message_client_| lazily.
|
||||
validation_message_client_(ValidationMessageClientImpl::Create(*this)),
|
||||
opened_by_dom_(false),
|
||||
@@ -325,21 +326,40 @@ void Page::InitialStyleChanged() {
|
||||
@@ -326,21 +327,40 @@ void Page::InitialStyleChanged() {
|
||||
}
|
||||
}
|
||||
|
||||
@ -148,7 +148,7 @@ index ff579698b831..b42856d0d3c9 100644
|
||||
page->NotifyPluginsChanged();
|
||||
}
|
||||
}
|
||||
@@ -734,7 +754,8 @@ void Page::Trace(blink::Visitor* visitor) {
|
||||
@@ -745,7 +765,8 @@ void Page::Trace(blink::Visitor* visitor) {
|
||||
visitor->Trace(link_highlights_);
|
||||
visitor->Trace(spatial_navigation_controller_);
|
||||
visitor->Trace(main_frame_);
|
||||
@ -159,10 +159,10 @@ index ff579698b831..b42856d0d3c9 100644
|
||||
visitor->Trace(plugins_changed_observers_);
|
||||
visitor->Trace(next_related_page_);
|
||||
diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
|
||||
index 616470be36dd..55e162ddf99f 100644
|
||||
index 38e73455007f..cae4a0c51d55 100644
|
||||
--- third_party/blink/renderer/core/page/page.h
|
||||
+++ third_party/blink/renderer/core/page/page.h
|
||||
@@ -136,7 +136,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
|
||||
@@ -139,7 +139,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
|
||||
ViewportDescription GetViewportDescription() const;
|
||||
|
||||
// Returns the plugin data associated with |main_frame_origin|.
|
||||
@ -172,7 +172,7 @@ index 616470be36dd..55e162ddf99f 100644
|
||||
|
||||
// Resets the plugin data for all pages in the renderer process and notifies
|
||||
// PluginsChangedObservers.
|
||||
@@ -356,7 +357,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
|
||||
@@ -361,7 +362,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
|
||||
const Member<LinkHighlights> link_highlights_;
|
||||
Member<SpatialNavigationController> spatial_navigation_controller_;
|
||||
|
||||
|
Reference in New Issue
Block a user