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 source files for bracket style

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-01-02 17:59:03 -05:00
parent d84b07a5cb
commit 3af3eab3e4
366 changed files with 7275 additions and 3834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
libcef_dll/wrapper/cef_browser_info_map.h
View File

@ -70,24 +70,28 @@ class CefBrowserInfoMap {
// used to evaluate or remove the object at the same time. If the object is
// removed using the Visitor the caller is responsible for destroying it.
ObjectType Find(int browser_id, IdType info_id, Visitor* vistor) {
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return ObjectType();
}
typename BrowserInfoMap::iterator it_browser =
browser_info_map_.find(browser_id);
if (it_browser == browser_info_map_.end())
if (it_browser == browser_info_map_.end()) {
return ObjectType();
}
InfoMap* info_map = it_browser->second;
typename InfoMap::iterator it_info = info_map->find(info_id);
if (it_info == info_map->end())
if (it_info == info_map->end()) {
return ObjectType();
}
ObjectType info = it_info->second;
bool remove = false;
if (vistor)
if (vistor) {
vistor->OnNextInfo(browser_id, it_info->first, info, &remove);
}
if (remove) {
info_map->erase(it_info);
@ -106,8 +110,9 @@ class CefBrowserInfoMap {
void FindAll(Visitor* visitor) {
DCHECK(visitor);
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return;
}
bool remove, keepgoing = true;
@ -121,13 +126,15 @@ class CefBrowserInfoMap {
keepgoing = visitor->OnNextInfo(it_browser->first, it_info->first,
it_info->second, &remove);
if (remove)
if (remove) {
info_map->erase(it_info++);
else
} else {
++it_info;
}
if (!keepgoing)
if (!keepgoing) {
break;
}
}
if (info_map->empty()) {
@ -138,8 +145,9 @@ class CefBrowserInfoMap {
++it_browser;
}
if (!keepgoing)
if (!keepgoing) {
break;
}
}
}
@ -148,13 +156,15 @@ class CefBrowserInfoMap {
void FindAll(int browser_id, Visitor* visitor) {
DCHECK(visitor);
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return;
}
typename BrowserInfoMap::iterator it_browser =
browser_info_map_.find(browser_id);
if (it_browser == browser_info_map_.end())
if (it_browser == browser_info_map_.end()) {
return;
}
InfoMap* info_map = it_browser->second;
bool remove, keepgoing;
@ -165,13 +175,15 @@ class CefBrowserInfoMap {
keepgoing = visitor->OnNextInfo(browser_id, it_info->first,
it_info->second, &remove);
if (remove)
if (remove) {
info_map->erase(it_info++);
else
} else {
++it_info;
}
if (!keepgoing)
if (!keepgoing) {
break;
}
}
if (info_map->empty()) {
@ -186,43 +198,49 @@ class CefBrowserInfoMap {
// Returns the number of objects in the map.
size_t size() const {
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return 0;
}
size_t size = 0;
typename BrowserInfoMap::const_iterator it_browser =
browser_info_map_.begin();
for (; it_browser != browser_info_map_.end(); ++it_browser)
for (; it_browser != browser_info_map_.end(); ++it_browser) {
size += it_browser->second->size();
}
return size;
}
// Returns the number of objects in the map that are associated with the
// specified browser.
size_t size(int browser_id) const {
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return 0;
}
typename BrowserInfoMap::const_iterator it_browser =
browser_info_map_.find(browser_id);
if (it_browser != browser_info_map_.end())
if (it_browser != browser_info_map_.end()) {
return it_browser->second->size();
}
return 0;
}
// Remove all objects from the map. The objects will be destructed.
void clear() {
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return;
}
typename BrowserInfoMap::const_iterator it_browser =
browser_info_map_.begin();
for (; it_browser != browser_info_map_.end(); ++it_browser) {
InfoMap* info_map = it_browser->second;
typename InfoMap::const_iterator it_info = info_map->begin();
for (; it_info != info_map->end(); ++it_info)
for (; it_info != info_map->end(); ++it_info) {
Traits::Destruct(it_info->second);
}
delete info_map;
}
browser_info_map_.clear();
@ -231,18 +249,21 @@ class CefBrowserInfoMap {
// Remove all objects from the map that are associated with the specified
// browser. The objects will be destructed.
void clear(int browser_id) {
if (browser_info_map_.empty())
if (browser_info_map_.empty()) {
return;
}
typename BrowserInfoMap::iterator it_browser =
browser_info_map_.find(browser_id);
if (it_browser == browser_info_map_.end())
if (it_browser == browser_info_map_.end()) {
return;
}
InfoMap* info_map = it_browser->second;
typename InfoMap::const_iterator it_info = info_map->begin();
for (; it_info != info_map->end(); ++it_info)
for (; it_info != info_map->end(); ++it_info) {
Traits::Destruct(it_info->second);
}
browser_info_map_.erase(it_browser);
delete info_map;

9
libcef_dll/wrapper/cef_byte_read_handler.cc
View File

@ -27,8 +27,9 @@ int CefByteReadHandler::Seek(int64 offset, int whence) {
base::AutoLock lock_scope(lock_);
switch (whence) {
case SEEK_CUR:
if (offset_ + offset > size_ || offset_ + offset < 0)
if (offset_ + offset > size_ || offset_ + offset < 0) {
break;
}
offset_ += offset;
rv = 0;
break;
@ -38,15 +39,17 @@ int CefByteReadHandler::Seek(int64 offset, int whence) {
#else
int64 offset_abs = std::abs(offset);
#endif
if (offset_abs > size_)
if (offset_abs > size_) {
break;
}
offset_ = size_ - offset_abs;
rv = 0;
break;
}
case SEEK_SET:
if (offset > size_ || offset < 0)
if (offset > size_ || offset < 0) {
break;
}
offset_ = offset;
rv = 0;
break;

63
libcef_dll/wrapper/cef_message_router.cc
View File

@ -175,8 +175,9 @@ class IdGenerator {
T GetNextId() {
T id = ++next_id_;
if (id == kReservedId) // In case the integer value wraps.
if (id == kReservedId) { // In case the integer value wraps.
id = ++next_id_;
}
return id;
}
@ -308,8 +309,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
Handler* handler) override {
CEF_REQUIRE_UI_THREAD();
if (browser_query_info_map_.empty())
if (browser_query_info_map_.empty()) {
return 0;
}
if (handler) {
// Need to iterate over each QueryInfo object to test the handler.
@ -321,8 +323,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
InfoIdType info_id,
InfoObjectType info,
bool* remove) override {
if (info->handler == handler_)
if (info->handler == handler_) {
count_++;
}
return true;
}
@ -362,8 +365,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
void OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame) override {
if (frame->IsMain())
if (frame->IsMain()) {
CancelPendingFor(browser, nullptr, false);
}
}
bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
@ -404,8 +408,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
handled = (*it_handler)
->OnQuery(browser, frame, query_id, request, persistent,
callback.get());
if (handled)
if (handled) {
break;
}
}
// If the query isn't handled nothing should be keeping a reference to
@ -505,8 +510,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
Visitor visitor(always_remove);
QueryInfo* info =
browser_query_info_map_.Find(browser_id, query_id, &visitor);
if (info)
if (info) {
*removed = visitor.removed();
}
return info;
}
@ -520,8 +526,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
QueryInfo* info = GetQueryInfo(browser_id, query_id, false, &removed);
if (info) {
SendQuerySuccess(info, response);
if (removed)
if (removed) {
delete info;
}
}
}
@ -593,8 +600,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
// Cancel a query that has already been sent to a handler.
void CancelQuery(int64 query_id, QueryInfo* info, bool notify_renderer) {
if (notify_renderer)
if (notify_renderer) {
SendQueryFailure(info, kCanceledErrorCode, kCanceledErrorMessage);
}
info->handler->OnQueryCanceled(info->browser, info->frame, query_id);
@ -617,8 +625,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
return;
}
if (browser_query_info_map_.empty())
if (browser_query_info_map_.empty()) {
return;
}
class Visitor : public BrowserQueryInfoMap::Visitor {
public:
@ -814,8 +823,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
private:
// Don't create the context ID until it's actually needed.
int GetIDForContext(CefRefPtr<CefV8Context> context) {
if (context_id_ == kReservedId)
if (context_id_ == kReservedId) {
context_id_ = router_->CreateIDForContext(context);
}
return context_id_;
}
@ -843,13 +853,15 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
CefRefPtr<CefV8Context> context) override {
CEF_REQUIRE_RENDERER_THREAD();
if (browser_request_info_map_.empty())
if (browser_request_info_map_.empty()) {
return 0;
}
if (context.get()) {
const int context_id = GetIDForContext(context, false);
if (context_id == kReservedId)
if (context_id == kReservedId) {
return 0; // Nothing associated with the specified context.
}
// Need to iterate over each RequestInfo object to test the context.
class Visitor : public BrowserRequestInfoMap::Visitor {
@ -860,8 +872,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
InfoIdType info_id,
InfoObjectType info,
bool* remove) override {
if (info_id.first == context_id_)
if (info_id.first == context_id_) {
count_++;
}
return true;
}
@ -1006,8 +1019,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
Visitor visitor(always_remove);
RequestInfo* info = browser_request_info_map_.Find(
browser_id, std::make_pair(context_id, request_id), &visitor);
if (info)
if (info) {
*removed = visitor.removed();
}
return info;
}
@ -1121,8 +1135,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
bool removed;
RequestInfo* info =
GetRequestInfo(browser_id, context_id, request_id, false, &removed);
if (!info)
if (!info) {
return;
}
CefRefPtr<CefV8Context> context = GetContextByID(context_id);
if (context && info->success_callback) {
@ -1132,8 +1147,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
args);
}
if (removed)
if (removed) {
delete info;
}
}
// Execute the onFailure JavaScript callback.
@ -1147,8 +1163,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
bool removed;
RequestInfo* info =
GetRequestInfo(browser_id, context_id, request_id, true, &removed);
if (!info)
if (!info) {
return;
}
CefRefPtr<CefV8Context> context = GetContextByID(context_id);
if (context && info->failure_callback) {
@ -1183,8 +1200,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
for (; it != context_map_.end(); ++it) {
if (it->second->IsSame(context)) {
int context_id = it->first;
if (remove)
if (remove) {
context_map_.erase(it);
}
return context_id;
}
}
@ -1196,8 +1214,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
CEF_REQUIRE_RENDERER_THREAD();
ContextMap::const_iterator it = context_map_.find(context_id);
if (it != context_map_.end())
if (it != context_map_.end()) {
return it->second;
}
return nullptr;
}
@ -1234,8 +1253,9 @@ CefMessageRouterConfig::CefMessageRouterConfig()
CefRefPtr<CefMessageRouterBrowserSide> CefMessageRouterBrowserSide::Create(
const CefMessageRouterConfig& config) {
CefMessageRouterConfig validated_config = config;
if (!ValidateConfig(validated_config))
if (!ValidateConfig(validated_config)) {
return nullptr;
}
return new CefMessageRouterBrowserSideImpl(validated_config);
}
@ -1243,7 +1263,8 @@ CefRefPtr<CefMessageRouterBrowserSide> CefMessageRouterBrowserSide::Create(
CefRefPtr<CefMessageRouterRendererSide> CefMessageRouterRendererSide::Create(
const CefMessageRouterConfig& config) {
CefMessageRouterConfig validated_config = config;
if (!ValidateConfig(validated_config))
if (!ValidateConfig(validated_config)) {
return nullptr;
}
return new CefMessageRouterRendererSideImpl(validated_config);
}

94
libcef_dll/wrapper/cef_resource_manager.cc
View File

@ -25,8 +25,9 @@ namespace {
std::string GetUrlWithoutQueryOrFragment(const std::string& url) {
// Find the first instance of '?' or '#'.
const size_t pos = std::min(url.find('?'), url.find('#'));
if (pos != std::string::npos)
if (pos != std::string::npos) {
return url.substr(0, pos);
}
return url;
}
@ -38,8 +39,9 @@ std::string GetMimeType(const std::string& url) {
size_t sep = url_without_query.find_last_of(".");
if (sep != std::string::npos) {
mime_type = CefGetMimeType(url_without_query.substr(sep + 1));
if (!mime_type.empty())
if (!mime_type.empty()) {
return mime_type;
}
}
return "text/html";
}
@ -77,8 +79,9 @@ class ContentProvider : public CefResourceManager::Provider {
content_.length());
// Determine the mime type a single time if it isn't already set.
if (mime_type_.empty())
if (mime_type_.empty()) {
mime_type_ = request->mime_type_resolver().Run(url);
}
request->Continue(new CefStreamResourceHandler(mime_type_, stream));
return true;
@ -100,10 +103,12 @@ class DirectoryProvider : public CefResourceManager::Provider {
DCHECK(!directory_path_.empty());
// Normalize the path values.
if (url_path_[url_path_.size() - 1] != '/')
if (url_path_[url_path_.size() - 1] != '/') {
url_path_ += '/';
if (directory_path_[directory_path_.size() - 1] != PATH_SEP)
}
if (directory_path_[directory_path_.size() - 1] != PATH_SEP) {
directory_path_ += PATH_SEP;
}
}
DirectoryProvider(const DirectoryProvider&) = delete;
@ -183,8 +188,9 @@ class ArchiveProvider : public CefResourceManager::Provider {
DCHECK(!archive_path_.empty());
// Normalize the path values.
if (url_path_[url_path_.size() - 1] != '/')
if (url_path_[url_path_.size() - 1] != '/') {
url_path_ += '/';
}
}
ArchiveProvider(const ArchiveProvider&) = delete;
@ -255,8 +261,9 @@ class ArchiveProvider : public CefResourceManager::Provider {
if (!pending_requests_.empty()) {
// Continue all pending requests.
PendingRequests::const_iterator it = pending_requests_.begin();
for (; it != pending_requests_.end(); ++it)
for (; it != pending_requests_.end(); ++it) {
ContinueRequest(*it);
}
pending_requests_.clear();
}
}
@ -275,8 +282,9 @@ class ArchiveProvider : public CefResourceManager::Provider {
}
}
if (!handler.get())
if (!handler.get()) {
return false;
}
request->Continue(handler);
return true;
@ -325,8 +333,9 @@ struct CefResourceManager::ProviderEntry {
CefResourceManager::RequestState::~RequestState() {
// Always execute the callback.
if (callback_.get())
if (callback_.get()) {
callback_->Continue();
}
}
// CefResourceManager::Request implementation.
@ -339,8 +348,9 @@ void CefResourceManager::Request::Continue(
return;
}
if (!state_.get())
if (!state_.get()) {
return;
}
// Disassociate |state_| immediately so that Provider::OnRequestCanceled is
// not called unexpectedly if Provider::OnRequest calls this method and then
@ -357,8 +367,9 @@ void CefResourceManager::Request::Stop() {
return;
}
if (!state_.get())
if (!state_.get()) {
return;
}
// Disassociate |state_| immediately so that Provider::OnRequestCanceled is
// not called unexpectedly if Provider::OnRequest calls this method and then
@ -389,8 +400,9 @@ std::unique_ptr<CefResourceManager::RequestState>
CefResourceManager::Request::SendRequest() {
CEF_REQUIRE_IO_THREAD();
Provider* provider = (*state_->current_entry_pos_)->provider_.get();
if (!provider->OnRequest(this))
if (!provider->OnRequest(this)) {
return std::move(state_);
}
return std::unique_ptr<RequestState>();
}
@ -406,8 +418,9 @@ void CefResourceManager::Request::ContinueOnIOThread(
CEF_REQUIRE_IO_THREAD();
// The manager may already have been deleted.
base::WeakPtr<CefResourceManager> manager = state->manager_;
if (manager)
if (manager) {
manager->ContinueRequest(std::move(state), handler);
}
}
// static
@ -416,8 +429,9 @@ void CefResourceManager::Request::StopOnIOThread(
CEF_REQUIRE_IO_THREAD();
// The manager may already have been deleted.
base::WeakPtr<CefResourceManager> manager = state->manager_;
if (manager)
if (manager) {
manager->StopRequest(std::move(state));
}
}
// CefResourceManager implementation.
@ -434,8 +448,9 @@ CefResourceManager::~CefResourceManager() {
// call back into this manager due to the use of WeakPtr.
if (!providers_.empty()) {
ProviderEntryList::iterator it = providers_.begin();
for (; it != providers_.end(); ++it)
for (; it != providers_.end(); ++it) {
delete *it;
}
providers_.clear();
}
}
@ -469,8 +484,9 @@ void CefResourceManager::AddProvider(Provider* provider,
int order,
const std::string& identifier) {
DCHECK(provider);
if (!provider)
if (!provider) {
return;
}
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO, base::BindOnce(&CefResourceManager::AddProvider, this,
@ -489,8 +505,9 @@ void CefResourceManager::AddProvider(Provider* provider,
// Insert before the first entry with a higher |order| value.
ProviderEntryList::iterator it = providers_.begin();
for (; it != providers_.end(); ++it) {
if ((*it)->order_ > order)
if ((*it)->order_ > order) {
break;
}
}
providers_.insert(it, new_entry.release());
@ -503,15 +520,17 @@ void CefResourceManager::RemoveProviders(const std::string& identifier) {
return;
}
if (providers_.empty())
if (providers_.empty()) {
return;
}
ProviderEntryList::iterator it = providers_.begin();
while (it != providers_.end()) {
if ((*it)->identifier_ == identifier)
if ((*it)->identifier_ == identifier) {
DeleteProvider(it, false);
else
} else {
++it;
}
}
}
@ -522,12 +541,14 @@ void CefResourceManager::RemoveAllProviders() {
return;
}
if (providers_.empty())
if (providers_.empty()) {
return;
}
ProviderEntryList::iterator it = providers_.begin();
while (it != providers_.end())
while (it != providers_.end()) {
DeleteProvider(it, true);
}
}
void CefResourceManager::SetMimeTypeResolver(const MimeTypeResolver& resolver) {
@ -537,10 +558,11 @@ void CefResourceManager::SetMimeTypeResolver(const MimeTypeResolver& resolver) {
return;
}
if (!resolver.is_null())
if (!resolver.is_null()) {
mime_type_resolver_ = resolver;
else
} else {
mime_type_resolver_ = base::BindRepeating(GetMimeType);
}
}
void CefResourceManager::SetUrlFilter(const UrlFilter& filter) {
@ -550,10 +572,11 @@ void CefResourceManager::SetUrlFilter(const UrlFilter& filter) {
return;
}
if (!filter.is_null())
if (!filter.is_null()) {
url_filter_ = filter;
else
} else {
url_filter_ = base::BindRepeating(GetFilteredUrl);
}
}
cef_return_value_t CefResourceManager::OnBeforeResourceLoad(
@ -605,8 +628,9 @@ CefRefPtr<CefResourceHandler> CefResourceManager::GetResourceHandler(
CefRefPtr<CefRequest> request) {
CEF_REQUIRE_IO_THREAD();
if (pending_handlers_.empty())
if (pending_handlers_.empty()) {
return nullptr;
}
CefRefPtr<CefResourceHandler> handler;
@ -635,8 +659,9 @@ bool CefResourceManager::SendRequest(std::unique_ptr<RequestState> state) {
if (state.get()) {
// The provider will not handle the request. Move to the next provider if
// any.
if (!IncrementProvider(state.get()))
if (!IncrementProvider(state.get())) {
StopRequest(std::move(state));
}
} else {
potentially_handled = true;
}
@ -657,10 +682,11 @@ void CefResourceManager::ContinueRequest(
StopRequest(std::move(state));
} else {
// Move to the next provider if any.
if (IncrementProvider(state.get()))
if (IncrementProvider(state.get())) {
SendRequest(std::move(state));
else
} else {
StopRequest(std::move(state));
}
}
}
@ -727,8 +753,9 @@ void CefResourceManager::DeleteProvider(ProviderEntryList::iterator& iterator,
ProviderEntry* current_entry = *(iterator);
if (current_entry->deletion_pending_)
if (current_entry->deletion_pending_) {
return;
}
if (!current_entry->pending_requests_.empty()) {
// Don't delete the provider entry until all pending requests have cleared.
@ -739,10 +766,11 @@ void CefResourceManager::DeleteProvider(ProviderEntryList::iterator& iterator,
for (; it != current_entry->pending_requests_.end(); ++it) {
const scoped_refptr<Request>& request = *it;
if (request->HasState()) {
if (stop)
if (stop) {
request->Stop();
else
} else {
request->Continue(nullptr);
}
current_entry->provider_->OnRequestCanceled(request);
}
}

27
libcef_dll/wrapper/cef_scoped_temp_dir.cc
View File

@ -10,52 +10,61 @@
CefScopedTempDir::CefScopedTempDir() {}
CefScopedTempDir::~CefScopedTempDir() {
if (!path_.empty() && !Delete())
if (!path_.empty() && !Delete()) {
DLOG(WARNING) << "Could not delete temp dir in dtor.";
}
}
bool CefScopedTempDir::CreateUniqueTempDir() {
if (!path_.empty())
if (!path_.empty()) {
return false;
}
// This "scoped_dir" prefix is only used on Windows and serves as a template
// for the unique name.
if (!CefCreateNewTempDirectory("scoped_dir", path_))
if (!CefCreateNewTempDirectory("scoped_dir", path_)) {
return false;
}
return true;
}
bool CefScopedTempDir::CreateUniqueTempDirUnderPath(
const CefString& base_path) {
if (!path_.empty())
if (!path_.empty()) {
return false;
}
// If |base_path| does not exist, create it.
if (!CefCreateDirectory(base_path))
if (!CefCreateDirectory(base_path)) {
return false;
}
// Create a new, uniquely named directory under |base_path|.
if (!CefCreateTempDirectoryInDirectory(base_path, "scoped_dir_", path_))
if (!CefCreateTempDirectoryInDirectory(base_path, "scoped_dir_", path_)) {
return false;
}
return true;
}
bool CefScopedTempDir::Set(const CefString& path) {
if (!path_.empty())
if (!path_.empty()) {
return false;
}
if (!CefDirectoryExists(path) && !CefCreateDirectory(path))
if (!CefDirectoryExists(path) && !CefCreateDirectory(path)) {
return false;
}
path_ = path;
return true;
}
bool CefScopedTempDir::Delete() {
if (path_.empty())
if (path_.empty()) {
return false;
}
bool ret = CefDeleteFile(path_, true);
if (ret) {

3
libcef_dll/wrapper/cef_stream_resource_handler.cc
View File

@ -54,8 +54,9 @@ void CefStreamResourceHandler::GetResponseHeaders(
response->SetStatusText(status_text_);
response->SetMimeType(mime_type_);
if (!header_map_.empty())
if (!header_map_.empty()) {
response->SetHeaderMap(header_map_);
}
response_length = stream_ ? -1 : 0;
}

48
libcef_dll/wrapper/cef_xml_object.cc
View File

@ -24,8 +24,9 @@ class CefXmlObjectLoader {
const CefString& URI) {
CefRefPtr<CefXmlReader> reader(
CefXmlReader::Create(stream, encodingType, URI));
if (!reader.get())
if (!reader.get()) {
return false;
}
bool ret = reader->MoveToNextNode();
if (ret) {
@ -170,8 +171,9 @@ bool CefXmlObject::Load(CefRefPtr<CefStreamReader> stream,
CefXmlObjectLoader loader(this);
if (!loader.Load(stream, encodingType, URI)) {
if (loadError)
if (loadError) {
*loadError = loader.GetLoadError();
}
return false;
}
return true;
@ -194,8 +196,9 @@ void CefXmlObject::Append(CefRefPtr<CefXmlObject> object,
ObjectVector children;
object->GetChildren(children);
ObjectVector::const_iterator it = children.begin();
for (; it != children.end(); ++it)
for (; it != children.end(); ++it) {
AddChild((*it)->Duplicate());
}
}
if (object->HasAttributes()) {
@ -203,8 +206,9 @@ void CefXmlObject::Append(CefRefPtr<CefXmlObject> object,
object->GetAttributes(attributes);
AttributeMap::const_iterator it = attributes.begin();
for (; it != attributes.end(); ++it) {
if (overwriteAttributes || !HasAttribute(it->first))
if (overwriteAttributes || !HasAttribute(it->first)) {
SetAttributeValue(it->first, it->second);
}
}
}
}
@ -235,8 +239,9 @@ CefString CefXmlObject::GetName() {
bool CefXmlObject::SetName(const CefString& name) {
DCHECK(!name.empty());
if (name.empty())
if (name.empty()) {
return false;
}
base::AutoLock lock_scope(lock_);
name_ = name;
@ -274,8 +279,9 @@ CefString CefXmlObject::GetValue() {
bool CefXmlObject::SetValue(const CefString& value) {
base::AutoLock lock_scope(lock_);
DCHECK(children_.empty());
if (!children_.empty())
if (!children_.empty()) {
return false;
}
value_ = value;
return true;
}
@ -291,8 +297,9 @@ size_t CefXmlObject::GetAttributeCount() {
}
bool CefXmlObject::HasAttribute(const CefString& name) {
if (name.empty())
if (name.empty()) {
return false;
}
base::AutoLock lock_scope(lock_);
AttributeMap::const_iterator it = attributes_.find(name);
@ -305,8 +312,9 @@ CefString CefXmlObject::GetAttributeValue(const CefString& name) {
if (!name.empty()) {
base::AutoLock lock_scope(lock_);
AttributeMap::const_iterator it = attributes_.find(name);
if (it != attributes_.end())
if (it != attributes_.end()) {
value = it->second;
}
}
return value;
}
@ -314,8 +322,9 @@ CefString CefXmlObject::GetAttributeValue(const CefString& name) {
bool CefXmlObject::SetAttributeValue(const CefString& name,
const CefString& value) {
DCHECK(!name.empty());
if (name.empty())
if (name.empty()) {
return false;
}
base::AutoLock lock_scope(lock_);
AttributeMap::iterator it = attributes_.find(name);
@ -354,21 +363,24 @@ bool CefXmlObject::HasChild(CefRefPtr<CefXmlObject> child) {
base::AutoLock lock_scope(lock_);
ObjectVector::const_iterator it = children_.begin();
for (; it != children_.end(); ++it) {
if ((*it).get() == child.get())
if ((*it).get() == child.get()) {
return true;
}
}
return false;
}
bool CefXmlObject::AddChild(CefRefPtr<CefXmlObject> child) {
DCHECK(child.get());
if (!child.get())
if (!child.get()) {
return false;
}
CefRefPtr<CefXmlObject> parent = child->GetParent();
DCHECK(!parent);
if (parent)
if (parent) {
return false;
}
base::AutoLock lock_scope(lock_);
@ -401,21 +413,24 @@ size_t CefXmlObject::GetChildren(ObjectVector& children) {
void CefXmlObject::ClearChildren() {
base::AutoLock lock_scope(lock_);
ObjectVector::iterator it = children_.begin();
for (; it != children_.end(); ++it)
for (; it != children_.end(); ++it) {
(*it)->SetParent(nullptr);
}
children_.clear();
}
CefRefPtr<CefXmlObject> CefXmlObject::FindChild(const CefString& name) {
DCHECK(!name.empty());
if (name.empty())
if (name.empty()) {
return nullptr;
}
base::AutoLock lock_scope(lock_);
ObjectVector::const_iterator it = children_.begin();
for (; it != children_.end(); ++it) {
if ((*it)->GetName() == name)
if ((*it)->GetName() == name) {
return (*it);
}
}
return nullptr;
}
@ -423,8 +438,9 @@ CefRefPtr<CefXmlObject> CefXmlObject::FindChild(const CefString& name) {
size_t CefXmlObject::FindChildren(const CefString& name,
ObjectVector& children) {
DCHECK(!name.empty());
if (name.empty())
if (name.empty()) {
return 0;
}
size_t ct = 0;

20
libcef_dll/wrapper/cef_zip_archive.cc
View File

@ -77,11 +77,13 @@ size_t CefZipArchive::Load(CefRefPtr<CefStreamReader> stream,
base::AutoLock lock_scope(lock_);
CefRefPtr<CefZipReader> reader(CefZipReader::Create(stream));
if (!reader.get())
if (!reader.get()) {
return 0;
}
if (!reader->MoveToFirstFile())
if (!reader->MoveToFirstFile()) {
return 0;
}
FileMap::iterator it;
size_t count = 0;
@ -93,22 +95,25 @@ size_t CefZipArchive::Load(CefRefPtr<CefStreamReader> stream,
continue;
}
if (!reader->OpenFile(password))
if (!reader->OpenFile(password)) {
break;
}
const CefString& name = ToLower(reader->GetFileName());
it = contents_.find(name);
if (it != contents_.end()) {
if (overwriteExisting)
if (overwriteExisting) {
contents_.erase(it);
else // Skip files that already exist.
} else { // Skip files that already exist.
continue;
}
}
CefRefPtr<CefZipFile> contents = new CefZipFile();
if (!contents->Initialize(size))
if (!contents->Initialize(size)) {
continue;
}
unsigned char* data = contents->data();
size_t offset = 0;
@ -149,8 +154,9 @@ CefRefPtr<CefZipArchive::File> CefZipArchive::GetFile(
const CefString& fileName) const {
base::AutoLock lock_scope(lock_);
FileMap::const_iterator it = contents_.find(ToLower(fileName));
if (it != contents_.end())
if (it != contents_.end()) {
return it->second;
}
return nullptr;
}