bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 71.0.3578.20

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-10-25 15:40:21 -04:00
parent 315b57e9f7
commit 063fc4f6cd
17 changed files with 145 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/71.0.3578.0',
'chromium_checkout': 'refs/tags/71.0.3578.20',
}

6
libcef/browser/chrome_browser_process_stub.cc
View File

@@ -243,8 +243,10 @@ const std::string& ChromeBrowserProcessStub::GetApplicationLocale() {
return locale_;
}
void ChromeBrowserProcessStub::SetApplicationLocale(const std::string& locale) {
locale_ = locale;
void ChromeBrowserProcessStub::SetApplicationLocale(
const std::string& actual_locale,
const std::string& preferred_locale) {
locale_ = actual_locale;
}
DownloadStatusUpdater* ChromeBrowserProcessStub::download_status_updater() {

3
libcef/browser/chrome_browser_process_stub.h
View File

@@ -75,7 +75,8 @@ class ChromeBrowserProcessStub : public BrowserProcess,
printing::BackgroundPrintingManager* background_printing_manager() override;
IntranetRedirectDetector* intranet_redirect_detector() override;
const std::string& GetApplicationLocale() override;
void SetApplicationLocale(const std::string& locale) override;
void SetApplicationLocale(const std::string& actual_locale,
const std::string& preferred_locale) override;
DownloadStatusUpdater* download_status_updater() override;
DownloadRequestLimiter* download_request_limiter() override;
BackgroundModeManager* background_mode_manager() override;

2
libcef/common/main_delegate.cc
View File

@@ -698,7 +698,7 @@ void CefMainDelegate::InitializeResourceBundle() {
ui::ResourceBundle::InitSharedInstanceWithLocale(
locale, &content_client_, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
if (!loaded_locale.empty() && g_browser_process)
g_browser_process->SetApplicationLocale(loaded_locale);
g_browser_process->SetApplicationLocale(loaded_locale, locale);
ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();

3
libcef/renderer/content_renderer_client.cc
View File

@@ -282,7 +282,8 @@ void CefContentRendererClient::WebKitInitialized() {
blink::WebSecurityPolicy::AddOriginAccessAllowListEntry(
gurl, blink::WebString::FromUTF8(entry.target_protocol),
blink::WebString::FromUTF8(entry.target_domain),
entry.allow_target_subdomains);
entry.allow_target_subdomains,
network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
}
cross_origin_whitelist_entries_.clear();
}

3
libcef/renderer/render_thread_observer.cc
View File

@@ -68,7 +68,8 @@ void CefRenderThreadObserver::OnModifyCrossOriginWhitelistEntry(
blink::WebSecurityPolicy::AddOriginAccessAllowListEntry(
gurl, blink::WebString::FromUTF8(params.target_protocol),
blink::WebString::FromUTF8(params.target_domain),
params.allow_target_subdomains);
params.allow_target_subdomains,
network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
} else {
blink::WebSecurityPolicy::ClearOriginAccessAllowListForOrigin(gurl);
}

5
patch/patch.cfg
View File

@@ -402,5 +402,10 @@ patches = [
# macOS: Fix crash when showing a select popup with CefDoMessageLoopWork.
# https://bitbucket.org/chromiumembedded/cef/issues/2495
'name': 'message_pump_mac_2495',
},
{
# Remove duplicate jsoncpp from OpenVR.
# https://bugs.chromium.org/p/chromium/issues/detail?id=780987
'name': 'openvr_jsoncpp_780987',
}
]

8
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 8e953590edd9..750a1bb85480 100644
index ece19724354a..840899064205 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 8e953590edd9..750a1bb85480 100644
import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni")
import("//components/feed/features.gni")
@@ -1708,6 +1709,7 @@ jumbo_split_static_library("browser") {
@@ -1712,6 +1713,7 @@ jumbo_split_static_library("browser") {
"//base:i18n",
"//base/allocator:buildflags",
"//cc",
@@ -18,7 +18,7 @@ index 8e953590edd9..750a1bb85480 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1983,6 +1985,10 @@ jumbo_split_static_library("browser") {
@@ -1988,6 +1990,10 @@ jumbo_split_static_library("browser") {
]
}
@@ -29,7 +29,7 @@ index 8e953590edd9..750a1bb85480 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -3586,7 +3592,7 @@ jumbo_split_static_library("browser") {
@@ -3592,7 +3598,7 @@ jumbo_split_static_library("browser") {
]
}

12
patch/patches/external_textures_1006.patch
View File

@@ -366,10 +366,10 @@ index dc3f820d88da..1f3d09e169ac 100644
GLES2_GET_FUN(InvalidateReadbackBufferShadowDataCHROMIUM)
#define glFramebufferTextureMultiviewLayeredANGLE \
diff --git gpu/command_buffer/build_gles2_cmd_buffer.py gpu/command_buffer/build_gles2_cmd_buffer.py
index 574ea592fd0f..ead22d65a6a7 100755
index 70cae33c1387..06e6061cf654 100755
--- gpu/command_buffer/build_gles2_cmd_buffer.py
+++ gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -4061,6 +4061,35 @@ _FUNCTION_INFO = {
@@ -4062,6 +4062,35 @@ _FUNCTION_INFO = {
'extension': 'CHROMIUM_gpu_fence',
'extension_flag': 'chromium_gpu_fence',
},
@@ -501,10 +501,10 @@ index b422c3075ae7..1c4b452d1df5 100644
GLint shm_id,
GLuint shm_offset,
diff --git gpu/command_buffer/client/gles2_implementation.cc gpu/command_buffer/client/gles2_implementation.cc
index 65f83c6f5a41..c1bd6e4e7676 100644
index 9ee4ed69f3e8..e6b2f002522f 100644
--- gpu/command_buffer/client/gles2_implementation.cc
+++ gpu/command_buffer/client/gles2_implementation.cc
@@ -7248,6 +7248,22 @@ void GLES2Implementation::Viewport(GLint x,
@@ -7254,6 +7254,22 @@ void GLES2Implementation::Viewport(GLint x,
CheckGLError();
}
@@ -993,7 +993,7 @@ index 6e83a5675fc3..330107d93f03 100644
"buffer_manager.cc",
"buffer_manager.h",
diff --git gpu/command_buffer/service/gles2_cmd_decoder.cc gpu/command_buffer/service/gles2_cmd_decoder.cc
index 08706db01d3d..245b3d8db6ea 100644
index 3cb45cc5b191..f17002799aa6 100644
--- gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -34,6 +34,7 @@
@@ -1027,7 +1027,7 @@ index 08706db01d3d..245b3d8db6ea 100644
base::flat_set<scoped_refptr<Buffer>> writes_submitted_but_not_completed_;
// The format of the back buffer_
@@ -5351,6 +5361,59 @@ error::Error GLES2DecoderImpl::HandleDestroyGpuFenceCHROMIUM(
@@ -5353,6 +5363,59 @@ error::Error GLES2DecoderImpl::HandleDestroyGpuFenceCHROMIUM(
return error::kNoError;
}

84
patch/patches/openvr_jsoncpp_780987.patch Normal file
View File

@@ -0,0 +1,84 @@
diff --git device/vr/BUILD.gn device/vr/BUILD.gn
index 7a50872f6979..03921dcf8ede 100644
--- device/vr/BUILD.gn
+++ device/vr/BUILD.gn
@@ -213,6 +213,7 @@ if (enable_openvr) {
deps = [
"//base",
"//device/vr/public/mojom:test_mojom",
+ "//third_party/openvr:openvr_headers",
]
}
}
diff --git third_party/openvr/BUILD.gn third_party/openvr/BUILD.gn
index 6c208d65b35a..7a6ae8cb44fc 100644
--- third_party/openvr/BUILD.gn
+++ third_party/openvr/BUILD.gn
@@ -2,6 +2,22 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+source_set("openvr_headers") {
+ sources = [
+ "src/headers/openvr.h",
+ "src/headers/openvr_capi.h",
+ "src/headers/openvr_driver.h",
+ "src/src/ivrclientcore.h",
+ "src/src/vrcommon/dirtools_public.h",
+ "src/src/vrcommon/envvartools_public.h",
+ "src/src/vrcommon/hmderrors_public.h",
+ "src/src/vrcommon/pathtools_public.h",
+ "src/src/vrcommon/sharedlibtools_public.h",
+ "src/src/vrcommon/strtools_public.h",
+ "src/src/vrcommon/vrpathregistry_public.h",
+ ]
+}
+
component("openvr") {
output_name = "openvr_api"
@@ -20,7 +36,6 @@ component("openvr") {
]
sources = [
- "src/src/jsoncpp.cpp",
"src/src/openvr_api_public.cpp",
"src/src/vrcommon/dirtools_public.cpp",
"src/src/vrcommon/envvartools_public.cpp",
@@ -31,6 +46,10 @@ component("openvr") {
"src/src/vrcommon/vrpathregistry_public.cpp",
]
+ public_deps = [
+ "//third_party/jsoncpp",
+ ]
+
if (target_cpu == "x64" && is_win) {
defines += [ "WIN64" ]
}
@@ -38,7 +57,7 @@ component("openvr") {
include_dirs = [
"src/headers",
"src/src",
- "src/src/json",
"src/src/vrcommon",
+ "//third_party/jsoncpp/source/include",
]
}
diff --git third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp
index 137b36f57cd4..dcbb9aaed52f 100644
--- third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp
+++ third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp
@@ -1,7 +1,11 @@
//========= Copyright Valve Corporation ============//
#include "vrpathregistry_public.h"
-#include "json/json.h"
+
+#include <json/reader.h>
+#include <json/value.h>
+#include <json/writer.h>
+
#include "pathtools_public.h"
#include "envvartools_public.h"
#include "strtools_public.h"

2
patch/patches/prefs_content_1161.patch
View File

@@ -35,7 +35,7 @@ index c1881cb04aec..34a64887af4c 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 5ff531dd9e35..34d699af2616 100644
index bc72fadb307f..d115ace7d7f5 100644
--- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc
@@ -1273,6 +1273,7 @@ void RenderViewImpl::SendFrameStateUpdates() {

36
patch/patches/print_header_footer_1478_1565.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 108b54de5e75..8ebd76fc4584 100644
index 4e488b81fecf..4749815f1a94 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -368,6 +368,7 @@ jumbo_split_static_library("ui") {
@@ -10,7 +10,7 @@ index 108b54de5e75..8ebd76fc4584 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2289,7 +2290,7 @@ jumbo_split_static_library("ui") {
@@ -2293,7 +2294,7 @@ jumbo_split_static_library("ui") {
"views/frame/native_browser_frame_factory_ozone.cc",
]
} else {
@@ -262,7 +262,7 @@ index 7dd892feb181..daa097e62ba2 100644
#endif // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc
index 71731e98146e..10ce840c286a 100644
index c888622c024f..402836866391 100644
--- components/printing/renderer/print_render_frame_helper.cc
+++ components/printing/renderer/print_render_frame_helper.cc
@@ -341,7 +341,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
@@ -297,7 +297,7 @@ index 71731e98146e..10ce840c286a 100644
// Helper function to scale and round an integer value with a double valued
// scaling.
@@ -1045,10 +1041,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1036,10 +1032,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
return;
if (g_is_preview_enabled) {
@@ -308,7 +308,7 @@ index 71731e98146e..10ce840c286a 100644
} else {
auto weak_this = weak_ptr_factory_.GetWeakPtr();
web_frame->DispatchBeforePrintEvent();
@@ -1076,10 +1070,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
@@ -1067,10 +1061,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
IPC_BEGIN_MESSAGE_MAP(PrintRenderFrameHelper, message)
IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
@@ -320,7 +320,7 @@ index 71731e98146e..10ce840c286a 100644
IPC_MESSAGE_HANDLER(PrintMsg_ClosePrintPreviewDialog,
OnClosePrintPreviewDialog)
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -1161,7 +1155,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
@@ -1152,7 +1146,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
}
@@ -328,7 +328,7 @@ index 71731e98146e..10ce840c286a 100644
void PrintRenderFrameHelper::OnPrintPreview(
const base::DictionaryValue& settings) {
if (ipc_nesting_level_ > 1)
@@ -1418,7 +1411,6 @@ int PrintRenderFrameHelper::GetFitToPageScaleFactor(
@@ -1409,7 +1402,6 @@ int PrintRenderFrameHelper::GetFitToPageScaleFactor(
printable_height / static_cast<double>(uniform_page_size.height);
return static_cast<int>(100.0f * std::min(scale_width, scale_height));
}
@@ -336,7 +336,7 @@ index 71731e98146e..10ce840c286a 100644
void PrintRenderFrameHelper::OnPrintingDone(bool success) {
if (ipc_nesting_level_ > 1)
@@ -1433,7 +1425,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
@@ -1424,7 +1416,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
is_printing_enabled_ = enabled;
}
@@ -344,7 +344,7 @@ index 71731e98146e..10ce840c286a 100644
void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
if (ipc_nesting_level_ > 1)
return;
@@ -1444,7 +1435,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
@@ -1435,7 +1426,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
// that instead.
auto plugin = delegate_->GetPdfElement(frame);
if (!plugin.IsNull()) {
@@ -354,7 +354,7 @@ index 71731e98146e..10ce840c286a 100644
return;
}
print_preview_context_.InitWithFrame(frame);
@@ -1453,6 +1446,7 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
@@ -1444,6 +1437,7 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
: PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME);
}
@@ -362,7 +362,7 @@ index 71731e98146e..10ce840c286a 100644
void PrintRenderFrameHelper::OnClosePrintPreviewDialog() {
print_preview_context_.source_frame()->DispatchAfterPrintEvent();
}
@@ -1540,11 +1534,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -1531,11 +1525,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
print_node_in_progress_ = true;
@@ -375,7 +375,7 @@ index 71731e98146e..10ce840c286a 100644
} else {
// Make a copy of the node, in case RenderView::OnContextMenuClosed() resets
// its |context_menu_node_|.
@@ -1620,13 +1612,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -1611,13 +1603,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
int cookie =
print_pages_params_ ? print_pages_params_->params.document_cookie : 0;
@@ -389,7 +389,7 @@ index 71731e98146e..10ce840c286a 100644
switch (result) {
case OK:
break;
@@ -1641,7 +1631,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
@@ -1632,7 +1622,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
}
break;
@@ -397,7 +397,7 @@ index 71731e98146e..10ce840c286a 100644
case FAIL_PREVIEW:
if (!is_print_ready_metafile_sent_) {
if (notify_browser_of_print_failure_) {
@@ -1659,7 +1648,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
@@ -1650,7 +1639,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
cookie, ids));
print_preview_context_.Failed(false);
break;
@@ -405,7 +405,7 @@ index 71731e98146e..10ce840c286a 100644
}
prep_frame_view_.reset();
print_pages_params_.reset();
@@ -1832,7 +1820,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
@@ -1823,7 +1811,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
return true;
}
@@ -413,7 +413,7 @@ index 71731e98146e..10ce840c286a 100644
bool PrintRenderFrameHelper::SetOptionsFromPdfDocument(
PrintHostMsg_SetOptionsFromDocument_Params* options) {
blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
@@ -1925,7 +1912,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
@@ -1916,7 +1903,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
return false;
}
@@ -421,7 +421,7 @@ index 71731e98146e..10ce840c286a 100644
void PrintRenderFrameHelper::GetPrintSettingsFromUser(
blink::WebLocalFrame* frame,
@@ -2074,7 +2060,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
@@ -2065,7 +2051,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
return true;
}
@@ -429,7 +429,7 @@ index 71731e98146e..10ce840c286a 100644
void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
if (is_scripted_preview_delayed_) {
is_scripted_preview_delayed_ = false;
@@ -2200,7 +2185,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
@@ -2191,7 +2176,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params, ids));
return true;
}

8
patch/patches/resource_bundle_2512.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index 71a367e03489..c1ba46ce1340 100644
index 315a2814447f..f7de790c9bc8 100644
--- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc
@@ -737,6 +737,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@@ -698,6 +698,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
: delegate_(delegate),
locale_resources_data_lock_(new base::Lock),
max_scale_factor_(SCALE_FACTOR_100P) {
@@ -15,7 +15,7 @@ index 71a367e03489..c1ba46ce1340 100644
mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kMangleLocalizedStrings);
}
@@ -746,6 +752,11 @@ ResourceBundle::~ResourceBundle() {
@@ -707,6 +713,11 @@ ResourceBundle::~ResourceBundle() {
UnloadLocaleResources();
}
@@ -28,7 +28,7 @@ index 71a367e03489..c1ba46ce1340 100644
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
index 422d84bc2664..669522fda74d 100644
index c05b5b910463..02299c9fe559 100644
--- ui/base/resource/resource_bundle.h
+++ ui/base/resource/resource_bundle.h
@@ -150,6 +150,11 @@ class UI_BASE_EXPORT ResourceBundle {

4
patch/patches/storage_partition_1973.patch
View File

@@ -251,7 +251,7 @@ index a0220133cd28..02b8726dfbc1 100644
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
}
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 54a2af4bb179..76f6a48bc046 100644
index 5caac8e8afb7..7f042ef246e4 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -1226,7 +1226,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -263,7 +263,7 @@ index 54a2af4bb179..76f6a48bc046 100644
false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) {
@@ -1585,7 +1585,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
@@ -1593,7 +1593,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
request_info.get(), frame_tree_node_id, allow_download_);
new_request->transition_type = request_info->common_params.transition;

6
patch/patches/views_1749_2102.patch
View File

@@ -295,10 +295,10 @@ index 9c78b30ab3a0..999eb4048f5c 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 5a2af4b405ec..9cec0cc9b33b 100644
index ed55698be6ad..b2b8963ed6e5 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2439,8 +2439,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2447,8 +2447,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@@ -313,7 +313,7 @@ index 5a2af4b405ec..9cec0cc9b33b 100644
MenuItemView* to_select = NULL;
if (item->GetSubmenu()->GetMenuItemCount() > 0)
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2455,8 +2460,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2463,8 +2468,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);

2
patch/patches/webkit_pointer_event_781966.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
index 2faa7369ddf3..7d0d41299fdd 100644
index 2c3f634f0ff3..f8a17931825b 100644
--- third_party/blink/renderer/core/input/pointer_event_manager.cc
+++ third_party/blink/renderer/core/input/pointer_event_manager.cc
@@ -281,7 +281,7 @@ void PointerEventManager::HandlePointerInterruption(

10
patch/patches/webkit_popups.patch
View File

@@ -20,7 +20,7 @@ index 68e82b2554c6..3434655b89b8 100644
// Call these methods before and after running a nested, modal event loop
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 81b10a7c81a5..66c66305b340 100644
index 1287fac887a5..81d2996f9505 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -234,8 +234,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -48,7 +48,7 @@ index 81b10a7c81a5..66c66305b340 100644
suppress_next_keypress_event_(false),
ime_accept_events_(true),
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index fb8a36b05106..9db158c1e538 100644
index 6ca3cc1d6322..7125f27788d4 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -105,7 +105,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -60,8 +60,8 @@ index fb8a36b05106..9db158c1e538 100644
+ bool UseExternalPopupMenus() const;
// WebWidget methods:
void Close() override;
@@ -241,7 +242,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
void SetLayerTreeView(WebLayerTreeView*) override;
@@ -242,7 +243,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
HitTestResult CoreHitTestResultAt(const WebPoint&);
void InvalidateRect(const IntRect&);
@@ -70,7 +70,7 @@ index fb8a36b05106..9db158c1e538 100644
void SetBaseBackgroundColorOverride(SkColor);
void ClearBaseBackgroundColorOverride();
void SetBackgroundColorOverride(SkColor);
@@ -602,6 +603,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -601,6 +602,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_;
bool fake_page_scale_animation_use_anchor_;