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 86.0.4240.0 (#800218)

Browse Source 
- CefURLRequest::Create is no longer supported in the renderer process
  (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead.
- Mac platform definitions have been changed from `MACOSX` to `MAC`
  (see https://crbug.com/1105907) and related CMake macro names have
  been updated. The old `OS_MACOSX` define is still set in code and CMake
  for backwards compatibility.
- Linux ARM build is currently broken (see https://crbug.com/1123214).
This commit is contained in:
Marshall Greenblatt
2020-08-28 18:39:23 -04:00
parent 6b1e5335bc
commit 24c2f2fa38
190 changed files with 1302 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cefclient/CMakeLists.txt.in
View File

@ -49,7 +49,7 @@
#cefclient Mac OS X sources
{{
'prefix': 'cefclient_macosx',
'set': 'CEFCLIENT_MACOSX_SRCS',
'set': 'CEFCLIENT_MAC_SRCS',
'includes': [
'shared_sources_mac',
'cefclient_sources_mac',
@ -59,7 +59,7 @@
# cefclient Mac OS X helper sources.
{{
'prefix': 'cefclient_helper',
'set': 'CEFCLIENT_MACOSX_HELPER_SRCS',
'set': 'CEFCLIENT_MAC_HELPER_SRCS',
'includes': [
'shared_sources_mac_helper',
],
@ -81,7 +81,7 @@
'set': 'CEFCLIENT_RESOURCES_SRCS',
'includes': [
'shared_sources_resources',
'cefclient_bundle_resources_mac:MACOSX',
'cefclient_bundle_resources_mac:MAC',
'cefclient_sources_resources',
'cefclient_sources_resources_extensions_set_page_color',
],
@ -94,7 +94,7 @@
# Target executable names.
set(CEF_TARGET "cefclient")
if(OS_MACOSX)
if(OS_MAC)
set(CEF_HELPER_TARGET "cefclient_Helper")
set(CEF_HELPER_OUTPUT_NAME "cefclient Helper")
else()
@ -151,7 +151,7 @@ endif()
# Mac OS X configuration.
#
if(OS_MACOSX)
if(OS_MAC)
option(OPTION_USE_ARC "Build with ARC (automatic Reference Counting) on macOS." ON)
if(OPTION_USE_ARC)
list(APPEND CEF_COMPILER_FLAGS
@ -168,7 +168,7 @@ if(OS_MACOSX)
${CEFCLIENT_BROWSER_SRCS}
${CEFCLIENT_COMMON_SRCS}
${CEFCLIENT_RESOURCES_SRCS}
${CEFCLIENT_MACOSX_SRCS}
${CEFCLIENT_MAC_SRCS}
)
# All sources required by the "cefclient Helper" target. Generates an app
@ -176,7 +176,7 @@ if(OS_MACOSX)
set(CEFCLIENT_HELPER_SRCS
${CEFCLIENT_COMMON_SRCS}
${CEFCLIENT_RENDERER_SRCS}
${CEFCLIENT_MACOSX_HELPER_SRCS}
${CEFCLIENT_MAC_HELPER_SRCS}
)
# Output path for the main app bundle.
@ -270,7 +270,7 @@ if(OS_MACOSX)
"resources/"
"../shared/resources/"
)
COPY_MACOSX_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
COPY_MAC_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
endif()

4
tests/cefclient/browser/client_types.h
View File

@ -17,13 +17,13 @@
#define ClientWindowHandle CefWindowHandle
#endif
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#define ClientNativeMacWindow void*
#ifdef __OBJC__
#define CAST_CLIENT_NATIVE_MAC_WINDOW_TO_NSWINDOW(native) \
(__bridge NSWindow*)native
#define CAST_NSWINDOW_TO_CLIENT_NATIVE_MAC_WINDOW(window) (__bridge void*)window
#endif // __OBJC__
#endif // defined OS_MACOSX
#endif // defined OS_MAC
#endif // CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_TYPES_H_

2
tests/cefclient/browser/osr_accessibility_node.h
View File

@ -10,7 +10,7 @@
#include "include/cef_browser.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
typedef void CefNativeAccessible;
#if __OBJC__
#if __has_feature(objc_arc)

2
tests/cefclient/browser/osr_renderer.cc
View File

@ -6,7 +6,7 @@
#if defined(OS_WIN)
#include <gl/gl.h>
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
#include <OpenGL/gl.h>
#elif defined(OS_LINUX)
#include <GL/gl.h>

6
tests/cefclient/browser/root_window.h
View File

@ -17,9 +17,9 @@
#include "tests/cefclient/browser/image_cache.h"
#include "tests/shared/browser/main_message_loop.h"
#if defined(OS_MACOSX) && __OBJC__
#if defined(OS_MAC) && __OBJC__
@class NSWindow;
#endif // defined(OS_MACOSX) && __OBJC__
#endif // defined(OS_MAC) && __OBJC__
namespace client {
@ -121,7 +121,7 @@ class RootWindow
// called on the main thread.
static scoped_refptr<RootWindow> GetForBrowser(int browser_id);
#if defined(OS_MACOSX) && __OBJC__
#if defined(OS_MAC) && __OBJC__
// Returns the RootWindow associated with the specified |window|. Must be
// called on the main thread.
static scoped_refptr<RootWindow> GetForNSWindow(NSWindow* window);

4
tests/cefclient/browser/root_window_create.cc
View File

@ -12,7 +12,7 @@
#include "tests/cefclient/browser/root_window_win.h"
#elif defined(OS_LINUX)
#include "tests/cefclient/browser/root_window_gtk.h"
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
#include "tests/cefclient/browser/root_window_mac.h"
#endif
@ -32,7 +32,7 @@ scoped_refptr<RootWindow> RootWindow::Create(bool use_views) {
return new RootWindowWin();
#elif defined(OS_LINUX)
return new RootWindowGtk();
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
return new RootWindowMac();
#endif

4
tests/cefclient/browser/temp_window.h
View File

@ -12,7 +12,7 @@
#include "tests/cefclient/browser/temp_window_win.h"
#elif defined(OS_LINUX)
#include "tests/cefclient/browser/temp_window_x11.h"
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
#include "tests/cefclient/browser/temp_window_mac.h"
#endif
@ -22,7 +22,7 @@ namespace client {
typedef TempWindowWin TempWindow;
#elif defined(OS_LINUX)
typedef TempWindowX11 TempWindow;
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
typedef TempWindowMac TempWindow;
#endif

4
tests/cefclient/browser/window_test.cc
View File

@ -23,7 +23,7 @@
#include "tests/cefclient/browser/window_test_runner_win.h"
#elif defined(OS_LINUX)
#include "tests/cefclient/browser/window_test_runner_gtk.h"
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
#include "tests/cefclient/browser/window_test_runner_mac.h"
#endif
@ -49,7 +49,7 @@ scoped_ptr<WindowTestRunner> CreateWindowTestRunner() {
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerWin());
#elif defined(OS_LINUX)
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerGtk());
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
return scoped_ptr<WindowTestRunner>(new WindowTestRunnerMac());
#else
#error "No implementation available for your platform."

12
tests/cefsimple/CMakeLists.txt.in
View File

@ -13,7 +13,7 @@
'includes': [
'cefsimple_sources_common',
'cefsimple_sources_win:WINDOWS',
'cefsimple_sources_mac:MACOSX',
'cefsimple_sources_mac:MAC',
'cefsimple_sources_linux:LINUX',
],
}}
@ -22,7 +22,7 @@
{{
'prefix': 'cefsimple_helper',
'includes': [
'cefsimple_sources_mac_helper:MACOSX',
'cefsimple_sources_mac_helper:MAC',
],
}}
@ -31,7 +31,7 @@
'prefix': 'cefsimple_resources',
'set': 'CEFSIMPLE_RESOURCES_SRCS',
'includes': [
'cefsimple_bundle_resources_mac:MACOSX',
'cefsimple_bundle_resources_mac:MAC',
],
}}
@ -42,7 +42,7 @@
# Target executable names.
set(CEF_TARGET "cefsimple")
if(OS_MACOSX)
if(OS_MAC)
set(CEF_HELPER_TARGET "cefsimple_Helper")
set(CEF_HELPER_OUTPUT_NAME "cefsimple Helper")
else()
@ -86,7 +86,7 @@ endif()
# Mac OS X configuration.
#
if(OS_MACOSX)
if(OS_MAC)
option(OPTION_USE_ARC "Build with ARC (automatic Reference Counting) on macOS." ON)
if(OPTION_USE_ARC)
list(APPEND CEF_COMPILER_FLAGS
@ -184,7 +184,7 @@ if(OS_MACOSX)
# directive but that doesn't properly handle nested resource directories.
# Remove these prefixes from input file paths.
set(PREFIXES "mac/")
COPY_MACOSX_RESOURCES("${CEFSIMPLE_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
COPY_MAC_RESOURCES("${CEFSIMPLE_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
endif()

16
tests/ceftests/CMakeLists.txt.in
View File

@ -14,13 +14,13 @@
'shared_sources_browser',
'shared_sources_common',
'shared_sources_linux:LINUX',
'shared_sources_mac:MACOSX',
'shared_sources_mac:MAC',
'shared_sources_renderer:WINDOWS',
'shared_sources_renderer:LINUX',
'shared_sources_win:WINDOWS',
'ceftests_sources_common',
'ceftests_sources_linux:LINUX',
'ceftests_sources_mac:MACOSX',
'ceftests_sources_mac:MAC',
'ceftests_sources_views:WINDOWS',
'ceftests_sources_views:LINUX',
'ceftests_sources_win:WINDOWS',
@ -33,9 +33,9 @@
'set': 'UNITTESTS_HELPER_SRCS',
'includes': [
'shared_sources_common',
'shared_sources_mac_helper:MACOSX',
'shared_sources_mac_helper:MAC',
'shared_sources_renderer',
'ceftests_sources_mac_helper:MACOSX',
'ceftests_sources_mac_helper:MAC',
],
}}
@ -45,7 +45,7 @@
'set': 'UNITTESTS_RESOURCES_SRCS',
'includes': [
'shared_sources_resources',
'ceftests_bundle_resources_mac:MACOSX',
'ceftests_bundle_resources_mac:MAC',
],
}}
@ -56,7 +56,7 @@
# Target executable names.
set(CEF_TARGET "ceftests")
if(OS_MACOSX)
if(OS_MAC)
set(CEF_HELPER_TARGET "ceftests_Helper")
set(CEF_HELPER_OUTPUT_NAME "ceftests Helper")
else()
@ -103,7 +103,7 @@ endif()
# Mac OS X configuration.
#
if(OS_MACOSX)
if(OS_MAC)
# Output path for the main app bundle.
set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app")
@ -194,7 +194,7 @@ if(OS_MACOSX)
"resources/mac/"
"../shared/resources/"
)
COPY_MACOSX_RESOURCES("${UNITTESTS_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
COPY_MAC_RESOURCES("${UNITTESTS_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
endif()

2
tests/ceftests/navigation_unittest.cc
View File

@ -1753,7 +1753,7 @@ class LoadNavTestHandler : public TestHandler {
CefMouseEvent mouse_event;
mouse_event.x = 20;
mouse_event.y = 20;
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Use cmd instead of ctrl on OS X.
mouse_event.modifiers =
(mode_ == CTRL_LEFT_CLICK ? EVENTFLAG_COMMAND_DOWN : 0);

26
tests/ceftests/os_rendering_unittest.cc
View File

@ -13,7 +13,7 @@
#include "tests/shared/browser/geometry_util.h"
#include "tests/shared/browser/resource_util.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include <Carbon/Carbon.h> // For character codes.
#include "tests/ceftests/os_rendering_unittest_mac.h"
#elif defined(OS_LINUX)
@ -37,7 +37,7 @@ const int kOsrHeight = 400;
// bounding client rects for edit box and navigate button
#if defined(OS_WIN)
const CefRect kExpandedSelectRect(462, 42, 81, 334);
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
const CefRect kExpandedSelectRect(462, 42, 75, 334);
#elif defined(OS_LINUX)
const CefRect kExpandedSelectRect(462, 42, 79, 334);
@ -63,7 +63,7 @@ const unsigned int kNativeKeyTestCodes[] = {XK_d, XK_o, XK_n, XK_e};
const unsigned int kNativeKeyEscape = XK_Escape;
const unsigned int kNativeKeyTab = XK_Tab;
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
// See kKeyCodesMap in ui/events/keycodes/keyboard_code_conversion_mac.mm
#define VKEY_D 'd'
@ -81,7 +81,7 @@ const unsigned int kNativeKeyTab = kVK_Tab;
#endif
#if defined(OS_MACOSX) || defined(OS_LINUX)
#if defined(OS_MAC) || defined(OS_LINUX)
const unsigned int kKeyTestCodes[] = {VKEY_D, VKEY_O, VKEY_N, VKEY_E};
@ -557,7 +557,7 @@ class OSRTestHandler : public RoutingTestHandler,
#if defined(OS_WIN)
SendKeyEvent(browser, VK_TAB);
#elif defined(OS_MACOSX) || defined(OS_LINUX)
#elif defined(OS_MAC) || defined(OS_LINUX)
SendKeyEvent(browser, kNativeKeyTab, VKEY_TAB);
#else
#error "Unsupported platform"
@ -674,7 +674,7 @@ class OSRTestHandler : public RoutingTestHandler,
for (size_t i = 0; i < word_length; ++i) {
#if defined(OS_WIN)
SendKeyEvent(browser, kKeyTestWord[i]);
#elif defined(OS_MACOSX) || defined(OS_LINUX)
#elif defined(OS_MAC) || defined(OS_LINUX)
SendKeyEvent(browser, kNativeKeyTestCodes[i], kKeyTestCodes[i]);
#else
#error "Unsupported platform"
@ -760,7 +760,7 @@ class OSRTestHandler : public RoutingTestHandler,
} else if (type == PET_POPUP) {
#if defined(OS_WIN)
SendKeyEvent(browser, VK_ESCAPE);
#elif defined(OS_MACOSX) || defined(OS_LINUX)
#elif defined(OS_MAC) || defined(OS_LINUX)
SendKeyEvent(browser, kNativeKeyEscape, VKEY_ESCAPE);
#else
#error "Unsupported platform"
@ -886,7 +886,7 @@ class OSRTestHandler : public RoutingTestHandler,
for (size_t i = 0; i < word_length; ++i) {
#if defined(OS_WIN)
SendKeyEvent(browser, kKeyTestWord[i]);
#elif defined(OS_MACOSX) || defined(OS_LINUX)
#elif defined(OS_MAC) || defined(OS_LINUX)
SendKeyEvent(browser, kNativeKeyTestCodes[i], kKeyTestCodes[i]);
#else
#error "Unsupported platform"
@ -927,7 +927,7 @@ class OSRTestHandler : public RoutingTestHandler,
for (size_t i = 0; i < word_length; ++i) {
#if defined(OS_WIN)
SendKeyEvent(browser, kKeyTestWord[i]);
#elif defined(OS_MACOSX) || defined(OS_LINUX)
#elif defined(OS_MAC) || defined(OS_LINUX)
SendKeyEvent(browser, kNativeKeyTestCodes[i], kKeyTestCodes[i]);
#else
#error "Unsupported platform"
@ -1328,7 +1328,7 @@ class OSRTestHandler : public RoutingTestHandler,
#if defined(OS_WIN)
windowInfo.SetAsWindowless(GetDesktopWindow());
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
// An actual vies is needed only for the ContextMenu test. The menu runner
// checks if the view is not nil before showing the context menu.
if (test_type_ == OSR_TEST_CONTEXT_MENU)
@ -1384,7 +1384,7 @@ class OSRTestHandler : public RoutingTestHandler,
}
bool ExpectComputedPopupSize() const {
#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
// On Windows the device scale factor is ignored in Blink when computing
// the default form control font size (see https://crbug.com/674663#c11).
// This results in better font size display but also means that we won't
@ -1436,7 +1436,7 @@ class OSRTestHandler : public RoutingTestHandler,
}
void SendKeyEvent(CefRefPtr<CefBrowser> browser,
#if defined(OS_LINUX) || defined(OS_MACOSX)
#if defined(OS_LINUX) || defined(OS_MAC)
unsigned int native_key_code,
#endif
int key_code) {
@ -1450,7 +1450,7 @@ class OSRTestHandler : public RoutingTestHandler,
event.native_key_code = (scanCode << 16) | // key scan code
1; // key repeat count
event.windows_key_code = VkCode;
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
event.native_key_code = native_key_code;
// Note that this is only correct for lower-case characters. If |key_code|
// was an upper-case character then |event.character| would be the upper-

2
tests/ceftests/osr_accessibility_unittest.cc
View File

@ -214,7 +214,7 @@ class AccessibilityTestHandler : public TestHandler,
#if defined(OS_WIN)
windowInfo.SetAsWindowless(GetDesktopWindow());
#elif defined(OS_MACOSX)
#elif defined(OS_MAC)
windowInfo.SetAsWindowless(kNullWindowHandle);
#elif defined(OS_LINUX)
windowInfo.SetAsWindowless(kNullWindowHandle);

10
tests/ceftests/run_all_unittests.cc
View File

@ -32,7 +32,7 @@
#include "tests/shared/common/client_app_other.h"
#include "tests/shared/renderer/client_app_renderer.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "include/wrapper/cef_library_loader.h"
#endif
@ -108,7 +108,7 @@ int XIOErrorHandlerImpl(Display* display) {
} // namespace
int main(int argc, char* argv[]) {
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Load the CEF framework library at runtime instead of linking directly
// as required by the macOS sandbox implementation.
CefScopedLibraryLoader library_loader;
@ -144,7 +144,7 @@ int main(int argc, char* argv[]) {
client::ClientApp::GetProcessType(test_suite.command_line());
if (process_type == client::ClientApp::BrowserProcess) {
app = new client::ClientAppBrowser();
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
} else if (process_type == client::ClientApp::RendererProcess ||
process_type == client::ClientApp::ZygoteProcess) {
app = new client::ClientAppRenderer();
@ -171,7 +171,7 @@ int main(int argc, char* argv[]) {
test_suite.GetSettings(settings);
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Platform-specific initialization.
extern void PlatformInit();
PlatformInit();
@ -240,7 +240,7 @@ int main(int argc, char* argv[]) {
// Destroy the MessageLoop.
message_loop.reset(nullptr);
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Platform-specific cleanup.
extern void PlatformCleanup();
PlatformCleanup();

10
tests/ceftests/test_request.cc
View File

@ -113,15 +113,15 @@ void Send(const SendConfig& config, const RequestDoneCallback& callback) {
std::string GetPathURL(const std::string& url) {
const size_t index1 = url.find('?');
const size_t index2 = url.find('#');
size_t index = -1;
if (index1 >= 0 && index2 >= 0) {
size_t index = std::string::npos;
if (index1 != std::string::npos && index2 != std::string::npos) {
index = std::min(index1, index2);
} else if (index1 >= 0) {
} else if (index1 != std::string::npos) {
index = index1;
} else if (index2 >= 0) {
} else if (index2 != std::string::npos) {
index = index2;
}
if (index >= 0) {
if (index != std::string::npos) {
return url.substr(0, index);
}
return url;

2
tests/ceftests/test_server.cc
View File

@ -510,4 +510,4 @@ void ObserverHelper::OnUnregistered() {
OnShutdown();
}
} // namespace test_server
} // namespace test_server

10
tests/ceftests/urlrequest_unittest.cc
View File

@ -2362,6 +2362,11 @@ class RequestTestRunner : public base::RefCountedThreadSafe<RequestTestRunner> {
// Send a request. |complete_callback| will be executed on request completion.
void SendRequest(const test_request::RequestDoneCallback& done_callback) {
if (!is_browser_process_) {
// Render process requests must use CefFrame::CreateURLRequest.
EXPECT_TRUE(use_frame_method_);
}
test_request::SendConfig config;
if (settings_.redirect_request)
@ -3210,9 +3215,8 @@ bool IsTestSupported(RequestTestMode test_mode,
bool test_in_browser,
bool test_server_backend,
bool test_frame_method) {
if (!test_in_browser && !test_server_backend && !test_frame_method) {
// Requests from the render process can only reach non-server backends when
// using the CefFrame::CreateURLRequest method.
if (!test_in_browser && !test_frame_method) {
// Render process requests must use CefFrame::CreateURLRequest.
return false;
}

2
tests/ceftests/v8_unittest.cc
View File

@ -367,7 +367,7 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
CefTime date;
date.year = 2200;
date.month = 4;
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
date.day_of_week = 5;
#endif
date.day_of_month = 11;

2
tests/shared/browser/client_app_browser.cc
View File

@ -47,7 +47,7 @@ void ClientAppBrowser::OnBeforeCommandLineProcessing(
command_line->AppendSwitch("disable-gpu-shader-disk-cache");
}
#if defined(OS_MACOSX)
#if defined(OS_MAC)
// Disable the toolchain prompt on macOS.
command_line->AppendSwitch("use-mock-keychain");
#endif