mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 64.0.3282.71
This commit is contained in:
@@ -7,5 +7,5 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/64.0.3282.24',
|
||||
'chromium_checkout': 'refs/tags/64.0.3282.71',
|
||||
}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index c85ea87e5cef..2620ae997463 100644
|
||||
index f5816070e599..0f0c8e1ea171 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -7,6 +7,7 @@ import("//build/config/crypto.gni")
|
||||
@@ -10,7 +10,7 @@ index c85ea87e5cef..2620ae997463 100644
|
||||
import("//chrome/common/features.gni")
|
||||
import("//components/feature_engagement/features.gni")
|
||||
import("//components/nacl/features.gni")
|
||||
@@ -1553,6 +1554,7 @@ split_static_library("browser") {
|
||||
@@ -1554,6 +1555,7 @@ split_static_library("browser") {
|
||||
"//base:i18n",
|
||||
"//base/allocator:features",
|
||||
"//cc",
|
||||
@@ -18,7 +18,7 @@ index c85ea87e5cef..2620ae997463 100644
|
||||
"//chrome:extra_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
@@ -1799,6 +1801,10 @@ split_static_library("browser") {
|
||||
@@ -1800,6 +1802,10 @@ split_static_library("browser") {
|
||||
"//ui/web_dialogs",
|
||||
]
|
||||
|
||||
|
@@ -76,7 +76,7 @@ index 34c9855a251e..0e09454569e2 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 73afa8b3908c..c9edab729e94 100644
|
||||
index 5c6f35d85de6..26de8ffcd2e3 100644
|
||||
--- content/browser/frame_host/navigation_handle_impl.cc
|
||||
+++ content/browser/frame_host/navigation_handle_impl.cc
|
||||
@@ -321,12 +321,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 53b0f5b1863e..092210ea44ec 100644
|
||||
index 92065af1b9d4..2036db554e67 100644
|
||||
--- content/browser/frame_host/render_frame_host_manager.cc
|
||||
+++ content/browser/frame_host/render_frame_host_manager.cc
|
||||
@@ -1083,10 +1083,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
|
||||
|
@@ -35,7 +35,7 @@ index 361505babff0..341873d000bc 100644
|
||||
bool record_whole_document;
|
||||
SavePreviousDocumentResources save_previous_document_resources;
|
||||
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
|
||||
index 0f5f1d8e1649..ae5c98646619 100644
|
||||
index 4eea632e028b..d72c931bc68a 100644
|
||||
--- content/renderer/render_view_impl.cc
|
||||
+++ content/renderer/render_view_impl.cc
|
||||
@@ -1250,6 +1250,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||
index 02b2c4212767..b8a3ebb82fbe 100644
|
||||
index a292204978ab..a007ece87f4f 100644
|
||||
--- chrome/browser/ui/BUILD.gn
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -344,6 +344,7 @@ split_static_library("ui") {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
index 3adf96eda163..673f4c689fcb 100644
|
||||
index 46a5b64a44b3..9ce3e48cf576 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
@@ -435,13 +435,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(
|
||||
|
@@ -552,7 +552,7 @@ index 875ac82283b3..44424b2ce138 100644
|
||||
// Move the cursor because EnterNotify/LeaveNotify are generated with the
|
||||
// current mouse position as a result of XGrabPointer()
|
||||
diff --git ui/views/view.h ui/views/view.h
|
||||
index da4b110ecec8..f03291dcd330 100644
|
||||
index d254c7cca8d6..60fd5d15983d 100644
|
||||
--- ui/views/view.h
|
||||
+++ ui/views/view.h
|
||||
@@ -18,6 +18,7 @@
|
||||
|
@@ -73,7 +73,7 @@ index aac5858b18d8..652b07955fe8 100644
|
||||
#if defined(USE_AURA)
|
||||
void OnDidScheduleEmbed(int routing_id,
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
||||
index 8302a8563d85..7ae0a870071c 100644
|
||||
index aada073d7390..b67ce94f03be 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
||||
@@ -28,6 +28,10 @@
|
||||
@@ -87,7 +87,7 @@ index 8302a8563d85..7ae0a870071c 100644
|
||||
#if defined(OS_WIN)
|
||||
#include "content/browser/frame_host/render_frame_host_impl.h"
|
||||
#include "content/public/common/context_menu_params.h"
|
||||
@@ -857,6 +861,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
|
||||
@@ -868,6 +872,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
|
||||
::SetFocus(hwnd);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user