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 70.0.3538.0 (#587811)

Browse Source 
Known issues:
- The CefLoadCRLSetsFile function needs to be re-implemented (see issue #2497).
- Linux: GTK2 support has been removed. The cefclient sample needs to be updated
  to use GTK3 (see issue #2014).
This commit is contained in:
Marshall Greenblatt
2018-09-04 11:43:21 +02:00
parent ea0e213bef
commit a64237bcb0
79 changed files with 763 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patch/patches/webkit_plugin_info_2015.patch
View File

@ -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 be5ee3635cf5..471d8c908e52 100644
index 3e8fae916125..30451122e4a2 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -701,6 +701,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -745,6 +745,11 @@ class BLINK_PLATFORM_EXPORT Platform {
// runs during Chromium's build step).
virtual bool IsTakingV8ContextSnapshot() { return false; }
@ -23,8 +23,8 @@ index be5ee3635cf5..471d8c908e52 100644
+ virtual void DevToolsAgentDetached() {}
+
protected:
Platform();
virtual ~Platform();
WebThread* main_thread_;
diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc
index c360933eb10f..6295f9d675f7 100644
--- third_party/blink/renderer/core/dom/dom_implementation.cc
@ -44,10 +44,10 @@ index c360933eb10f..6295f9d675f7 100644
.Top()
.GetSecurityContext()
diff --git third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc
index eef3bcc92e45..4cc5abc51fc8 100644
index 7a7f6e0d88e9..dfa7e007a9fa 100644
--- third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc
+++ third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc
@@ -327,6 +327,8 @@ WebDevToolsAgentImpl::Session::Session(
@@ -325,6 +325,8 @@ WebDevToolsAgentImpl::Session::Session(
&WebDevToolsAgentImpl::Session::Detach, WrapWeakPersistent(this)));
InitializeInspectorSession(std::move(reattach_session_state));
@ -56,7 +56,7 @@ index eef3bcc92e45..4cc5abc51fc8 100644
}
WebDevToolsAgentImpl::Session::~Session() {
@@ -352,6 +354,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
@@ -349,6 +351,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
io_session_->DeleteSoon();
io_session_ = nullptr;
inspector_session_->Dispose();
@ -65,10 +65,10 @@ index eef3bcc92e45..4cc5abc51fc8 100644
void WebDevToolsAgentImpl::Session::SendProtocolResponse(
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index e681cb8f5042..bf92a04e394c 100644
index a7ddc156c2b1..e31496827664 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1216,7 +1216,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -1221,7 +1221,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@ -78,20 +78,20 @@ index e681cb8f5042..bf92a04e394c 100644
}
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index d49490d66514..62fe65941f2d 100644
index af94b52a5b6e..f5b91fefcda0 100644
--- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc
@@ -169,7 +169,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)),
- plugin_data_(nullptr),
+ plugin_data_main_frame_(nullptr),
+ plugin_data_sub_frame_(nullptr),
// TODO(pdr): Initialize |validation_message_client_| lazily.
validation_message_client_(ValidationMessageClientImpl::Create(*this)),
opened_by_dom_(false),
tab_key_cycles_through_elements_(true),
paused_(false),
@@ -328,21 +329,40 @@ void Page::InitialStyleChanged() {
@@ -332,21 +333,40 @@ void Page::InitialStyleChanged() {
}
}
@ -141,7 +141,7 @@ index d49490d66514..62fe65941f2d 100644
page->NotifyPluginsChanged();
}
}
@@ -731,7 +751,8 @@ void Page::Trace(blink::Visitor* visitor) {
@@ -736,7 +756,8 @@ void Page::Trace(blink::Visitor* visitor) {
visitor->Trace(overscroll_controller_);
visitor->Trace(link_highlights_);
visitor->Trace(main_frame_);
@ -152,10 +152,10 @@ index d49490d66514..62fe65941f2d 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 9c25836191e6..398483fc9ca8 100644
index c9ecb33e153f..6ff8e8dc6b67 100644
--- third_party/blink/renderer/core/page/page.h
+++ third_party/blink/renderer/core/page/page.h
@@ -135,7 +135,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -136,7 +136,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
ViewportDescription GetViewportDescription() const;
// Returns the plugin data associated with |main_frame_origin|.
@ -165,7 +165,7 @@ index 9c25836191e6..398483fc9ca8 100644
// Resets the plugin data for all pages in the renderer process and notifies
// PluginsChangedObservers.
@@ -360,7 +361,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -367,7 +368,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
const Member<OverscrollController> overscroll_controller_;
const Member<LinkHighlights> link_highlights_;