mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 68.0.3425.0 (#557062)
Known issues: - Surface synchronization is now enabled for OSR, see issue #2447. - Jumbo build is broken, fixed in https://crrev.com/868717ce.
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
||||
index f832a1183d5f..cd52e63ab9b1 100644
|
||||
index 3ab92de1a98b..89f115e689c6 100644
|
||||
--- third_party/blink/public/platform/platform.h
|
||||
+++ third_party/blink/public/platform/platform.h
|
||||
@@ -375,6 +375,7 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||
@@ -368,6 +368,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 f832a1183d5f..cd52e63ab9b1 100644
|
||||
const WebSecurityOrigin& main_frame_origin,
|
||||
WebPluginListBuilder*) {}
|
||||
|
||||
@@ -734,6 +735,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||
@@ -727,6 +728,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||
// runs during Chromium's build step).
|
||||
virtual bool IsTakingV8ContextSnapshot() { return false; }
|
||||
|
||||
@ -41,7 +41,7 @@ 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 ab50fed4ab5e..e8829a3b8529 100644
|
||||
index 114b6830844a..7d64147fc62e 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(
|
||||
@ -62,10 +62,10 @@ index ab50fed4ab5e..e8829a3b8529 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 80d6c903d8ef..8433050ec98c 100644
|
||||
index 60caa00ec723..5d37ee2552a1 100644
|
||||
--- third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -1193,7 +1193,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||
@@ -1224,7 +1224,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||
PluginData* LocalFrame::GetPluginData() const {
|
||||
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
|
||||
return nullptr;
|
||||
@ -75,7 +75,7 @@ index 80d6c903d8ef..8433050ec98c 100644
|
||||
}
|
||||
|
||||
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
|
||||
index 3f4d3f06e7e2..23bbc71f88eb 100644
|
||||
index dc89b93741bd..399a33e9d4d7 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)
|
||||
@ -88,7 +88,7 @@ index 3f4d3f06e7e2..23bbc71f88eb 100644
|
||||
use_counter_(page_clients.chrome_client &&
|
||||
page_clients.chrome_client->IsSVGImageChromeClient()
|
||||
? UseCounter::kSVGImageContext
|
||||
@@ -326,21 +327,40 @@ void Page::RefreshPlugins() {
|
||||
@@ -331,21 +332,40 @@ void Page::RefreshPlugins() {
|
||||
PluginData::RefreshBrowserSidePluginCache();
|
||||
}
|
||||
|
||||
@ -138,7 +138,7 @@ index 3f4d3f06e7e2..23bbc71f88eb 100644
|
||||
page->NotifyPluginsChanged();
|
||||
}
|
||||
}
|
||||
@@ -713,7 +733,8 @@ void Page::Trace(blink::Visitor* visitor) {
|
||||
@@ -718,7 +738,8 @@ void Page::Trace(blink::Visitor* visitor) {
|
||||
visitor->Trace(visual_viewport_);
|
||||
visitor->Trace(overscroll_controller_);
|
||||
visitor->Trace(main_frame_);
|
||||
|
Reference in New Issue
Block a user