Update to Chromium version 63.0.3239.109
This commit is contained in:
parent
385b2d4fb7
commit
68fddaef3c
|
@ -7,5 +7,5 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/63.0.3239.70',
|
||||
'chromium_checkout': 'refs/tags/63.0.3239.109',
|
||||
}
|
||||
|
|
|
@ -484,8 +484,19 @@ void CefContentRendererClient::RenderFrameCreated(
|
|||
|
||||
const base::CommandLine* command_line =
|
||||
base::CommandLine::ForCurrentProcess();
|
||||
if (!command_line->HasSwitch(switches::kDisableSpellChecking))
|
||||
new SpellCheckProvider(render_frame, spellcheck_.get());
|
||||
if (!command_line->HasSwitch(switches::kDisableSpellChecking)) {
|
||||
SpellCheckProvider* spell_check_provider =
|
||||
new SpellCheckProvider(render_frame, spellcheck_.get());
|
||||
// TODO(xiaochengh): Design better way to sync between Chrome-side and
|
||||
// Blink-side spellcheck enabled states. See crbug.com/710097.
|
||||
//
|
||||
// TODO(alexmos): Do this for all frames so that this works properly for
|
||||
// OOPIFs. See https://crbug.com/789273.
|
||||
if (render_frame->IsMainFrame()) {
|
||||
spell_check_provider->EnableSpellcheck(
|
||||
spellcheck_->IsSpellcheckEnabled());
|
||||
}
|
||||
}
|
||||
|
||||
BrowserCreated(render_frame->GetRenderView(), render_frame);
|
||||
}
|
||||
|
@ -497,19 +508,6 @@ void CefContentRendererClient::RenderViewCreated(
|
|||
if (extensions::ExtensionsEnabled())
|
||||
extensions_renderer_client_->RenderViewCreated(render_view);
|
||||
|
||||
const base::CommandLine* command_line =
|
||||
base::CommandLine::ForCurrentProcess();
|
||||
if (!command_line->HasSwitch(switches::kDisableSpellChecking)) {
|
||||
// This is a workaround keeping the behavior that, the Blink side spellcheck
|
||||
// enabled state is initialized on RenderView creation.
|
||||
// TODO(xiaochengh): Design better way to sync between Chrome-side and
|
||||
// Blink-side spellcheck enabled states. See crbug.com/710097.
|
||||
if (SpellCheckProvider* provider =
|
||||
SpellCheckProvider::Get(render_view->GetMainRenderFrame())) {
|
||||
provider->EnableSpellcheck(spellcheck_->IsSpellcheckEnabled());
|
||||
}
|
||||
}
|
||||
|
||||
BrowserCreated(render_view, render_view->GetMainRenderFrame());
|
||||
}
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ index ba2dacd6f420..803b5bc929bd 100644
|
|||
mime_type, false, NULL, &plugin, NULL));
|
||||
}
|
||||
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
|
||||
index 28048bdb2046..b295b7a33601 100644
|
||||
index e56b81ef55e1..01e12073870d 100644
|
||||
--- content/browser/frame_host/navigation_handle_impl.cc
|
||||
+++ content/browser/frame_host/navigation_handle_impl.cc
|
||||
@@ -312,12 +312,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
|
||||
index 5541f127d366..ad0f4bc58f59 100644
|
||||
index 4c5330e8a09b..db13b3aa26de 100644
|
||||
--- content/browser/frame_host/render_frame_host_manager.cc
|
||||
+++ content/browser/frame_host/render_frame_host_manager.cc
|
||||
@@ -1072,10 +1072,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
|
||||
|
@ -29,10 +29,10 @@ index 5541f127d366..ad0f4bc58f59 100644
|
|||
// If |new_instance| is a new SiteInstance for a subframe with an isolated
|
||||
// origin, set its process reuse policy so that such subframes are
|
||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||
index 842557d5fcb7..fc254e2b7bb8 100644
|
||||
index 61c108c53b92..a415a48df0c4 100644
|
||||
--- content/public/browser/content_browser_client.h
|
||||
+++ content/public/browser/content_browser_client.h
|
||||
@@ -325,6 +325,13 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -336,6 +336,13 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
const GURL& current_url,
|
||||
const GURL& new_url);
|
||||
|
||||
|
|
Loading…
Reference in New Issue