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

Apply clang-format to all C, C++ and ObjC files (issue #2171)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-05-17 11:29:28 +02:00
parent a566549e04
commit 31d9407ee2
1331 changed files with 33014 additions and 32258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libcef_dll/wrapper/cef_browser_info_map.h
View File

@@ -13,17 +13,15 @@
// Default traits for CefBrowserInfoMap. Override to provide different object
// destruction behavior.
template<typename ObjectType>
template <typename ObjectType>
struct DefaultCefBrowserInfoMapTraits {
static void Destruct(ObjectType info) {
delete info;
}
static void Destruct(ObjectType info) { delete info; }
};
// Maps an arbitrary IdType to an arbitrary ObjectType on a per-browser basis.
template <typename IdType,
typename ObjectType,
typename Traits = DefaultCefBrowserInfoMapTraits<ObjectType> >
typename Traits = DefaultCefBrowserInfoMapTraits<ObjectType>>
class CefBrowserInfoMap {
public:
// Implement this interface to visit and optionally delete objects in the map.
@@ -38,7 +36,7 @@ class CefBrowserInfoMap {
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
InfoObjectType info,
bool* remove) =0;
bool* remove) = 0;
protected:
virtual ~Visitor() {}
@@ -46,9 +44,7 @@ class CefBrowserInfoMap {
CefBrowserInfoMap() {}
~CefBrowserInfoMap() {
clear();
}
~CefBrowserInfoMap() { clear(); }
// Add an object associated with the specified ID values.
void Add(int browser_id, IdType info_id, ObjectType info) {
@@ -261,5 +257,4 @@ class CefBrowserInfoMap {
DISALLOW_COPY_AND_ASSIGN(CefBrowserInfoMap);
};
#endif // CEF_LIBCEF_DLL_WRAPPER_CEF_BROWSER_INFO_MAP_H_

42
libcef_dll/wrapper/cef_byte_read_handler.cc
View File

@@ -8,10 +8,10 @@
#include <cstdio>
#include <cstdlib>
CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes, size_t size,
CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes,
size_t size,
CefRefPtr<CefBaseRefCounted> source)
: bytes_(bytes), size_(size), offset_(0), source_(source) {
}
: bytes_(bytes), size_(size), offset_(0), source_(source) {}
size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) {
base::AutoLock lock_scope(lock_);
@@ -26,30 +26,30 @@ int CefByteReadHandler::Seek(int64 offset, int whence) {
int rv = -1L;
base::AutoLock lock_scope(lock_);
switch (whence) {
case SEEK_CUR:
if (offset_ + offset > size_ || offset_ + offset < 0)
case SEEK_CUR:
if (offset_ + offset > size_ || offset_ + offset < 0)
break;
offset_ += offset;
rv = 0;
break;
offset_ += offset;
rv = 0;
break;
case SEEK_END: {
case SEEK_END: {
#if defined(OS_WIN)
int64 offset_abs = _abs64(offset);
int64 offset_abs = _abs64(offset);
#else
int64 offset_abs = std::abs(offset);
int64 offset_abs = std::abs(offset);
#endif
if (offset_abs > size_)
if (offset_abs > size_)
break;
offset_ = size_ - offset_abs;
rv = 0;
break;
offset_ = size_ - offset_abs;
rv = 0;
break;
}
case SEEK_SET:
if (offset > size_ || offset < 0)
}
case SEEK_SET:
if (offset > size_ || offset < 0)
break;
offset_ = offset;
rv = 0;
break;
offset_ = offset;
rv = 0;
break;
}
return rv;

9
libcef_dll/wrapper/cef_closure_task.cc
View File

@@ -2,16 +2,14 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "include/wrapper/cef_closure_task.h"
#include "include/base/cef_callback.h"
#include "include/wrapper/cef_closure_task.h"
namespace {
class CefClosureTask : public CefTask {
public:
explicit CefClosureTask(const base::Closure& closure)
: closure_(closure) {
}
explicit CefClosureTask(const base::Closure& closure) : closure_(closure) {}
// CefTask method
virtual void Execute() OVERRIDE {
@@ -36,7 +34,8 @@ bool CefPostTask(CefThreadId threadId, const base::Closure& closure) {
return CefPostTask(threadId, new CefClosureTask(closure));
}
bool CefPostDelayedTask(CefThreadId threadId, const base::Closure& closure,
bool CefPostDelayedTask(CefThreadId threadId,
const base::Closure& closure,
int64 delay_ms) {
return CefPostDelayedTask(threadId, new CefClosureTask(closure), delay_ms);
}

177
libcef_dll/wrapper/cef_message_router.cc
View File

@@ -35,8 +35,7 @@ const char kCanceledErrorMessage[] = "The query has been canceled";
// Validate configuration settings.
bool ValidateConfig(CefMessageRouterConfig& config) {
// Must specify function names.
if (config.js_cancel_function.empty() ||
config.js_query_function.empty()) {
if (config.js_cancel_function.empty() || config.js_query_function.empty()) {
return false;
}
@@ -75,8 +74,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
: router_(router),
browser_id_(browser_id),
query_id_(query_id),
persistent_(persistent) {
}
persistent_(persistent) {}
virtual ~CallbackImpl() {
// Hitting this DCHECK means that you didn't call Success or Failure
// on the Callback after returning true from Handler::OnQuery. You must
@@ -87,13 +85,13 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
virtual void Success(const CefString& response) OVERRIDE {
if (!CefCurrentlyOn(TID_UI)) {
// Must execute on the UI thread to access member variables.
CefPostTask(TID_UI,
base::Bind(&CallbackImpl::Success, this, response));
CefPostTask(TID_UI, base::Bind(&CallbackImpl::Success, this, response));
return;
}
if (router_) {
CefPostTask(TID_UI,
CefPostTask(
TID_UI,
base::Bind(&CefMessageRouterBrowserSideImpl::OnCallbackSuccess,
router_.get(), browser_id_, query_id_, response));
@@ -108,14 +106,14 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
const CefString& error_message) OVERRIDE {
if (!CefCurrentlyOn(TID_UI)) {
// Must execute on the UI thread to access member variables.
CefPostTask(TID_UI,
base::Bind(&CallbackImpl::Failure, this,
error_code, error_message));
CefPostTask(TID_UI, base::Bind(&CallbackImpl::Failure, this, error_code,
error_message));
return;
}
if (router_) {
CefPostTask(TID_UI,
CefPostTask(
TID_UI,
base::Bind(&CefMessageRouterBrowserSideImpl::OnCallbackFailure,
router_.get(), browser_id_, query_id_, error_code,
error_message));
@@ -141,11 +139,10 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
explicit CefMessageRouterBrowserSideImpl(const CefMessageRouterConfig& config)
: config_(config),
query_message_name_(
config.js_query_function.ToString() + kMessageSuffix),
cancel_message_name_(
config.js_cancel_function.ToString() + kMessageSuffix) {
}
query_message_name_(config.js_query_function.ToString() +
kMessageSuffix),
cancel_message_name_(config.js_cancel_function.ToString() +
kMessageSuffix) {}
virtual ~CefMessageRouterBrowserSideImpl() {
// There should be no pending queries when the router is deleted.
@@ -155,8 +152,8 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
virtual bool AddHandler(Handler* handler, bool first) OVERRIDE {
CEF_REQUIRE_UI_THREAD();
if (handler_set_.find(handler) == handler_set_.end()) {
handler_set_.insert(
first ? handler_set_.begin() : handler_set_.end(), handler);
handler_set_.insert(first ? handler_set_.begin() : handler_set_.end(),
handler);
return true;
}
return false;
@@ -187,9 +184,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
// Need to iterate over each QueryInfo object to test the handler.
class Visitor : public BrowserQueryInfoMap::Visitor {
public:
explicit Visitor(Handler* handler)
: handler_(handler),
count_(0) {}
explicit Visitor(Handler* handler) : handler_(handler), count_(0) {}
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
@@ -206,13 +201,12 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
Handler* handler_;
int count_;
};
Visitor visitor(handler);
if (browser.get()) {
// Count queries associated with the specified browser.
browser_query_info_map_.FindAll(
browser->GetIdentifier(), &visitor);
browser_query_info_map_.FindAll(browser->GetIdentifier(), &visitor);
} else {
// Count all queries for all browsers.
browser_query_info_map_.FindAll(&visitor);
@@ -278,7 +272,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
frame = browser->GetFrame(frame_id);
CefRefPtr<CallbackImpl> callback(
new CallbackImpl(this, browser_id, query_id, persistent));
// Make a copy of the handler list in case the user adds or removes a
// handler while we're iterating.
HandlerSet handler_set = handler_set_;
@@ -286,8 +280,9 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
bool handled = false;
HandlerSet::const_iterator it_handler = handler_set.begin();
for (; it_handler != handler_set.end(); ++it_handler) {
handled = (*it_handler)->OnQuery(browser, frame, query_id, request,
persistent, callback.get());
handled = (*it_handler)
->OnQuery(browser, frame, query_id, request, persistent,
callback.get());
if (handled)
break;
}
@@ -371,8 +366,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
class Visitor : public BrowserQueryInfoMap::Visitor {
public:
explicit Visitor(bool always_remove)
: always_remove_(always_remove),
removed_(false) {}
: always_remove_(always_remove), removed_(false) {}
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
@@ -428,8 +422,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
}
}
void SendQuerySuccess(QueryInfo* info,
const CefString& response) {
void SendQuerySuccess(QueryInfo* info, const CefString& response) {
SendQuerySuccess(info->browser, info->context_id, info->request_id,
response);
}
@@ -472,11 +465,12 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
}
// Cancel a query that has not been sent to a handler.
void CancelUnhandledQuery(CefRefPtr<CefBrowser> browser, int context_id,
void CancelUnhandledQuery(CefRefPtr<CefBrowser> browser,
int context_id,
int request_id) {
SendQueryFailure(browser, context_id, request_id, kCanceledErrorCode,
kCanceledErrorMessage);
}
SendQueryFailure(browser, context_id, request_id, kCanceledErrorCode,
kCanceledErrorMessage);
}
// Cancel a query that has already been sent to a handler.
void CancelQuery(int64 query_id, QueryInfo* info, bool notify_renderer) {
@@ -503,8 +497,8 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
if (!CefCurrentlyOn(TID_UI)) {
// Must execute on the UI thread.
CefPostTask(TID_UI,
base::Bind(&CefMessageRouterBrowserSideImpl::CancelPendingFor, this,
browser, handler, notify_renderer));
base::Bind(&CefMessageRouterBrowserSideImpl::CancelPendingFor,
this, browser, handler, notify_renderer));
return;
}
@@ -542,8 +536,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
if (browser.get()) {
// Cancel all queries associated with the specified browser.
browser_query_info_map_.FindAll(
browser->GetIdentifier(), &visitor);
browser_query_info_map_.FindAll(browser->GetIdentifier(), &visitor);
} else {
// Cancel all queries for all browsers.
browser_query_info_map_.FindAll(&visitor);
@@ -558,9 +551,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
Visitor(CefMessageRouterBrowserSideImpl* router,
int context_id,
int request_id)
: router_(router),
context_id_(context_id),
request_id_(request_id) {}
: router_(router), context_id_(context_id), request_id_(request_id) {}
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
@@ -571,7 +562,7 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
*remove = true;
router_->CancelQuery(info_id, info, false);
delete info;
// Stop iterating if only canceling a single request.
return (request_id_ == kReservedId);
}
@@ -614,13 +605,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
public:
class V8HandlerImpl : public CefV8Handler {
public:
V8HandlerImpl(
CefRefPtr<CefMessageRouterRendererSideImpl> router,
const CefMessageRouterConfig& config)
: router_(router),
config_(config),
context_id_(kReservedId) {
}
V8HandlerImpl(CefRefPtr<CefMessageRouterRendererSideImpl> router,
const CefMessageRouterConfig& config)
: router_(router), config_(config), context_id_(kReservedId) {}
virtual bool Execute(const CefString& name,
CefRefPtr<CefV8Value> object,
@@ -637,9 +624,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
CefRefPtr<CefV8Value> requestVal = arg->GetValue(kMemberRequest);
if (!requestVal.get() || !requestVal->IsString()) {
exception = "Invalid arguments; object member '"+
std::string(kMemberRequest) +"' is required and must "
"have type string";
exception = "Invalid arguments; object member '" +
std::string(kMemberRequest) +
"' is required and must have type string";
return true;
}
@@ -647,9 +634,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
if (arg->HasValue(kMemberOnSuccess)) {
successVal = arg->GetValue(kMemberOnSuccess);
if (!successVal->IsFunction()) {
exception = "Invalid arguments; object member '"+
std::string(kMemberOnSuccess) +"' must have type "
"function";
exception = "Invalid arguments; object member '" +
std::string(kMemberOnSuccess) +
"' must have type function";
return true;
}
}
@@ -658,9 +645,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
if (arg->HasValue(kMemberOnFailure)) {
failureVal = arg->GetValue(kMemberOnFailure);
if (!failureVal->IsFunction()) {
exception = "Invalid arguments; object member '"+
std::string(kMemberOnFailure) +"' must have type "
"function";
exception = "Invalid arguments; object member '" +
std::string(kMemberOnFailure) +
"' must have type function";
return true;
}
}
@@ -669,9 +656,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
if (arg->HasValue(kMemberPersistent)) {
persistentVal = arg->GetValue(kMemberPersistent);
if (!persistentVal->IsBool()) {
exception = "Invalid arguments; object member '"+
std::string(kMemberPersistent) +"' must have type "
"boolean";
exception = "Invalid arguments; object member '" +
std::string(kMemberPersistent) +
"' must have type boolean";
return true;
}
}
@@ -699,8 +686,8 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
if (request_id != kReservedId) {
CefRefPtr<CefV8Context> context = CefV8Context::GetCurrentContext();
const int context_id = GetIDForContext(context);
result = router_->SendCancel(context->GetBrowser(),
context_id, request_id);
result = router_->SendCancel(context->GetBrowser(), context_id,
request_id);
}
retval = CefV8Value::CreateBool(result);
return true;
@@ -724,16 +711,15 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
IMPLEMENT_REFCOUNTING(V8HandlerImpl);
};
explicit CefMessageRouterRendererSideImpl(const CefMessageRouterConfig& config)
explicit CefMessageRouterRendererSideImpl(
const CefMessageRouterConfig& config)
: config_(config),
query_message_name_(
config.js_query_function.ToString() + kMessageSuffix),
cancel_message_name_(
config.js_cancel_function.ToString() + kMessageSuffix) {
}
query_message_name_(config.js_query_function.ToString() +
kMessageSuffix),
cancel_message_name_(config.js_cancel_function.ToString() +
kMessageSuffix) {}
virtual ~CefMessageRouterRendererSideImpl() {
}
virtual ~CefMessageRouterRendererSideImpl() {}
virtual int GetPendingCount(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefV8Context> context) OVERRIDE {
@@ -750,9 +736,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
// Need to iterate over each RequestInfo object to test the context.
class Visitor : public BrowserRequestInfoMap::Visitor {
public:
explicit Visitor(int context_id)
: context_id_(context_id),
count_(0) {}
explicit Visitor(int context_id) : context_id_(context_id), count_(0) {}
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
@@ -774,8 +758,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
if (browser.get()) {
// Count requests associated with the specified browser.
browser_request_info_map_.FindAll(
browser->GetIdentifier(), &visitor);
browser_request_info_map_.FindAll(browser->GetIdentifier(), &visitor);
} else {
// Count all requests for all browsers.
browser_request_info_map_.FindAll(&visitor);
@@ -803,8 +786,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
CefRefPtr<V8HandlerImpl> handler = new V8HandlerImpl(this, config_);
CefV8Value::PropertyAttribute attributes =
static_cast<CefV8Value::PropertyAttribute>(
V8_PROPERTY_ATTRIBUTE_READONLY |
V8_PROPERTY_ATTRIBUTE_DONTENUM |
V8_PROPERTY_ATTRIBUTE_READONLY | V8_PROPERTY_ATTRIBUTE_DONTENUM |
V8_PROPERTY_ATTRIBUTE_DONTDELETE);
// Add the query function.
@@ -849,7 +831,8 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
if (is_success) {
DCHECK_EQ(args->GetSize(), 4U);
const CefString& response = args->GetString(3);
CefPostTask(TID_RENDERER,
CefPostTask(
TID_RENDERER,
base::Bind(
&CefMessageRouterRendererSideImpl::ExecuteSuccessCallback, this,
browser->GetIdentifier(), context_id, request_id, response));
@@ -857,7 +840,8 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
DCHECK_EQ(args->GetSize(), 5U);
int error_code = args->GetInt(3);
const CefString& error_message = args->GetString(4);
CefPostTask(TID_RENDERER,
CefPostTask(
TID_RENDERER,
base::Bind(
&CefMessageRouterRendererSideImpl::ExecuteFailureCallback, this,
browser->GetIdentifier(), context_id, request_id, error_code,
@@ -896,8 +880,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
class Visitor : public BrowserRequestInfoMap::Visitor {
public:
explicit Visitor(bool always_remove)
: always_remove_(always_remove),
removed_(false) {}
: always_remove_(always_remove), removed_(false) {}
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
@@ -915,8 +898,8 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
};
Visitor visitor(always_remove);
RequestInfo* info = browser_request_info_map_.Find(browser_id,
std::make_pair(request_id, context_id), &visitor);
RequestInfo* info = browser_request_info_map_.Find(
browser_id, std::make_pair(request_id, context_id), &visitor);
if (info)
*removed = visitor.removed();
return info;
@@ -940,7 +923,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
info->success_callback = success_callback;
info->failure_callback = failure_callback;
browser_request_info_map_.Add(browser->GetIdentifier(),
std::make_pair(context_id, request_id), info);
std::make_pair(context_id, request_id), info);
CefRefPtr<CefProcessMessage> message =
CefProcessMessage::Create(query_message_name_);
@@ -961,7 +944,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
// If |request_id| is kReservedId all requests associated with |context_id|
// will be canceled, otherwise only the specified |request_id| will be
// canceled. Returns true if any request was canceled.
// canceled. Returns true if any request was canceled.
bool SendCancel(CefRefPtr<CefBrowser> browser,
int context_id,
int request_id) {
@@ -985,8 +968,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
class Visitor : public BrowserRequestInfoMap::Visitor {
public:
explicit Visitor(int context_id)
: context_id_(context_id),
cancel_count_(0) {}
: context_id_(context_id), cancel_count_(0) {}
virtual bool OnNextInfo(int browser_id,
InfoIdType info_id,
@@ -1028,7 +1010,9 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
}
// Execute the onSuccess JavaScript callback.
void ExecuteSuccessCallback(int browser_id, int context_id, int request_id,
void ExecuteSuccessCallback(int browser_id,
int context_id,
int request_id,
const CefString& response) {
CEF_REQUIRE_RENDERER_THREAD();
@@ -1050,8 +1034,11 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
}
// Execute the onFailure JavaScript callback.
void ExecuteFailureCallback(int browser_id, int context_id, int request_id,
int error_code, const CefString& error_message) {
void ExecuteFailureCallback(int browser_id,
int context_id,
int request_id,
int error_code,
const CefString& error_message) {
CEF_REQUIRE_RENDERER_THREAD();
bool removed;
@@ -1128,7 +1115,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
// Map of context ID to CefV8Context for existing contexts. An entry is added
// when a bound function is executed for the first time in the context and
// removed when the context is released.
typedef std::map<int, CefRefPtr<CefV8Context> > ContextMap;
typedef std::map<int, CefRefPtr<CefV8Context>> ContextMap;
ContextMap context_map_;
DISALLOW_COPY_AND_ASSIGN(CefMessageRouterRendererSideImpl);
@@ -1137,9 +1124,7 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
} // namespace
CefMessageRouterConfig::CefMessageRouterConfig()
: js_query_function("cefQuery"),
js_cancel_function("cefQueryCancel") {
}
: js_query_function("cefQuery"), js_cancel_function("cefQueryCancel") {}
// static
CefRefPtr<CefMessageRouterBrowserSide> CefMessageRouterBrowserSide::Create(

138
libcef_dll/wrapper/cef_resource_manager.cc
View File

@@ -20,7 +20,7 @@ namespace {
#else
#define PATH_SEP '/'
#endif
// Returns |url| without the query or fragment components, if any.
std::string GetUrlWithoutQueryOrFragment(const std::string& url) {
// Find the first instance of '?' or '#'.
@@ -49,16 +49,13 @@ std::string GetFilteredUrl(const std::string& url) {
return url;
}
// Provider of fixed contents.
class ContentProvider : public CefResourceManager::Provider {
public:
ContentProvider(const std::string& url,
const std::string& content,
const std::string& mime_type)
: url_(url),
content_(content),
mime_type_(mime_type) {
: url_(url), content_(content), mime_type_(mime_type) {
DCHECK(!url.empty());
DCHECK(!content.empty());
}
@@ -72,10 +69,9 @@ class ContentProvider : public CefResourceManager::Provider {
return false;
}
CefRefPtr<CefStreamReader> stream =
CefStreamReader::CreateForData(
static_cast<void*>(const_cast<char*>(content_.data())),
content_.length());
CefRefPtr<CefStreamReader> stream = CefStreamReader::CreateForData(
static_cast<void*>(const_cast<char*>(content_.data())),
content_.length());
// Determine the mime type a single time if it isn't already set.
if (mime_type_.empty())
@@ -93,14 +89,12 @@ class ContentProvider : public CefResourceManager::Provider {
DISALLOW_COPY_AND_ASSIGN(ContentProvider);
};
// Provider of contents loaded from a directory on the file system.
class DirectoryProvider : public CefResourceManager::Provider {
public:
DirectoryProvider(const std::string& url_path,
const std::string& directory_path)
: url_path_(url_path),
directory_path_(directory_path) {
: url_path_(url_path), directory_path_(directory_path) {
DCHECK(!url_path_.empty());
DCHECK(!directory_path_.empty());
@@ -122,8 +116,8 @@ class DirectoryProvider : public CefResourceManager::Provider {
const std::string& file_path = GetFilePath(url);
// Open |file_path| on the FILE thread.
CefPostTask(TID_FILE,
base::Bind(&DirectoryProvider::OpenOnFileThread, file_path, request));
CefPostTask(TID_FILE, base::Bind(&DirectoryProvider::OpenOnFileThread,
file_path, request));
return true;
}
@@ -146,9 +140,8 @@ class DirectoryProvider : public CefResourceManager::Provider {
CefStreamReader::CreateForFile(file_path);
// Continue loading on the IO thread.
CefPostTask(TID_IO,
base::Bind(&DirectoryProvider::ContinueOpenOnIOThread, request,
stream));
CefPostTask(TID_IO, base::Bind(&DirectoryProvider::ContinueOpenOnIOThread,
request, stream));
}
static void ContinueOpenOnIOThread(
@@ -159,8 +152,7 @@ class DirectoryProvider : public CefResourceManager::Provider {
CefRefPtr<CefStreamResourceHandler> handler;
if (stream.get()) {
handler = new CefStreamResourceHandler(
request->mime_type_resolver().Run(request->url()),
stream);
request->mime_type_resolver().Run(request->url()), stream);
}
request->Continue(handler);
}
@@ -171,19 +163,18 @@ class DirectoryProvider : public CefResourceManager::Provider {
DISALLOW_COPY_AND_ASSIGN(DirectoryProvider);
};
// Provider of contents loaded from an archive file.
class ArchiveProvider : public CefResourceManager::Provider {
public:
ArchiveProvider(const std::string& url_path,
const std::string& archive_path,
const std::string& password)
: url_path_(url_path),
archive_path_(archive_path),
password_(password),
archive_load_started_(false),
archive_load_ended_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
: url_path_(url_path),
archive_path_(archive_path),
password_(password),
archive_load_started_(false),
archive_load_ended_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
DCHECK(!url_path_.empty());
DCHECK(!archive_path_.empty());
@@ -207,9 +198,9 @@ class ArchiveProvider : public CefResourceManager::Provider {
pending_requests_.push_back(request);
// Load the archive file on the FILE thread.
CefPostTask(TID_FILE,
base::Bind(&ArchiveProvider::LoadOnFileThread,
weak_ptr_factory_.GetWeakPtr(), archive_path_, password_));
CefPostTask(TID_FILE, base::Bind(&ArchiveProvider::LoadOnFileThread,
weak_ptr_factory_.GetWeakPtr(),
archive_path_, password_));
return true;
}
@@ -244,7 +235,7 @@ class ArchiveProvider : public CefResourceManager::Provider {
}
CefPostTask(TID_IO,
base::Bind(&ArchiveProvider::ContinueOnIOThread, ptr, archive));
base::Bind(&ArchiveProvider::ContinueOnIOThread, ptr, archive));
}
void ContinueOnIOThread(CefRefPtr<CefZipArchive> archive) {
@@ -272,8 +263,7 @@ class ArchiveProvider : public CefResourceManager::Provider {
CefRefPtr<CefZipArchive::File> file = archive_->GetFile(relative_path);
if (file.get()) {
handler = new CefStreamResourceHandler(
request->mime_type_resolver().Run(url),
file->GetStreamReader());
request->mime_type_resolver().Run(url), file->GetStreamReader());
}
}
@@ -293,7 +283,7 @@ class ArchiveProvider : public CefResourceManager::Provider {
CefRefPtr<CefZipArchive> archive_;
// List of requests that are pending while the archive is being loaded.
typedef std::vector<scoped_refptr<CefResourceManager::Request> >
typedef std::vector<scoped_refptr<CefResourceManager::Request>>
PendingRequests;
PendingRequests pending_requests_;
@@ -305,18 +295,14 @@ class ArchiveProvider : public CefResourceManager::Provider {
} // namespace
// CefResourceManager::ProviderEntry implementation.
struct CefResourceManager::ProviderEntry {
ProviderEntry(Provider* provider,
int order,
const std::string& identifier)
: provider_(provider),
order_(order),
identifier_(identifier),
deletion_pending_(false) {
}
ProviderEntry(Provider* provider, int order, const std::string& identifier)
: provider_(provider),
order_(order),
identifier_(identifier),
deletion_pending_(false) {}
scoped_ptr<Provider> provider_;
int order_;
@@ -329,7 +315,6 @@ struct CefResourceManager::ProviderEntry {
bool deletion_pending_;
};
// CefResourceManager::RequestState implementation.
CefResourceManager::RequestState::~RequestState() {
@@ -338,14 +323,13 @@ CefResourceManager::RequestState::~RequestState() {
callback_->Continue(true);
}
// CefResourceManager::Request implementation.
void CefResourceManager::Request::Continue(
CefRefPtr<CefResourceHandler> handler) {
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::Request::Continue, this, handler));
CefPostTask(TID_IO, base::Bind(&CefResourceManager::Request::Continue, this,
handler));
return;
}
@@ -356,14 +340,13 @@ void CefResourceManager::Request::Continue(
// not called unexpectedly if Provider::OnRequest calls this method and then
// calls CefResourceManager::Remove*.
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::Request::ContinueOnIOThread,
base::Passed(&state_), handler));
base::Bind(&CefResourceManager::Request::ContinueOnIOThread,
base::Passed(&state_), handler));
}
void CefResourceManager::Request::Stop() {
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::Request::Stop, this));
CefPostTask(TID_IO, base::Bind(&CefResourceManager::Request::Stop, this));
return;
}
@@ -373,14 +356,12 @@ void CefResourceManager::Request::Stop() {
// Disassociate |state_| immediately so that Provider::OnRequestCanceled is
// not called unexpectedly if Provider::OnRequest calls this method and then
// calls CefResourceManager::Remove*.
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::Request::StopOnIOThread,
base::Passed(&state_)));
CefPostTask(TID_IO, base::Bind(&CefResourceManager::Request::StopOnIOThread,
base::Passed(&state_)));
}
CefResourceManager::Request::Request(scoped_ptr<RequestState> state)
: state_(state.Pass()),
params_(state_->params_) {
: state_(state.Pass()), params_(state_->params_) {
CEF_REQUIRE_IO_THREAD();
ProviderEntry* entry = *(state_->current_entry_pos_);
@@ -397,7 +378,7 @@ CefResourceManager::Request::Request(scoped_ptr<RequestState> state)
// executes a callback before returning, in which case execution will continue
// asynchronously in any case.
scoped_ptr<CefResourceManager::RequestState>
CefResourceManager::Request::SendRequest() {
CefResourceManager::Request::SendRequest() {
CEF_REQUIRE_IO_THREAD();
Provider* provider = (*state_->current_entry_pos_)->provider_.get();
if (!provider->OnRequest(this))
@@ -431,13 +412,11 @@ void CefResourceManager::Request::StopOnIOThread(
manager->StopRequest(state.Pass());
}
// CefResourceManager implementation.
CefResourceManager::CefResourceManager()
: url_filter_(base::Bind(GetFilteredUrl)),
mime_type_resolver_(base::Bind(GetMimeType)) {
}
mime_type_resolver_(base::Bind(GetMimeType)) {}
CefResourceManager::~CefResourceManager() {
CEF_REQUIRE_IO_THREAD();
@@ -461,22 +440,21 @@ void CefResourceManager::AddContentProvider(const std::string& url,
AddProvider(new ContentProvider(url, content, mime_type), order, identifier);
}
void CefResourceManager::AddDirectoryProvider(
const std::string& url_path,
const std::string& directory_path,
int order,
const std::string& identifier) {
AddProvider(new DirectoryProvider(url_path, directory_path),
order, identifier);
void CefResourceManager::AddDirectoryProvider(const std::string& url_path,
const std::string& directory_path,
int order,
const std::string& identifier) {
AddProvider(new DirectoryProvider(url_path, directory_path), order,
identifier);
}
void CefResourceManager::AddArchiveProvider(const std::string& url_path,
const std::string& archive_path,
const std::string& password,
int order,
const std::string& identifier) {
AddProvider(new ArchiveProvider(url_path, archive_path, password),
order, identifier);
AddProvider(new ArchiveProvider(url_path, archive_path, password), order,
identifier);
}
void CefResourceManager::AddProvider(Provider* provider,
@@ -487,9 +465,8 @@ void CefResourceManager::AddProvider(Provider* provider,
return;
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::AddProvider, this, provider, order,
identifier));
CefPostTask(TID_IO, base::Bind(&CefResourceManager::AddProvider, this,
provider, order, identifier));
return;
}
@@ -513,8 +490,8 @@ void CefResourceManager::AddProvider(Provider* provider,
void CefResourceManager::RemoveProviders(const std::string& identifier) {
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::RemoveProviders, this, identifier));
CefPostTask(TID_IO, base::Bind(&CefResourceManager::RemoveProviders, this,
identifier));
return;
}
@@ -533,7 +510,7 @@ void CefResourceManager::RemoveProviders(const std::string& identifier) {
void CefResourceManager::RemoveAllProviders() {
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::RemoveAllProviders, this));
base::Bind(&CefResourceManager::RemoveAllProviders, this));
return;
}
@@ -547,8 +524,8 @@ void CefResourceManager::RemoveAllProviders() {
void CefResourceManager::SetMimeTypeResolver(const MimeTypeResolver& resolver) {
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::SetMimeTypeResolver, this, resolver));
CefPostTask(TID_IO, base::Bind(&CefResourceManager::SetMimeTypeResolver,
this, resolver));
return;
}
@@ -561,7 +538,7 @@ void CefResourceManager::SetMimeTypeResolver(const MimeTypeResolver& resolver) {
void CefResourceManager::SetUrlFilter(const UrlFilter& filter) {
if (!CefCurrentlyOn(TID_IO)) {
CefPostTask(TID_IO,
base::Bind(&CefResourceManager::SetUrlFilter, this, filter));
base::Bind(&CefResourceManager::SetUrlFilter, this, filter));
return;
}
@@ -581,7 +558,7 @@ cef_return_value_t CefResourceManager::OnBeforeResourceLoad(
// Find the first provider that is not pending deletion.
ProviderEntryList::iterator current_entry_pos = providers_.begin();
GetNextValidProvider(current_entry_pos);
if (current_entry_pos == providers_.end()) {
// No providers so continue the request immediately.
return RV_CONTINUE;
@@ -712,8 +689,7 @@ bool CefResourceManager::IncrementProvider(RequestState* state) {
void CefResourceManager::DetachRequestFromProvider(RequestState* state) {
if (state->current_entry_pos_ != providers_.end()) {
// Remove the association from the current provider entry.
ProviderEntryList::iterator current_entry_pos =
state->current_entry_pos_;
ProviderEntryList::iterator current_entry_pos = state->current_entry_pos_;
ProviderEntry* current_entry = *(current_entry_pos);
current_entry->pending_requests_.erase(state->current_request_pos_);

3
libcef_dll/wrapper/cef_scoped_temp_dir.cc
View File

@@ -7,8 +7,7 @@
#include "include/base/cef_logging.h"
#include "include/cef_file_util.h"
CefScopedTempDir::CefScopedTempDir() {
}
CefScopedTempDir::CefScopedTempDir() {}
CefScopedTempDir::~CefScopedTempDir() {
if (!path_.empty() && !Delete())

39
libcef_dll/wrapper/cef_stream_resource_handler.cc
View File

@@ -18,12 +18,7 @@
// Class that represents a readable/writable character buffer.
class CefStreamResourceHandler::Buffer {
public:
Buffer()
: size_(0),
bytes_requested_(0),
bytes_written_(0),
bytes_read_(0) {
}
Buffer() : size_(0), bytes_requested_(0), bytes_written_(0), bytes_read_(0) {}
void Reset(int new_size) {
if (size_ < new_size) {
@@ -36,19 +31,15 @@ class CefStreamResourceHandler::Buffer {
bytes_read_ = 0;
}
bool IsEmpty() const {
return (bytes_written_ == 0);
}
bool IsEmpty() const { return (bytes_written_ == 0); }
bool CanRead() const {
return (bytes_read_ < bytes_written_);
}
bool CanRead() const { return (bytes_read_ < bytes_written_); }
int WriteTo(void* data_out, int bytes_to_read) {
const int write_size =
std::min(bytes_to_read, bytes_written_ - bytes_read_);
if (write_size > 0) {
memcpy(data_out, buffer_ .get() + bytes_read_, write_size);
memcpy(data_out, buffer_.get() + bytes_read_, write_size);
bytes_read_ += write_size;
}
return write_size;
@@ -59,9 +50,9 @@ class CefStreamResourceHandler::Buffer {
// more data.
int bytes_read;
do {
bytes_read = static_cast<int>(
reader->Read(buffer_.get() + bytes_written_, 1,
bytes_requested_ - bytes_written_));
bytes_read =
static_cast<int>(reader->Read(buffer_.get() + bytes_written_, 1,
bytes_requested_ - bytes_written_));
bytes_written_ += bytes_read;
} while (bytes_read != 0 && bytes_written_ < bytes_requested_);
@@ -86,7 +77,8 @@ CefStreamResourceHandler::CefStreamResourceHandler(
mime_type_(mime_type),
stream_(stream)
#if DCHECK_IS_ON()
, buffer_owned_by_file_thread_(false)
,
buffer_owned_by_file_thread_(false)
#endif
{
DCHECK(!mime_type_.empty());
@@ -106,7 +98,8 @@ CefStreamResourceHandler::CefStreamResourceHandler(
header_map_(header_map),
stream_(stream)
#if DCHECK_IS_ON()
, buffer_owned_by_file_thread_(false)
,
buffer_owned_by_file_thread_(false)
#endif
{
DCHECK(!mime_type_.empty());
@@ -114,8 +107,7 @@ CefStreamResourceHandler::CefStreamResourceHandler(
read_on_file_thread_ = stream_->MayBlock();
}
CefStreamResourceHandler::~CefStreamResourceHandler() {
}
CefStreamResourceHandler::~CefStreamResourceHandler() {}
bool CefStreamResourceHandler::ProcessRequest(CefRefPtr<CefRequest> request,
CefRefPtr<CefCallback> callback) {
@@ -164,8 +156,8 @@ bool CefStreamResourceHandler::ReadResponse(void* data_out,
buffer_owned_by_file_thread_ = true;
#endif
CefPostTask(TID_FILE,
base::Bind(&CefStreamResourceHandler::ReadOnFileThread, this,
bytes_to_read, callback));
base::Bind(&CefStreamResourceHandler::ReadOnFileThread, this,
bytes_to_read, callback));
return true;
}
} else {
@@ -184,8 +176,7 @@ bool CefStreamResourceHandler::ReadResponse(void* data_out,
}
}
void CefStreamResourceHandler::Cancel() {
}
void CefStreamResourceHandler::Cancel() {}
void CefStreamResourceHandler::ReadOnFileThread(
int bytes_to_read,

28
libcef_dll/wrapper/cef_xml_object.cc
View File

@@ -15,8 +15,7 @@ namespace {
class CefXmlObjectLoader {
public:
explicit CefXmlObjectLoader(CefRefPtr<CefXmlObject> root_object)
: root_object_(root_object) {
}
: root_object_(root_object) {}
bool Load(CefRefPtr<CefStreamReader> stream,
CefXmlReader::EncodingType encodingType,
@@ -59,8 +58,8 @@ class CefXmlObjectLoader {
} else {
// Value following a child element is not allowed.
std::stringstream ss;
ss << "Value following child element, line " <<
reader->GetLineNumber();
ss << "Value following child element, line "
<< reader->GetLineNumber();
load_error_ = ss.str();
ret = false;
break;
@@ -82,7 +81,7 @@ class CefXmlObjectLoader {
// Read all object attributes.
do {
new_object->SetAttributeValue(reader->GetQualifiedName(),
reader->GetValue());
reader->GetValue());
} while (reader->MoveToNextAttribute());
reader->MoveToCarryingElement();
}
@@ -107,9 +106,9 @@ class CefXmlObjectLoader {
// never occur (the parser catches this error).
NOTREACHED();
std::stringstream ss;
ss << "Mismatched end tag for " <<
std::string(cur_object->GetName()) <<
", line " << reader->GetLineNumber();
ss << "Mismatched end tag for "
<< std::string(cur_object->GetName()) << ", line "
<< reader->GetLineNumber();
load_error_ = ss.str();
ret = false;
break;
@@ -129,8 +128,8 @@ class CefXmlObjectLoader {
} else {
// Value following a child element is not allowed.
std::stringstream ss;
ss << "Value following child element, line " <<
reader->GetLineNumber();
ss << "Value following child element, line "
<< reader->GetLineNumber();
load_error_ = ss.str();
ret = false;
break;
@@ -159,15 +158,14 @@ class CefXmlObjectLoader {
} // namespace
CefXmlObject::CefXmlObject(const CefString& name)
: name_(name), parent_(NULL) {
}
: name_(name), parent_(NULL) {}
CefXmlObject::~CefXmlObject() {
}
CefXmlObject::~CefXmlObject() {}
bool CefXmlObject::Load(CefRefPtr<CefStreamReader> stream,
CefXmlReader::EncodingType encodingType,
const CefString& URI, CefString* loadError) {
const CefString& URI,
CefString* loadError) {
Clear();
CefXmlObjectLoader loader(this);

13
libcef_dll/wrapper/cef_zip_archive.cc
View File

@@ -47,9 +47,8 @@ class CefZipFile : public CefZipArchive::File {
virtual size_t GetDataSize() const OVERRIDE { return data_size_; }
virtual CefRefPtr<CefStreamReader> GetStreamReader() const OVERRIDE {
CefRefPtr<CefReadHandler> handler(
new CefByteReadHandler(data_.get(), data_size_,
const_cast<CefZipFile*>(this)));
CefRefPtr<CefReadHandler> handler(new CefByteReadHandler(
data_.get(), data_size_, const_cast<CefZipFile*>(this)));
return CefStreamReader::CreateForHandler(handler);
}
@@ -67,11 +66,9 @@ class CefZipFile : public CefZipArchive::File {
// CefZipArchive implementation
CefZipArchive::CefZipArchive() {
}
CefZipArchive::CefZipArchive() {}
CefZipArchive::~CefZipArchive() {
}
CefZipArchive::~CefZipArchive() {}
size_t CefZipArchive::Load(CefRefPtr<CefStreamReader> stream,
const CefString& password,
@@ -116,7 +113,7 @@ size_t CefZipArchive::Load(CefRefPtr<CefStreamReader> stream,
// Read the file contents.
do {
offset += reader->ReadFile(data + offset, size - offset);
offset += reader->ReadFile(data + offset, size - offset);
} while (offset < size && !reader->Eof());
DCHECK(offset == size);

445
libcef_dll/wrapper/libcef_dll_wrapper.cc
View File

@@ -9,48 +9,48 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=62ad3894d1548a39b032798d25a7a9b157f8a7bc$
//
#include "include/cef_app.h"
#include "include/capi/cef_app_capi.h"
#include "include/cef_crash_util.h"
#include "include/capi/cef_crash_util_capi.h"
#include "include/cef_file_util.h"
#include "include/capi/cef_file_util_capi.h"
#include "include/cef_geolocation.h"
#include "include/capi/cef_geolocation_capi.h"
#include "include/cef_origin_whitelist.h"
#include "include/capi/cef_origin_whitelist_capi.h"
#include "include/cef_parser.h"
#include "include/capi/cef_parser_capi.h"
#include "include/cef_path_util.h"
#include "include/capi/cef_path_util_capi.h"
#include "include/cef_process_util.h"
#include "include/capi/cef_process_util_capi.h"
#include "include/cef_scheme.h"
#include "include/capi/cef_scheme_capi.h"
#include "include/cef_ssl_info.h"
#include "include/capi/cef_ssl_info_capi.h"
#include "include/cef_task.h"
#include "include/capi/cef_task_capi.h"
#include "include/cef_trace.h"
#include "include/capi/cef_trace_capi.h"
#include "include/cef_v8.h"
#include "include/capi/cef_v8_capi.h"
#include "include/cef_web_plugin.h"
#include "include/capi/cef_web_plugin_capi.h"
#include "include/cef_app.h"
#include "include/cef_crash_util.h"
#include "include/cef_file_util.h"
#include "include/cef_geolocation.h"
#include "include/cef_origin_whitelist.h"
#include "include/cef_parser.h"
#include "include/cef_path_util.h"
#include "include/cef_process_util.h"
#include "include/cef_scheme.h"
#include "include/cef_ssl_info.h"
#include "include/cef_task.h"
#include "include/cef_trace.h"
#include "include/cef_v8.h"
#include "include/cef_version.h"
#include "include/cef_web_plugin.h"
#include "libcef_dll/cpptoc/accessibility_handler_cpptoc.h"
#include "libcef_dll/cpptoc/app_cpptoc.h"
#include "libcef_dll/cpptoc/browser_process_handler_cpptoc.h"
#include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/completion_callback_cpptoc.h"
#include "libcef_dll/cpptoc/context_menu_handler_cpptoc.h"
#include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h"
#include "libcef_dll/cpptoc/domvisitor_cpptoc.h"
#include "libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h"
#include "libcef_dll/cpptoc/dialog_handler_cpptoc.h"
#include "libcef_dll/cpptoc/display_handler_cpptoc.h"
#include "libcef_dll/cpptoc/domvisitor_cpptoc.h"
#include "libcef_dll/cpptoc/download_handler_cpptoc.h"
#include "libcef_dll/cpptoc/download_image_callback_cpptoc.h"
#include "libcef_dll/cpptoc/drag_handler_cpptoc.h"
@@ -63,10 +63,8 @@
#include "libcef_dll/cpptoc/keyboard_handler_cpptoc.h"
#include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
#include "libcef_dll/cpptoc/load_handler_cpptoc.h"
#include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/menu_model_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h"
#include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/pdf_print_callback_cpptoc.h"
#include "libcef_dll/cpptoc/print_handler_cpptoc.h"
#include "libcef_dll/cpptoc/read_handler_cpptoc.h"
@@ -83,74 +81,67 @@
#include "libcef_dll/cpptoc/set_cookie_callback_cpptoc.h"
#include "libcef_dll/cpptoc/string_visitor_cpptoc.h"
#include "libcef_dll/cpptoc/task_cpptoc.h"
#include "libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h"
#include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h"
#include "libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h"
#include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h"
#include "libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h"
#include "libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h"
#include "libcef_dll/cpptoc/urlrequest_client_cpptoc.h"
#include "libcef_dll/cpptoc/v8accessor_cpptoc.h"
#include "libcef_dll/cpptoc/v8handler_cpptoc.h"
#include "libcef_dll/cpptoc/v8interceptor_cpptoc.h"
#include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h"
#include "libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h"
#include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h"
#include "libcef_dll/cpptoc/write_handler_cpptoc.h"
#include "libcef_dll/ctocpp/auth_callback_ctocpp.h"
#include "libcef_dll/ctocpp/before_download_callback_ctocpp.h"
#include "libcef_dll/ctocpp/binary_value_ctocpp.h"
#include "libcef_dll/ctocpp/views/box_layout_ctocpp.h"
#include "libcef_dll/ctocpp/browser_ctocpp.h"
#include "libcef_dll/ctocpp/browser_host_ctocpp.h"
#include "libcef_dll/ctocpp/views/browser_view_ctocpp.h"
#include "libcef_dll/ctocpp/views/button_ctocpp.h"
#include "libcef_dll/ctocpp/callback_ctocpp.h"
#include "libcef_dll/ctocpp/command_line_ctocpp.h"
#include "libcef_dll/ctocpp/context_menu_params_ctocpp.h"
#include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
#include "libcef_dll/ctocpp/domdocument_ctocpp.h"
#include "libcef_dll/ctocpp/domnode_ctocpp.h"
#include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
#include "libcef_dll/ctocpp/views/display_ctocpp.h"
#include "libcef_dll/ctocpp/download_item_ctocpp.h"
#include "libcef_dll/ctocpp/download_item_callback_ctocpp.h"
#include "libcef_dll/ctocpp/download_item_ctocpp.h"
#include "libcef_dll/ctocpp/drag_data_ctocpp.h"
#include "libcef_dll/ctocpp/file_dialog_callback_ctocpp.h"
#include "libcef_dll/ctocpp/views/fill_layout_ctocpp.h"
#include "libcef_dll/ctocpp/frame_ctocpp.h"
#include "libcef_dll/ctocpp/geolocation_callback_ctocpp.h"
#include "libcef_dll/ctocpp/image_ctocpp.h"
#include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h"
#include "libcef_dll/ctocpp/views/label_button_ctocpp.h"
#include "libcef_dll/ctocpp/views/layout_ctocpp.h"
#include "libcef_dll/ctocpp/list_value_ctocpp.h"
#include "libcef_dll/ctocpp/views/menu_button_ctocpp.h"
#include "libcef_dll/ctocpp/menu_model_ctocpp.h"
#include "libcef_dll/ctocpp/navigation_entry_ctocpp.h"
#include "libcef_dll/ctocpp/views/panel_ctocpp.h"
#include "libcef_dll/ctocpp/print_dialog_callback_ctocpp.h"
#include "libcef_dll/ctocpp/print_job_callback_ctocpp.h"
#include "libcef_dll/ctocpp/print_settings_ctocpp.h"
#include "libcef_dll/ctocpp/process_message_ctocpp.h"
#include "libcef_dll/ctocpp/request_callback_ctocpp.h"
#include "libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h"
#include "libcef_dll/ctocpp/scheme_registrar_ctocpp.h"
#include "libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h"
#include "libcef_dll/ctocpp/sslinfo_ctocpp.h"
#include "libcef_dll/ctocpp/sslstatus_ctocpp.h"
#include "libcef_dll/ctocpp/scheme_registrar_ctocpp.h"
#include "libcef_dll/ctocpp/views/scroll_view_ctocpp.h"
#include "libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h"
#include "libcef_dll/ctocpp/stream_reader_ctocpp.h"
#include "libcef_dll/ctocpp/stream_writer_ctocpp.h"
#include "libcef_dll/ctocpp/task_runner_ctocpp.h"
#include "libcef_dll/ctocpp/views/textfield_ctocpp.h"
#include "libcef_dll/ctocpp/thread_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"
#include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h"
#include "libcef_dll/ctocpp/thread_ctocpp.h"
#include "libcef_dll/ctocpp/urlrequest_ctocpp.h"
#include "libcef_dll/ctocpp/v8context_ctocpp.h"
#include "libcef_dll/ctocpp/v8exception_ctocpp.h"
@@ -158,10 +149,21 @@
#include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h"
#include "libcef_dll/ctocpp/v8value_ctocpp.h"
#include "libcef_dll/ctocpp/value_ctocpp.h"
#include "libcef_dll/ctocpp/views/box_layout_ctocpp.h"
#include "libcef_dll/ctocpp/views/browser_view_ctocpp.h"
#include "libcef_dll/ctocpp/views/button_ctocpp.h"
#include "libcef_dll/ctocpp/views/display_ctocpp.h"
#include "libcef_dll/ctocpp/views/fill_layout_ctocpp.h"
#include "libcef_dll/ctocpp/views/label_button_ctocpp.h"
#include "libcef_dll/ctocpp/views/layout_ctocpp.h"
#include "libcef_dll/ctocpp/views/menu_button_ctocpp.h"
#include "libcef_dll/ctocpp/views/panel_ctocpp.h"
#include "libcef_dll/ctocpp/views/scroll_view_ctocpp.h"
#include "libcef_dll/ctocpp/views/textfield_ctocpp.h"
#include "libcef_dll/ctocpp/views/view_ctocpp.h"
#include "libcef_dll/ctocpp/views/window_ctocpp.h"
#include "libcef_dll/ctocpp/waitable_event_ctocpp.h"
#include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h"
#include "libcef_dll/ctocpp/views/window_ctocpp.h"
#include "libcef_dll/ctocpp/x509cert_principal_ctocpp.h"
#include "libcef_dll/ctocpp/x509certificate_ctocpp.h"
#include "libcef_dll/ctocpp/xml_reader_ctocpp.h"
@@ -171,11 +173,11 @@
// Define used to facilitate parsing.
#define CEF_GLOBAL
// GLOBAL METHODS - Body may be edited by hand.
CEF_GLOBAL int CefExecuteProcess(const CefMainArgs& args,
CefRefPtr<CefApp> application, void* windows_sandbox_info) {
CefRefPtr<CefApp> application,
void* windows_sandbox_info) {
const char* api_hash = cef_api_hash(0);
if (strcmp(api_hash, CEF_API_HASH_PLATFORM)) {
// The libcef API hash does not match the current header API hash.
@@ -188,18 +190,17 @@ CEF_GLOBAL int CefExecuteProcess(const CefMainArgs& args,
// Unverified params: application, windows_sandbox_info
// Execute
int _retval = cef_execute_process(
&args,
CefAppCppToC::Wrap(application),
windows_sandbox_info);
int _retval = cef_execute_process(&args, CefAppCppToC::Wrap(application),
windows_sandbox_info);
// Return type: simple
return _retval;
}
CEF_GLOBAL bool CefInitialize(const CefMainArgs& args,
const CefSettings& settings, CefRefPtr<CefApp> application,
void* windows_sandbox_info) {
const CefSettings& settings,
CefRefPtr<CefApp> application,
void* windows_sandbox_info) {
const char* api_hash = cef_api_hash(0);
if (strcmp(api_hash, CEF_API_HASH_PLATFORM)) {
// The libcef API hash does not match the current header API hash.
@@ -213,13 +214,10 @@ CEF_GLOBAL bool CefInitialize(const CefMainArgs& args,
// Execute
int _retval = cef_initialize(
&args,
&settings,
CefAppCppToC::Wrap(application),
windows_sandbox_info);
&args, &settings, CefAppCppToC::Wrap(application), windows_sandbox_info);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL void CefShutdown() {
@@ -230,17 +228,17 @@ CEF_GLOBAL void CefShutdown() {
#if DCHECK_IS_ON()
// Check that all wrapper objects have been destroyed
DCHECK(base::AtomicRefCountIsZero(
&CefAccessibilityHandlerCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefAccessibilityHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefAuthCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefBeforeDownloadCallbackCToCpp::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefBeforeDownloadCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefBinaryValueCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefBoxLayoutCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefBrowserCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefBrowserHostCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefBrowserProcessHandlerCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefBrowserProcessHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefBrowserViewCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefBrowserViewDelegateCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefButtonCToCpp::DebugObjCt));
@@ -253,18 +251,18 @@ CEF_GLOBAL void CefShutdown() {
DCHECK(base::AtomicRefCountIsZero(&CefDOMDocumentCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDOMNodeCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDOMVisitorCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefDeleteCookiesCallbackCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefDeleteCookiesCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDialogHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDictionaryValueCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDisplayCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDisplayHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDownloadHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefDownloadImageCallbackCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefDownloadImageCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDownloadItemCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefDownloadItemCallbackCToCpp::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefDownloadItemCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDragDataCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefDragHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefEndTracingCallbackCppToC::DebugObjCt));
@@ -275,8 +273,8 @@ CEF_GLOBAL void CefShutdown() {
DCHECK(base::AtomicRefCountIsZero(&CefFrameCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefGeolocationCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefGeolocationHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefGetGeolocationCallbackCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefGetGeolocationCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefImageCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefJSDialogCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefJSDialogHandlerCppToC::DebugObjCt));
@@ -291,8 +289,8 @@ CEF_GLOBAL void CefShutdown() {
DCHECK(base::AtomicRefCountIsZero(&CefMenuModelCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefMenuModelDelegateCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefNavigationEntryCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefNavigationEntryVisitorCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefNavigationEntryVisitorCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefPanelCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefPanelDelegateCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefPdfPrintCallbackCppToC::DebugObjCt));
@@ -304,23 +302,23 @@ CEF_GLOBAL void CefShutdown() {
DCHECK(base::AtomicRefCountIsZero(&CefReadHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefRegisterCdmCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefRenderHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefRenderProcessHandlerCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefRenderProcessHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefRequestCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefRequestHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefResolveCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefResourceBundleHandlerCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefResourceBundleHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefResourceHandlerCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefResponseFilterCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefRunContextMenuCallbackCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefRunFileDialogCallbackCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefRunContextMenuCallbackCToCpp::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefRunFileDialogCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefSSLInfoCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefSSLStatusCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefSchemeHandlerFactoryCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefSchemeHandlerFactoryCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefSchemeRegistrarCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefScrollViewCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
@@ -370,8 +368,8 @@ CEF_GLOBAL void CefShutdown() {
DCHECK(base::AtomicRefCountIsZero(&CefViewDelegateCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefWaitableEventCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefWebPluginInfoCToCpp::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefWebPluginInfoVisitorCppToC::DebugObjCt));
DCHECK(
base::AtomicRefCountIsZero(&CefWebPluginInfoVisitorCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(
&CefWebPluginUnstableCallbackCppToC::DebugObjCt));
DCHECK(base::AtomicRefCountIsZero(&CefWindowCToCpp::DebugObjCt));
@@ -409,8 +407,7 @@ CEF_GLOBAL void CefSetOSModalLoop(bool osModalLoop) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_set_osmodal_loop(
osModalLoop);
cef_set_osmodal_loop(osModalLoop);
}
CEF_GLOBAL void CefEnableHighDPISupport() {
@@ -427,11 +424,11 @@ CEF_GLOBAL bool CefCrashReportingEnabled() {
int _retval = cef_crash_reporting_enabled();
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL void CefSetCrashKeyValue(const CefString& key,
const CefString& value) {
const CefString& value) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: key; type: string_byref_const
@@ -441,9 +438,7 @@ CEF_GLOBAL void CefSetCrashKeyValue(const CefString& key,
// Unverified params: value
// Execute
cef_set_crash_key_value(
key.GetStruct(),
value.GetStruct());
cef_set_crash_key_value(key.GetStruct(), value.GetStruct());
}
CEF_GLOBAL bool CefCreateDirectory(const CefString& full_path) {
@@ -455,41 +450,39 @@ CEF_GLOBAL bool CefCreateDirectory(const CefString& full_path) {
return false;
// Execute
int _retval = cef_create_directory(
full_path.GetStruct());
int _retval = cef_create_directory(full_path.GetStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefGetTempDirectory(CefString& temp_dir) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = cef_get_temp_directory(
temp_dir.GetWritableStruct());
int _retval = cef_get_temp_directory(temp_dir.GetWritableStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefCreateNewTempDirectory(const CefString& prefix,
CefString& new_temp_path) {
CefString& new_temp_path) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Unverified params: prefix
// Execute
int _retval = cef_create_new_temp_directory(
prefix.GetStruct(),
new_temp_path.GetWritableStruct());
prefix.GetStruct(), new_temp_path.GetWritableStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefCreateTempDirectoryInDirectory(const CefString& base_dir,
const CefString& prefix, CefString& new_dir) {
const CefString& prefix,
CefString& new_dir) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: base_dir; type: string_byref_const
@@ -500,12 +493,10 @@ CEF_GLOBAL bool CefCreateTempDirectoryInDirectory(const CefString& base_dir,
// Execute
int _retval = cef_create_temp_directory_in_directory(
base_dir.GetStruct(),
prefix.GetStruct(),
new_dir.GetWritableStruct());
base_dir.GetStruct(), prefix.GetStruct(), new_dir.GetWritableStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefDirectoryExists(const CefString& path) {
@@ -517,11 +508,10 @@ CEF_GLOBAL bool CefDirectoryExists(const CefString& path) {
return false;
// Execute
int _retval = cef_directory_exists(
path.GetStruct());
int _retval = cef_directory_exists(path.GetStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefDeleteFile(const CefString& path, bool recursive) {
@@ -533,16 +523,15 @@ CEF_GLOBAL bool CefDeleteFile(const CefString& path, bool recursive) {
return false;
// Execute
int _retval = cef_delete_file(
path.GetStruct(),
recursive);
int _retval = cef_delete_file(path.GetStruct(), recursive);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefZipDirectory(const CefString& src_dir,
const CefString& dest_file, bool include_hidden_files) {
const CefString& dest_file,
bool include_hidden_files) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: src_dir; type: string_byref_const
@@ -555,13 +544,11 @@ CEF_GLOBAL bool CefZipDirectory(const CefString& src_dir,
return false;
// Execute
int _retval = cef_zip_directory(
src_dir.GetStruct(),
dest_file.GetStruct(),
include_hidden_files);
int _retval = cef_zip_directory(src_dir.GetStruct(), dest_file.GetStruct(),
include_hidden_files);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefGetGeolocation(
@@ -574,15 +561,17 @@ CEF_GLOBAL bool CefGetGeolocation(
return false;
// Execute
int _retval = cef_get_geolocation(
CefGetGeolocationCallbackCppToC::Wrap(callback));
int _retval =
cef_get_geolocation(CefGetGeolocationCallbackCppToC::Wrap(callback));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin,
const CefString& target_protocol, const CefString& target_domain,
CEF_GLOBAL bool CefAddCrossOriginWhitelistEntry(
const CefString& source_origin,
const CefString& target_protocol,
const CefString& target_domain,
bool allow_target_subdomains) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -598,18 +587,18 @@ CEF_GLOBAL bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin,
// Execute
int _retval = cef_add_cross_origin_whitelist_entry(
source_origin.GetStruct(),
target_protocol.GetStruct(),
target_domain.GetStruct(),
allow_target_subdomains);
source_origin.GetStruct(), target_protocol.GetStruct(),
target_domain.GetStruct(), allow_target_subdomains);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefRemoveCrossOriginWhitelistEntry(
const CefString& source_origin, const CefString& target_protocol,
const CefString& target_domain, bool allow_target_subdomains) {
const CefString& source_origin,
const CefString& target_protocol,
const CefString& target_domain,
bool allow_target_subdomains) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: source_origin; type: string_byref_const
@@ -624,13 +613,11 @@ CEF_GLOBAL bool CefRemoveCrossOriginWhitelistEntry(
// Execute
int _retval = cef_remove_cross_origin_whitelist_entry(
source_origin.GetStruct(),
target_protocol.GetStruct(),
target_domain.GetStruct(),
allow_target_subdomains);
source_origin.GetStruct(), target_protocol.GetStruct(),
target_domain.GetStruct(), allow_target_subdomains);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefClearCrossOriginWhitelist() {
@@ -640,7 +627,7 @@ CEF_GLOBAL bool CefClearCrossOriginWhitelist() {
int _retval = cef_clear_cross_origin_whitelist();
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefParseURL(const CefString& url, CefURLParts& parts) {
@@ -652,28 +639,24 @@ CEF_GLOBAL bool CefParseURL(const CefString& url, CefURLParts& parts) {
return false;
// Execute
int _retval = cef_parse_url(
url.GetStruct(),
&parts);
int _retval = cef_parse_url(url.GetStruct(), &parts);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefCreateURL(const CefURLParts& parts, CefString& url) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = cef_create_url(
&parts,
url.GetWritableStruct());
int _retval = cef_create_url(&parts, url.GetWritableStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL CefString CefFormatUrlForSecurityDisplay(
const CefString& origin_url) {
CEF_GLOBAL CefString
CefFormatUrlForSecurityDisplay(const CefString& origin_url) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: origin_url; type: string_byref_const
@@ -682,8 +665,8 @@ CEF_GLOBAL CefString CefFormatUrlForSecurityDisplay(
return CefString();
// Execute
cef_string_userfree_t _retval = cef_format_url_for_security_display(
origin_url.GetStruct());
cef_string_userfree_t _retval =
cef_format_url_for_security_display(origin_url.GetStruct());
// Return type: string
CefString _retvalStr;
@@ -700,8 +683,7 @@ CEF_GLOBAL CefString CefGetMimeType(const CefString& extension) {
return CefString();
// Execute
cef_string_userfree_t _retval = cef_get_mime_type(
extension.GetStruct());
cef_string_userfree_t _retval = cef_get_mime_type(extension.GetStruct());
// Return type: string
CefString _retvalStr;
@@ -709,7 +691,8 @@ CEF_GLOBAL CefString CefGetMimeType(const CefString& extension) {
return _retvalStr;
}
CEF_GLOBAL void CefGetExtensionsForMimeType(const CefString& mime_type,
CEF_GLOBAL void CefGetExtensionsForMimeType(
const CefString& mime_type,
std::vector<CefString>& extensions) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -725,9 +708,7 @@ CEF_GLOBAL void CefGetExtensionsForMimeType(const CefString& mime_type,
transfer_string_list_contents(extensions, extensionsList);
// Execute
cef_get_extensions_for_mime_type(
mime_type.GetStruct(),
extensionsList);
cef_get_extensions_for_mime_type(mime_type.GetStruct(), extensionsList);
// Restore param:extensions; type: string_vec_byref
if (extensionsList) {
@@ -746,9 +727,7 @@ CEF_GLOBAL CefString CefBase64Encode(const void* data, size_t data_size) {
return CefString();
// Execute
cef_string_userfree_t _retval = cef_base64encode(
data,
data_size);
cef_string_userfree_t _retval = cef_base64encode(data, data_size);
// Return type: string
CefString _retvalStr;
@@ -765,8 +744,7 @@ CEF_GLOBAL CefRefPtr<CefBinaryValue> CefBase64Decode(const CefString& data) {
return NULL;
// Execute
cef_binary_value_t* _retval = cef_base64decode(
data.GetStruct());
cef_binary_value_t* _retval = cef_base64decode(data.GetStruct());
// Return type: refptr_same
return CefBinaryValueCToCpp::Wrap(_retval);
@@ -781,9 +759,7 @@ CEF_GLOBAL CefString CefURIEncode(const CefString& text, bool use_plus) {
return CefString();
// Execute
cef_string_userfree_t _retval = cef_uriencode(
text.GetStruct(),
use_plus);
cef_string_userfree_t _retval = cef_uriencode(text.GetStruct(), use_plus);
// Return type: string
CefString _retvalStr;
@@ -791,8 +767,9 @@ CEF_GLOBAL CefString CefURIEncode(const CefString& text, bool use_plus) {
return _retvalStr;
}
CEF_GLOBAL CefString CefURIDecode(const CefString& text, bool convert_to_utf8,
cef_uri_unescape_rule_t unescape_rule) {
CEF_GLOBAL CefString CefURIDecode(const CefString& text,
bool convert_to_utf8,
cef_uri_unescape_rule_t unescape_rule) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: text; type: string_byref_const
@@ -801,10 +778,8 @@ CEF_GLOBAL CefString CefURIDecode(const CefString& text, bool convert_to_utf8,
return CefString();
// Execute
cef_string_userfree_t _retval = cef_uridecode(
text.GetStruct(),
convert_to_utf8,
unescape_rule);
cef_string_userfree_t _retval =
cef_uridecode(text.GetStruct(), convert_to_utf8, unescape_rule);
// Return type: string
CefString _retvalStr;
@@ -813,7 +788,7 @@ CEF_GLOBAL CefString CefURIDecode(const CefString& text, bool convert_to_utf8,
}
CEF_GLOBAL CefRefPtr<CefValue> CefParseJSON(const CefString& json_string,
cef_json_parser_options_t options) {
cef_json_parser_options_t options) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: json_string; type: string_byref_const
@@ -822,17 +797,17 @@ CEF_GLOBAL CefRefPtr<CefValue> CefParseJSON(const CefString& json_string,
return NULL;
// Execute
cef_value_t* _retval = cef_parse_json(
json_string.GetStruct(),
options);
cef_value_t* _retval = cef_parse_json(json_string.GetStruct(), options);
// Return type: refptr_same
return CefValueCToCpp::Wrap(_retval);
}
CEF_GLOBAL CefRefPtr<CefValue> CefParseJSONAndReturnError(
const CefString& json_string, cef_json_parser_options_t options,
cef_json_parser_error_t& error_code_out, CefString& error_msg_out) {
const CefString& json_string,
cef_json_parser_options_t options,
cef_json_parser_error_t& error_code_out,
CefString& error_msg_out) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: json_string; type: string_byref_const
@@ -842,9 +817,7 @@ CEF_GLOBAL CefRefPtr<CefValue> CefParseJSONAndReturnError(
// Execute
cef_value_t* _retval = cef_parse_jsonand_return_error(
json_string.GetStruct(),
options,
&error_code_out,
json_string.GetStruct(), options, &error_code_out,
error_msg_out.GetWritableStruct());
// Return type: refptr_same
@@ -852,7 +825,7 @@ CEF_GLOBAL CefRefPtr<CefValue> CefParseJSONAndReturnError(
}
CEF_GLOBAL CefString CefWriteJSON(CefRefPtr<CefValue> node,
cef_json_writer_options_t options) {
cef_json_writer_options_t options) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: node; type: refptr_same
@@ -861,9 +834,8 @@ CEF_GLOBAL CefString CefWriteJSON(CefRefPtr<CefValue> node,
return CefString();
// Execute
cef_string_userfree_t _retval = cef_write_json(
CefValueCToCpp::Unwrap(node),
options);
cef_string_userfree_t _retval =
cef_write_json(CefValueCToCpp::Unwrap(node), options);
// Return type: string
CefString _retvalStr;
@@ -875,12 +847,10 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = cef_get_path(
key,
path.GetWritableStruct());
int _retval = cef_get_path(key, path.GetWritableStruct());
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefLaunchProcess(CefRefPtr<CefCommandLine> command_line) {
@@ -892,14 +862,14 @@ CEF_GLOBAL bool CefLaunchProcess(CefRefPtr<CefCommandLine> command_line) {
return false;
// Execute
int _retval = cef_launch_process(
CefCommandLineCToCpp::Unwrap(command_line));
int _retval = cef_launch_process(CefCommandLineCToCpp::Unwrap(command_line));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name,
CEF_GLOBAL bool CefRegisterSchemeHandlerFactory(
const CefString& scheme_name,
const CefString& domain_name,
CefRefPtr<CefSchemeHandlerFactory> factory) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -912,12 +882,11 @@ CEF_GLOBAL bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name,
// Execute
int _retval = cef_register_scheme_handler_factory(
scheme_name.GetStruct(),
domain_name.GetStruct(),
scheme_name.GetStruct(), domain_name.GetStruct(),
CefSchemeHandlerFactoryCppToC::Wrap(factory));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefClearSchemeHandlerFactories() {
@@ -927,40 +896,37 @@ CEF_GLOBAL bool CefClearSchemeHandlerFactories() {
int _retval = cef_clear_scheme_handler_factories();
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefIsCertStatusError(cef_cert_status_t status) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = cef_is_cert_status_error(
status);
int _retval = cef_is_cert_status_error(status);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefIsCertStatusMinorError(cef_cert_status_t status) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = cef_is_cert_status_minor_error(
status);
int _retval = cef_is_cert_status_minor_error(status);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefCurrentlyOn(CefThreadId threadId) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
int _retval = cef_currently_on(
threadId);
int _retval = cef_currently_on(threadId);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefPostTask(CefThreadId threadId, CefRefPtr<CefTask> task) {
@@ -972,16 +938,15 @@ CEF_GLOBAL bool CefPostTask(CefThreadId threadId, CefRefPtr<CefTask> task) {
return false;
// Execute
int _retval = cef_post_task(
threadId,
CefTaskCppToC::Wrap(task));
int _retval = cef_post_task(threadId, CefTaskCppToC::Wrap(task));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefPostDelayedTask(CefThreadId threadId,
CefRefPtr<CefTask> task, int64 delay_ms) {
CefRefPtr<CefTask> task,
int64 delay_ms) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: task; type: refptr_diff
@@ -990,43 +955,39 @@ CEF_GLOBAL bool CefPostDelayedTask(CefThreadId threadId,
return false;
// Execute
int _retval = cef_post_delayed_task(
threadId,
CefTaskCppToC::Wrap(task),
delay_ms);
int _retval =
cef_post_delayed_task(threadId, CefTaskCppToC::Wrap(task), delay_ms);
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefBeginTracing(const CefString& categories,
CefRefPtr<CefCompletionCallback> callback) {
CefRefPtr<CefCompletionCallback> callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Unverified params: categories, callback
// Execute
int _retval = cef_begin_tracing(
categories.GetStruct(),
CefCompletionCallbackCppToC::Wrap(callback));
int _retval = cef_begin_tracing(categories.GetStruct(),
CefCompletionCallbackCppToC::Wrap(callback));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL bool CefEndTracing(const CefString& tracing_file,
CefRefPtr<CefEndTracingCallback> callback) {
CefRefPtr<CefEndTracingCallback> callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Unverified params: tracing_file, callback
// Execute
int _retval = cef_end_tracing(
tracing_file.GetStruct(),
CefEndTracingCallbackCppToC::Wrap(callback));
int _retval = cef_end_tracing(tracing_file.GetStruct(),
CefEndTracingCallbackCppToC::Wrap(callback));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL int64 CefNowFromSystemTraceTime() {
@@ -1040,7 +1001,8 @@ CEF_GLOBAL int64 CefNowFromSystemTraceTime() {
}
CEF_GLOBAL bool CefRegisterExtension(const CefString& extension_name,
const CefString& javascript_code, CefRefPtr<CefV8Handler> handler) {
const CefString& javascript_code,
CefRefPtr<CefV8Handler> handler) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: extension_name; type: string_byref_const
@@ -1054,13 +1016,12 @@ CEF_GLOBAL bool CefRegisterExtension(const CefString& extension_name,
// Unverified params: handler
// Execute
int _retval = cef_register_extension(
extension_name.GetStruct(),
javascript_code.GetStruct(),
CefV8HandlerCppToC::Wrap(handler));
int _retval = cef_register_extension(extension_name.GetStruct(),
javascript_code.GetStruct(),
CefV8HandlerCppToC::Wrap(handler));
// Return type: bool
return _retval?true:false;
return _retval ? true : false;
}
CEF_GLOBAL void CefVisitWebPluginInfo(
@@ -1073,8 +1034,7 @@ CEF_GLOBAL void CefVisitWebPluginInfo(
return;
// Execute
cef_visit_web_plugin_info(
CefWebPluginInfoVisitorCppToC::Wrap(visitor));
cef_visit_web_plugin_info(CefWebPluginInfoVisitorCppToC::Wrap(visitor));
}
CEF_GLOBAL void CefRefreshWebPlugins() {
@@ -1093,8 +1053,7 @@ CEF_GLOBAL void CefUnregisterInternalWebPlugin(const CefString& path) {
return;
// Execute
cef_unregister_internal_web_plugin(
path.GetStruct());
cef_unregister_internal_web_plugin(path.GetStruct());
}
CEF_GLOBAL void CefRegisterWebPluginCrash(const CefString& path) {
@@ -1106,11 +1065,11 @@ CEF_GLOBAL void CefRegisterWebPluginCrash(const CefString& path) {
return;
// Execute
cef_register_web_plugin_crash(
path.GetStruct());
cef_register_web_plugin_crash(path.GetStruct());
}
CEF_GLOBAL void CefIsWebPluginUnstable(const CefString& path,
CEF_GLOBAL void CefIsWebPluginUnstable(
const CefString& path,
CefRefPtr<CefWebPluginUnstableCallback> callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -1125,11 +1084,11 @@ CEF_GLOBAL void CefIsWebPluginUnstable(const CefString& path,
// Execute
cef_is_web_plugin_unstable(
path.GetStruct(),
CefWebPluginUnstableCallbackCppToC::Wrap(callback));
path.GetStruct(), CefWebPluginUnstableCallbackCppToC::Wrap(callback));
}
CEF_GLOBAL void CefRegisterWidevineCdm(const CefString& path,
CEF_GLOBAL void CefRegisterWidevineCdm(
const CefString& path,
CefRefPtr<CefRegisterCdmCallback> callback) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -1140,8 +1099,6 @@ CEF_GLOBAL void CefRegisterWidevineCdm(const CefString& path,
// Unverified params: callback
// Execute
cef_register_widevine_cdm(
path.GetStruct(),
CefRegisterCdmCallbackCppToC::Wrap(callback));
cef_register_widevine_cdm(path.GetStruct(),
CefRegisterCdmCallbackCppToC::Wrap(callback));
}

1
libcef_dll/wrapper/libcef_dll_wrapper2.cc
View File

@@ -1,4 +1,3 @@
// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.