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 revision a106f0ab (#464641)

Browse Source 
- Remove CefWindowInfo.transparent_painting_enabled. Set
  CefBrowserSettings.background_color to an opaque or transparent
  value instead.
This commit is contained in:
Marshall Greenblatt
2017-04-20 15:28:17 -04:00
parent 2f6475c0d8
commit 3f71138d64
151 changed files with 2756 additions and 2295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libcef/browser/prefs/renderer_prefs.cc
View File

@@ -272,7 +272,7 @@ void SetString(CommandLinePrefStore* prefs,
const std::string& value) {
prefs->SetValue(
key,
base::WrapUnique(new base::StringValue(value)),
base::WrapUnique(new base::Value(value)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
}
@@ -284,28 +284,6 @@ void SetBool(CommandLinePrefStore* prefs,
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
}
SkColor GetBaseBackgroundColor(CefRefPtr<CefBrowserHostImpl> browser) {
if (browser.get()) {
const CefBrowserSettings& browser_settings = browser->settings();
if (CefColorGetA(browser_settings.background_color) > 0) {
return SkColorSetRGB(
CefColorGetR(browser_settings.background_color),
CefColorGetG(browser_settings.background_color),
CefColorGetB(browser_settings.background_color));
}
}
const CefSettings& settings = CefContext::Get()->settings();
if (CefColorGetA(settings.background_color) > 0) {
return SkColorSetRGB(
CefColorGetR(settings.background_color),
CefColorGetG(settings.background_color),
CefColorGetB(settings.background_color));
}
return SK_ColorWHITE;
}
} // namespace
void SetCommandLinePrefDefaults(CommandLinePrefStore* prefs) {
@@ -368,7 +346,7 @@ void PopulateWebPreferences(content::RenderViewHost* rvh,
SetDefaultPrefs(web);
// Set preferences based on the context's PrefService.
if (browser.get()) {
if (browser) {
CefBrowserContext* profile =
static_cast<CefBrowserContext*>(
browser->web_contents()->GetBrowserContext());
@@ -379,11 +357,18 @@ void PopulateWebPreferences(content::RenderViewHost* rvh,
SetExtensionPrefs(rvh, web);
// Set preferences based on CefBrowserSettings.
if (browser.get())
if (browser)
SetCefPrefs(browser->settings(), web);
// Set the background color for the WebView.
web.base_background_color = GetBaseBackgroundColor(browser);
if (browser) {
web.base_background_color = browser->GetBackgroundColor();
} else {
// We don't know for sure that the browser will be windowless but assume
// that the global windowless state is likely to be accurate.
web.base_background_color =
CefContext::Get()->GetBackgroundColor(nullptr, STATE_DEFAULT);
}
}
} // namespace renderer_prefs