mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision a106f0ab (#464641)
- Remove CefWindowInfo.transparent_painting_enabled. Set CefBrowserSettings.background_color to an opaque or transparent value instead.
This commit is contained in:
@@ -13,13 +13,18 @@
|
||||
#include "include/cef_app.h"
|
||||
|
||||
#include "base/threading/platform_thread.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
|
||||
namespace base {
|
||||
class WaitableEvent;
|
||||
}
|
||||
|
||||
namespace content {
|
||||
class ContentMainRunner;
|
||||
class ContentServiceManagerMainDelegate;
|
||||
}
|
||||
|
||||
namespace service_manager {
|
||||
struct MainParams;
|
||||
}
|
||||
|
||||
class CefBrowserHostImpl;
|
||||
@@ -55,6 +60,17 @@ class CefContext {
|
||||
|
||||
const CefSettings& settings() const { return settings_; }
|
||||
|
||||
// Returns the background color for the browser. If |browser_settings| is
|
||||
// nullptr or does not specify a color then the global settings will be used.
|
||||
// The alpha component will be either SK_AlphaTRANSPARENT or SK_AlphaOPAQUE
|
||||
// (e.g. fully transparent or fully opaque). If |is_windowless| is
|
||||
// STATE_DISABLED then SK_AlphaTRANSPARENT will always be returned. If
|
||||
// |is_windowless| is STATE_ENABLED then SK_ColorTRANSPARENT may be returned
|
||||
// to enable transparency for windowless browsers. See additional comments on
|
||||
// CefSettings.background_color and CefBrowserSettings.background_color.
|
||||
SkColor GetBackgroundColor(const CefBrowserSettings* browser_settings,
|
||||
cef_state_t windowless_state) const;
|
||||
|
||||
CefTraceSubscriber* GetTraceSubscriber();
|
||||
|
||||
// Populate the request context settings based on CefSettings and command-
|
||||
@@ -81,7 +97,8 @@ class CefContext {
|
||||
CefSettings settings_;
|
||||
|
||||
std::unique_ptr<CefMainDelegate> main_delegate_;
|
||||
std::unique_ptr<content::ContentMainRunner> main_runner_;
|
||||
std::unique_ptr<content::ContentServiceManagerMainDelegate> sm_main_delegate_;
|
||||
std::unique_ptr<service_manager::MainParams> sm_main_params_;
|
||||
std::unique_ptr<CefTraceSubscriber> trace_subscriber_;
|
||||
std::unique_ptr<CefBrowserInfoManager> browser_info_manager_;
|
||||
};
|
||||
|
Reference in New Issue
Block a user