Update to Chromium version 70.0.3516.0 (#581409)

This commit is contained in:
Marshall Greenblatt
2018-08-09 16:18:24 -04:00
parent a659b48fd1
commit ea0e213bef
61 changed files with 315 additions and 280 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 b70b944d371c..5f4649151baa 100644
index be5ee3635cf5..471d8c908e52 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -682,6 +682,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -701,6 +701,11 @@ class BLINK_PLATFORM_EXPORT Platform {
// runs during Chromium's build step).
virtual bool IsTakingV8ContextSnapshot() { return false; }
@ -26,7 +26,7 @@ index b70b944d371c..5f4649151baa 100644
Platform();
virtual ~Platform();
diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc
index a2fbf84747aa..8ab120155ccd 100644
index c360933eb10f..6295f9d675f7 100644
--- third_party/blink/renderer/core/dom/dom_implementation.cc
+++ third_party/blink/renderer/core/dom/dom_implementation.cc
@@ -243,10 +243,11 @@ Document* DOMImplementation::createDocument(const String& type,
@ -44,19 +44,19 @@ 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 d250bb01f5cf..ae77e162e039 100644
index eef3bcc92e45..4cc5abc51fc8 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
@@ -332,6 +332,8 @@ WebDevToolsAgentImpl::Session::Session(
@@ -327,6 +327,8 @@ WebDevToolsAgentImpl::Session::Session(
&WebDevToolsAgentImpl::Session::Detach, WrapWeakPersistent(this)));
InitializeInspectorSession(reattach_state, std::move(reattach_session_state));
InitializeInspectorSession(std::move(reattach_session_state));
+
+ Platform::Current()->DevToolsAgentAttached();
}
WebDevToolsAgentImpl::Session::~Session() {
@@ -357,6 +359,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
@@ -352,6 +354,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
io_session_->DeleteSoon();
io_session_ = nullptr;
inspector_session_->Dispose();
@ -65,10 +65,10 @@ index d250bb01f5cf..ae77e162e039 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 4ad61b99668c..bb7da96dbe5c 100644
index e681cb8f5042..bf92a04e394c 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1265,7 +1265,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -1216,7 +1216,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@ -78,10 +78,10 @@ index 4ad61b99668c..bb7da96dbe5c 100644
}
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index c1140f566f50..2242209df9f6 100644
index d49490d66514..62fe65941f2d 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)
@@ -169,7 +169,8 @@ Page::Page(PageClients& page_clients)
overscroll_controller_(
OverscrollController::Create(GetVisualViewport(), GetChromeClient())),
link_highlights_(LinkHighlights::Create(*this)),
@ -91,7 +91,7 @@ index c1140f566f50..2242209df9f6 100644
opened_by_dom_(false),
tab_key_cycles_through_elements_(true),
paused_(false),
@@ -330,21 +331,40 @@ void Page::InitialStyleChanged() {
@@ -328,21 +329,40 @@ void Page::InitialStyleChanged() {
}
}
@ -141,7 +141,7 @@ index c1140f566f50..2242209df9f6 100644
page->NotifyPluginsChanged();
}
}
@@ -734,7 +754,8 @@ void Page::Trace(blink::Visitor* visitor) {
@@ -731,7 +751,8 @@ void Page::Trace(blink::Visitor* visitor) {
visitor->Trace(overscroll_controller_);
visitor->Trace(link_highlights_);
visitor->Trace(main_frame_);
@ -152,10 +152,10 @@ index c1140f566f50..2242209df9f6 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 41f555af82a0..c2f452e61072 100644
index 9c25836191e6..398483fc9ca8 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>,
@@ -135,7 +135,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 41f555af82a0..c2f452e61072 100644
// Resets the plugin data for all pages in the renderer process and notifies
// PluginsChangedObservers.
@@ -366,7 +367,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -360,7 +361,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
const Member<OverscrollController> overscroll_controller_;
const Member<LinkHighlights> link_highlights_;