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

Move Alloy-specific logic to CefBrowserPlatformDelegateAlloy (see issue #2969)

Browse Source 
Also remove OSR-related methods where the attributes can instead be passed
to the OSR platform delegate constructor directly.
This commit is contained in:
Marshall Greenblatt
2020-07-04 14:21:34 -04:00
parent e9bf3cdb98
commit 02cdf05848
30 changed files with 669 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libcef/browser/osr/browser_platform_delegate_osr.h
View File

@@ -5,7 +5,7 @@
#ifndef CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_H_
#define CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_H_
#include "libcef/browser/browser_platform_delegate.h"
#include "libcef/browser/alloy/browser_platform_delegate_alloy.h"
#include "libcef/browser/native/browser_platform_delegate_native.h"
class CefRenderWidgetHostViewOSR;
@@ -17,7 +17,7 @@ class RenderWidgetHostImpl;
// Base implementation of windowless browser functionality.
class CefBrowserPlatformDelegateOsr
: public CefBrowserPlatformDelegate,
: public CefBrowserPlatformDelegateAlloy,
public CefBrowserPlatformDelegateNative::WindowlessHandler {
public:
// CefBrowserPlatformDelegate methods:
@@ -29,8 +29,6 @@ class CefBrowserPlatformDelegateOsr
void BrowserCreated(CefBrowserHostImpl* browser) override;
void BrowserDestroyed(CefBrowserHostImpl* browser) override;
SkColor GetBackgroundColor() const override;
bool CanUseSharedTexture() const override;
bool CanUseExternalBeginFrame() const override;
void WasResized() override;
void SendKeyEvent(const CefKeyEvent& event) override;
void SendMouseClickEvent(const CefMouseEvent& event,
@@ -97,8 +95,10 @@ class CefBrowserPlatformDelegateOsr
protected:
// Platform-specific behaviors will be delegated to |native_delegate|.
explicit CefBrowserPlatformDelegateOsr(
std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate);
CefBrowserPlatformDelegateOsr(
std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate,
bool use_shared_texture,
bool use_external_begin_frame);
// Returns the primary OSR host view for the underlying browser. If a
// full-screen host view currently exists then it will be returned. Otherwise,
@@ -106,7 +106,10 @@ class CefBrowserPlatformDelegateOsr
CefRenderWidgetHostViewOSR* GetOSRHostView() const;
std::unique_ptr<CefBrowserPlatformDelegateNative> native_delegate_;
CefWebContentsViewOSR* view_osr_; // Not owned by this class.
const bool use_shared_texture_;
const bool use_external_begin_frame_;
CefWebContentsViewOSR* view_osr_ = nullptr; // Not owned by this class.
// Pending drag/drop data.
CefRefPtr<CefDragData> drag_data_;