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

21
libcef/browser/osr/render_widget_host_view_osr.h
View File

@@ -36,7 +36,7 @@
#include "ui/events/gesture_detection/motion_event_generic.h"
#include "ui/gfx/geometry/rect.h"
#if defined(OS_MACOSX)
#if defined(OS_MAC)
#include "content/browser/renderer_host/browser_compositor_view_mac.h"
#endif
@@ -65,8 +65,9 @@ class CefWebContentsViewOSR;
#if defined(USE_X11)
namespace ui {
class XScopedCursor;
}
class X11Cursor;
class XCursorLoader;
} // namespace ui
class CefWindowX11;
#endif
@@ -88,7 +89,7 @@ class CefWindowX11;
// RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
///////////////////////////////////////////////////////////////////////////////
#if defined(OS_MACOSX)
#if defined(OS_MAC)
class MacHelper;
#endif
@@ -129,11 +130,12 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
void UnlockMouse() override;
void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;
#if defined(OS_MACOSX)
#if defined(OS_MAC)
void SetActive(bool active) override;
void ShowDefinitionForSelection() override;
void SpeakSelection() override;
#endif // defined(OS_MACOSX)
void SetWindowFrameInScreen(const gfx::Rect& rect) override;
#endif // defined(OS_MAC)
// RenderWidgetHostViewBase implementation.
void ResetFallbackToFirstNavigationSurface() override;
@@ -152,11 +154,11 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
const gfx::Rect& src_rect,
const gfx::Size& output_size,
base::OnceCallback<void(const SkBitmap&)> callback) override;
void GetScreenInfo(content::ScreenInfo* results) override;
void GetScreenInfo(blink::ScreenInfo* results) override;
void TransformPointToRootSurface(gfx::PointF* point) override;
gfx::Rect GetBoundsInRootWindow() override;
#if !defined(OS_MACOSX)
#if !defined(OS_MAC)
viz::ScopedSurfaceIdAllocator DidUpdateVisualProperties(
const cc::RenderFrameMetadata& metadata) override;
#endif
@@ -345,7 +347,8 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
viz::ParentLocalSurfaceIdAllocator compositor_local_surface_id_allocator_;
#if defined(USE_X11)
std::unique_ptr<ui::XScopedCursor> invisible_cursor_;
std::unique_ptr<ui::XCursorLoader> cursor_loader_;
scoped_refptr<ui::X11Cursor> invisible_cursor_;
#endif
std::unique_ptr<content::CursorManager> cursor_manager_;