mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update source files for bracket style
This commit is contained in:
@@ -48,8 +48,9 @@ bool HasPreference(PrefService* pref_service, const CefString& name) {
|
||||
CefRefPtr<CefValue> GetPreference(PrefService* pref_service,
|
||||
const CefString& name) {
|
||||
const PrefService::Preference* pref = pref_service->FindPreference(name);
|
||||
if (!pref)
|
||||
if (!pref) {
|
||||
return nullptr;
|
||||
}
|
||||
return new CefValueImpl(new base::Value(pref->GetValue()->Clone()));
|
||||
}
|
||||
|
||||
|
@@ -61,8 +61,9 @@ void CefPrefStore::SetValue(const std::string& key,
|
||||
void CefPrefStore::SetValueSilently(const std::string& key,
|
||||
base::Value value,
|
||||
uint32_t flags) {
|
||||
if (prefs_.SetValue(key, std::move(value)))
|
||||
if (prefs_.SetValue(key, std::move(value))) {
|
||||
committed_ = false;
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::RemoveValuesByPrefixSilently(const std::string& prefix) {
|
||||
@@ -93,10 +94,11 @@ PersistentPrefStore::PrefReadError CefPrefStore::ReadPrefs() {
|
||||
void CefPrefStore::ReadPrefsAsync(ReadErrorDelegate* error_delegate) {
|
||||
DCHECK(!pending_async_read_);
|
||||
error_delegate_.reset(error_delegate);
|
||||
if (block_async_read_)
|
||||
if (block_async_read_) {
|
||||
pending_async_read_ = true;
|
||||
else
|
||||
} else {
|
||||
NotifyInitializationCompleted();
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::CommitPendingWrite(
|
||||
@@ -116,22 +118,26 @@ void CefPrefStore::SetInitializationCompleted() {
|
||||
}
|
||||
|
||||
void CefPrefStore::NotifyPrefValueChanged(const std::string& key) {
|
||||
for (Observer& observer : observers_)
|
||||
for (Observer& observer : observers_) {
|
||||
observer.OnPrefValueChanged(key);
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::NotifyInitializationCompleted() {
|
||||
DCHECK(!init_complete_);
|
||||
init_complete_ = true;
|
||||
if (read_success_ && read_error_ != PREF_READ_ERROR_NONE && error_delegate_)
|
||||
if (read_success_ && read_error_ != PREF_READ_ERROR_NONE && error_delegate_) {
|
||||
error_delegate_->OnError(read_error_);
|
||||
for (Observer& observer : observers_)
|
||||
}
|
||||
for (Observer& observer : observers_) {
|
||||
observer.OnInitializationCompleted(read_success_);
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::ReportValueChanged(const std::string& key, uint32_t flags) {
|
||||
for (Observer& observer : observers_)
|
||||
for (Observer& observer : observers_) {
|
||||
observer.OnPrefValueChanged(key);
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::SetString(const std::string& key, const std::string& value) {
|
||||
@@ -148,8 +154,9 @@ void CefPrefStore::SetBoolean(const std::string& key, bool value) {
|
||||
|
||||
bool CefPrefStore::GetString(const std::string& key, std::string* value) const {
|
||||
const base::Value* stored_value;
|
||||
if (!prefs_.GetValue(key, &stored_value) || !stored_value)
|
||||
if (!prefs_.GetValue(key, &stored_value) || !stored_value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (value && stored_value->is_string()) {
|
||||
*value = stored_value->GetString();
|
||||
@@ -160,8 +167,9 @@ bool CefPrefStore::GetString(const std::string& key, std::string* value) const {
|
||||
|
||||
bool CefPrefStore::GetInteger(const std::string& key, int* value) const {
|
||||
const base::Value* stored_value;
|
||||
if (!prefs_.GetValue(key, &stored_value) || !stored_value)
|
||||
if (!prefs_.GetValue(key, &stored_value) || !stored_value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (value && stored_value->is_int()) {
|
||||
*value = stored_value->GetInt();
|
||||
@@ -172,8 +180,9 @@ bool CefPrefStore::GetInteger(const std::string& key, int* value) const {
|
||||
|
||||
bool CefPrefStore::GetBoolean(const std::string& key, bool* value) const {
|
||||
const base::Value* stored_value;
|
||||
if (!prefs_.GetValue(key, &stored_value) || !stored_value)
|
||||
if (!prefs_.GetValue(key, &stored_value) || !stored_value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (value && stored_value->is_bool()) {
|
||||
*value = stored_value->GetBool();
|
||||
@@ -185,8 +194,9 @@ bool CefPrefStore::GetBoolean(const std::string& key, bool* value) const {
|
||||
void CefPrefStore::SetBlockAsyncRead(bool block_async_read) {
|
||||
DCHECK(!init_complete_);
|
||||
block_async_read_ = block_async_read;
|
||||
if (pending_async_read_ && !block_async_read_)
|
||||
if (pending_async_read_ && !block_async_read_) {
|
||||
NotifyInitializationCompleted();
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::set_read_only(bool read_only) {
|
||||
|
@@ -82,12 +82,15 @@ void SetChromePrefs(Profile* profile, blink::web_pref::WebPreferences& web) {
|
||||
web.dom_paste_enabled = prefs->GetBoolean(prefs::kWebKitDomPasteEnabled);
|
||||
web.tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks);
|
||||
|
||||
if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled))
|
||||
if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled)) {
|
||||
web.javascript_enabled = false;
|
||||
if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled))
|
||||
}
|
||||
if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled)) {
|
||||
web.web_security_enabled = false;
|
||||
if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled))
|
||||
}
|
||||
if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled)) {
|
||||
web.plugins_enabled = false;
|
||||
}
|
||||
web.loads_images_automatically =
|
||||
prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
|
||||
|
||||
@@ -143,14 +146,16 @@ void SetChromePrefs(Profile* profile, blink::web_pref::WebPreferences& web) {
|
||||
void SetExtensionPrefs(content::WebContents* web_contents,
|
||||
content::RenderViewHost* rvh,
|
||||
blink::web_pref::WebPreferences& web) {
|
||||
if (!extensions::ExtensionsEnabled())
|
||||
if (!extensions::ExtensionsEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const extensions::ExtensionRegistry* registry =
|
||||
extensions::ExtensionRegistry::Get(
|
||||
rvh->GetProcess()->GetBrowserContext());
|
||||
if (!registry)
|
||||
if (!registry) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Note: it's not possible for kExtensionsScheme to change during the lifetime
|
||||
// of the process.
|
||||
@@ -161,8 +166,9 @@ void SetExtensionPrefs(content::WebContents* web_contents,
|
||||
// would get the wrong preferences.
|
||||
const GURL& site_url =
|
||||
web_contents->GetPrimaryMainFrame()->GetSiteInstance()->GetSiteURL();
|
||||
if (!site_url.SchemeIs(extensions::kExtensionScheme))
|
||||
if (!site_url.SchemeIs(extensions::kExtensionScheme)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const extensions::Extension* extension =
|
||||
registry->enabled_extensions().GetByID(site_url.host());
|
||||
@@ -236,12 +242,15 @@ void SetCommandLinePrefDefaults(CommandLinePrefStore* prefs) {
|
||||
command_line->GetSwitchValueASCII(switches::kDefaultEncoding));
|
||||
}
|
||||
|
||||
if (command_line->HasSwitch(switches::kDisableJavascriptDomPaste))
|
||||
if (command_line->HasSwitch(switches::kDisableJavascriptDomPaste)) {
|
||||
SetBool(prefs, prefs::kWebKitDomPasteEnabled, false);
|
||||
if (command_line->HasSwitch(switches::kDisableImageLoading))
|
||||
}
|
||||
if (command_line->HasSwitch(switches::kDisableImageLoading)) {
|
||||
SetBool(prefs, prefs::kWebKitLoadsImagesAutomatically, false);
|
||||
if (command_line->HasSwitch(switches::kDisableTabToLinks))
|
||||
}
|
||||
if (command_line->HasSwitch(switches::kDisableTabToLinks)) {
|
||||
SetBool(prefs, prefs::kWebkitTabsToLinks, false);
|
||||
}
|
||||
}
|
||||
|
||||
void SetDefaultPrefs(blink::web_pref::WebPreferences& web) {
|
||||
@@ -297,17 +306,22 @@ void SetCefPrefs(const CefBrowserSettings& cef,
|
||||
CefString(&cef.fantasy_font_family);
|
||||
}
|
||||
|
||||
if (cef.default_font_size > 0)
|
||||
if (cef.default_font_size > 0) {
|
||||
web.default_font_size = cef.default_font_size;
|
||||
if (cef.default_fixed_font_size > 0)
|
||||
}
|
||||
if (cef.default_fixed_font_size > 0) {
|
||||
web.default_fixed_font_size = cef.default_fixed_font_size;
|
||||
if (cef.minimum_font_size > 0)
|
||||
}
|
||||
if (cef.minimum_font_size > 0) {
|
||||
web.minimum_font_size = cef.minimum_font_size;
|
||||
if (cef.minimum_logical_font_size > 0)
|
||||
}
|
||||
if (cef.minimum_logical_font_size > 0) {
|
||||
web.minimum_logical_font_size = cef.minimum_logical_font_size;
|
||||
}
|
||||
|
||||
if (cef.default_encoding.length > 0)
|
||||
if (cef.default_encoding.length > 0) {
|
||||
web.default_encoding = CefString(&cef.default_encoding);
|
||||
}
|
||||
|
||||
SET_STATE(cef.remote_fonts, web.remote_fonts_enabled);
|
||||
SET_STATE(cef.javascript, web.javascript_enabled);
|
||||
|
Reference in New Issue
Block a user