mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 86.0.4240.0 (#800218)
- 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:
@@ -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_
|
||||
|
@@ -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)
|
||||
|
@@ -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>
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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."
|
||||
|
Reference in New Issue
Block a user