Update to Chromium version 70.0.3507.0 (#578961)

This commit is contained in:
Marshall Greenblatt
2018-07-31 15:21:39 -04:00
parent 4cc3a221c3
commit a659b48fd1
48 changed files with 233 additions and 243 deletions

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 f927253a7e0b..c537ed1b117b 100644
index b70b944d371c..5f4649151baa 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -710,6 +710,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -682,6 +682,11 @@ class BLINK_PLATFORM_EXPORT Platform {
// runs during Chromium's build step).
virtual bool IsTakingV8ContextSnapshot() { return false; }
@@ -44,31 +44,31 @@ index a2fbf84747aa..8ab120155ccd 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 976bae9c792b..10fb75b0af57 100644
index d250bb01f5cf..ae77e162e039 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
@@ -324,6 +324,8 @@ WebDevToolsAgentImpl::Session::Session(
@@ -332,6 +332,8 @@ WebDevToolsAgentImpl::Session::Session(
&WebDevToolsAgentImpl::Session::Detach, WrapWeakPersistent(this)));
InitializeInspectorSession(reattach_state);
InitializeInspectorSession(reattach_state, std::move(reattach_session_state));
+
+ Platform::Current()->DevToolsAgentAttached();
}
WebDevToolsAgentImpl::Session::~Session() {
@@ -349,6 +351,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
@@ -357,6 +359,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
io_session_->DeleteSoon();
io_session_ = nullptr;
inspector_session_->Dispose();
+ Platform::Current()->DevToolsAgentDetached();
}
void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id,
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 464a41e6f278..7e29a6a66bf4 100644
index 4ad61b99668c..bb7da96dbe5c 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1264,7 +1264,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -1265,7 +1265,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@@ -78,7 +78,7 @@ index 464a41e6f278..7e29a6a66bf4 100644
}
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index 0f42c3e762d3..4836763bfff9 100644
index c1140f566f50..2242209df9f6 100644
--- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc
@@ -164,7 +164,8 @@ Page::Page(PageClients& page_clients)
@@ -141,7 +141,7 @@ index 0f42c3e762d3..4836763bfff9 100644
page->NotifyPluginsChanged();
}
}
@@ -733,7 +753,8 @@ void Page::Trace(blink::Visitor* visitor) {
@@ -734,7 +754,8 @@ void Page::Trace(blink::Visitor* visitor) {
visitor->Trace(overscroll_controller_);
visitor->Trace(link_highlights_);
visitor->Trace(main_frame_);
@@ -152,7 +152,7 @@ index 0f42c3e762d3..4836763bfff9 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 1be040296b6e..d3472a25c1ff 100644
index 41f555af82a0..c2f452e61072 100644
--- third_party/blink/renderer/core/page/page.h
+++ third_party/blink/renderer/core/page/page.h
@@ -138,7 +138,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -165,7 +165,7 @@ index 1be040296b6e..d3472a25c1ff 100644
// Resets the plugin data for all pages in the renderer process and notifies
// PluginsChangedObservers.
@@ -368,7 +369,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -366,7 +367,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
const Member<OverscrollController> overscroll_controller_;
const Member<LinkHighlights> link_highlights_;