Update to Chromium version 68.0.3433.0 (#559327)

Known issues:
- Windows now requires VS 2017 15.7.1 with 10.0.17134.0 SDK.
This commit is contained in:
Marshall Greenblatt
2018-05-21 15:54:08 +03:00
parent 12cc069b69
commit 08ff72fa20
55 changed files with 414 additions and 356 deletions

View File

@ -1,8 +1,8 @@
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index 3ab92de1a98b..89f115e689c6 100644
index 5eac7f13d083..9e74a22c5796 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -368,6 +368,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -357,6 +357,7 @@ class BLINK_PLATFORM_EXPORT Platform {
// satisfy this call. mainFrameOrigin is used by the browser process to
// filter plugins from the plugin list based on content settings.
virtual void GetPluginList(bool refresh,
@ -10,7 +10,7 @@ index 3ab92de1a98b..89f115e689c6 100644
const WebSecurityOrigin& main_frame_origin,
WebPluginListBuilder*) {}
@@ -727,6 +728,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -714,6 +715,11 @@ class BLINK_PLATFORM_EXPORT Platform {
// runs during Chromium's build step).
virtual bool IsTakingV8ContextSnapshot() { return false; }
@ -41,10 +41,10 @@ index 8c40eef254a8..b9ac9f2a3472 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 114b6830844a..7d64147fc62e 100644
index f98ae01cd46d..bba0b1930bff 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
@@ -323,6 +323,8 @@ WebDevToolsAgentImpl::Session::Session(
@@ -325,6 +325,8 @@ WebDevToolsAgentImpl::Session::Session(
&WebDevToolsAgentImpl::Session::Detach, WrapWeakPersistent(this)));
InitializeInspectorSession(reattach_state);
@ -53,7 +53,7 @@ index 114b6830844a..7d64147fc62e 100644
}
WebDevToolsAgentImpl::Session::~Session() {
@@ -348,6 +350,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
@@ -350,6 +352,7 @@ void WebDevToolsAgentImpl::Session::Detach() {
io_session_->DeleteSoon();
io_session_ = nullptr;
inspector_session_->Dispose();
@ -62,10 +62,10 @@ index 114b6830844a..7d64147fc62e 100644
void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id,
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 60caa00ec723..5d37ee2552a1 100644
index 2c6e6b9dccc3..fd957c70922a 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1224,7 +1224,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -1217,7 +1217,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@ -75,10 +75,10 @@ index 60caa00ec723..5d37ee2552a1 100644
}
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index dc89b93741bd..399a33e9d4d7 100644
index 1c299e2ad3a8..17dc5045895a 100644
--- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc
@@ -153,7 +153,8 @@ Page::Page(PageClients& page_clients)
@@ -154,7 +154,8 @@ Page::Page(PageClients& page_clients)
overscroll_controller_(
OverscrollController::Create(GetVisualViewport(), GetChromeClient())),
main_frame_(nullptr),
@ -88,7 +88,7 @@ index dc89b93741bd..399a33e9d4d7 100644
use_counter_(page_clients.chrome_client &&
page_clients.chrome_client->IsSVGImageChromeClient()
? UseCounter::kSVGImageContext
@@ -331,21 +332,40 @@ void Page::RefreshPlugins() {
@@ -333,21 +334,40 @@ void Page::RefreshPlugins() {
PluginData::RefreshBrowserSidePluginCache();
}
@ -138,7 +138,7 @@ index dc89b93741bd..399a33e9d4d7 100644
page->NotifyPluginsChanged();
}
}
@@ -718,7 +738,8 @@ void Page::Trace(blink::Visitor* visitor) {
@@ -720,7 +740,8 @@ void Page::Trace(blink::Visitor* visitor) {
visitor->Trace(visual_viewport_);
visitor->Trace(overscroll_controller_);
visitor->Trace(main_frame_);