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."