mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Apply clang-format to all C, C++ and ObjC files (issue #2171)
This commit is contained in:
@@ -34,7 +34,8 @@ namespace {
|
||||
const char kTestOrigin[] = "http://tests/";
|
||||
|
||||
// Replace all instances of |from| with |to| in |str|.
|
||||
std::string StringReplace(const std::string& str, const std::string& from,
|
||||
std::string StringReplace(const std::string& str,
|
||||
const std::string& from,
|
||||
const std::string& to) {
|
||||
std::string result = str;
|
||||
std::string::size_type pos = 0;
|
||||
@@ -58,10 +59,11 @@ void RunGetSourceTest(CefRefPtr<CefBrowser> browser) {
|
||||
std::string source = StringReplace(string, "<", "<");
|
||||
source = StringReplace(source, ">", ">");
|
||||
std::stringstream ss;
|
||||
ss << "<html><body bgcolor=\"white\">Source:<pre>" << source <<
|
||||
"</pre></body></html>";
|
||||
ss << "<html><body bgcolor=\"white\">Source:<pre>" << source
|
||||
<< "</pre></body></html>";
|
||||
browser_->GetMainFrame()->LoadString(ss.str(), "http://tests/getsource");
|
||||
}
|
||||
|
||||
private:
|
||||
CefRefPtr<CefBrowser> browser_;
|
||||
IMPLEMENT_REFCOUNTING(Visitor);
|
||||
@@ -78,10 +80,11 @@ void RunGetTextTest(CefRefPtr<CefBrowser> browser) {
|
||||
std::string text = StringReplace(string, "<", "<");
|
||||
text = StringReplace(text, ">", ">");
|
||||
std::stringstream ss;
|
||||
ss << "<html><body bgcolor=\"white\">Text:<pre>" << text <<
|
||||
"</pre></body></html>";
|
||||
ss << "<html><body bgcolor=\"white\">Text:<pre>" << text
|
||||
<< "</pre></body></html>";
|
||||
browser_->GetMainFrame()->LoadString(ss.str(), "http://tests/gettext");
|
||||
}
|
||||
|
||||
private:
|
||||
CefRefPtr<CefBrowser> browser_;
|
||||
IMPLEMENT_REFCOUNTING(Visitor);
|
||||
@@ -108,8 +111,7 @@ void RunRequestTest(CefRefPtr<CefBrowser> browser) {
|
||||
|
||||
// Add a custom header
|
||||
CefRequest::HeaderMap headerMap;
|
||||
headerMap.insert(
|
||||
std::make_pair("X-My-Header", "My Header Value"));
|
||||
headerMap.insert(std::make_pair("X-My-Header", "My Header Value"));
|
||||
request->SetHeaderMap(headerMap);
|
||||
|
||||
// Load the request
|
||||
@@ -118,10 +120,10 @@ void RunRequestTest(CefRefPtr<CefBrowser> browser) {
|
||||
|
||||
void RunNewWindowTest(CefRefPtr<CefBrowser> browser) {
|
||||
MainContext::Get()->GetRootWindowManager()->CreateRootWindow(
|
||||
true, // Show controls.
|
||||
true, // Show controls.
|
||||
browser->GetHost()->IsWindowRenderingDisabled(),
|
||||
CefRect(), // Use default system size.
|
||||
std::string()); // Use default URL.
|
||||
CefRect(), // Use default system size.
|
||||
std::string()); // Use default URL.
|
||||
}
|
||||
|
||||
void RunPopupWindowTest(CefRefPtr<CefBrowser> browser) {
|
||||
@@ -132,11 +134,11 @@ void RunPopupWindowTest(CefRefPtr<CefBrowser> browser) {
|
||||
void RunPluginInfoTest(CefRefPtr<CefBrowser> browser) {
|
||||
class Visitor : public CefWebPluginInfoVisitor {
|
||||
public:
|
||||
explicit Visitor(CefRefPtr<CefBrowser> browser)
|
||||
: browser_(browser) {
|
||||
html_ = "<html><head><title>Plugin Info Test</title></head>"
|
||||
"<body bgcolor=\"white\">"
|
||||
"\n<b>Installed plugins:</b>";
|
||||
explicit Visitor(CefRefPtr<CefBrowser> browser) : browser_(browser) {
|
||||
html_ =
|
||||
"<html><head><title>Plugin Info Test</title></head>"
|
||||
"<body bgcolor=\"white\">"
|
||||
"\n<b>Installed plugins:</b>";
|
||||
}
|
||||
~Visitor() {
|
||||
html_ += "\n</body></html>";
|
||||
@@ -145,12 +147,13 @@ void RunPluginInfoTest(CefRefPtr<CefBrowser> browser) {
|
||||
browser_->GetMainFrame()->LoadString(html_, "http://tests/plugin_info");
|
||||
}
|
||||
|
||||
virtual bool Visit(CefRefPtr<CefWebPluginInfo> info, int count, int total)
|
||||
OVERRIDE {
|
||||
html_ += "\n<br/><br/>Name: " + info->GetName().ToString() +
|
||||
"\n<br/>Description: " + info->GetDescription().ToString() +
|
||||
"\n<br/>Version: " + info->GetVersion().ToString() +
|
||||
"\n<br/>Path: " + info->GetPath().ToString();
|
||||
virtual bool Visit(CefRefPtr<CefWebPluginInfo> info,
|
||||
int count,
|
||||
int total) OVERRIDE {
|
||||
html_ += "\n<br/><br/>Name: " + info->GetName().ToString() +
|
||||
"\n<br/>Description: " + info->GetDescription().ToString() +
|
||||
"\n<br/>Version: " + info->GetVersion().ToString() +
|
||||
"\n<br/>Path: " + info->GetPath().ToString();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -170,8 +173,7 @@ void ModifyZoom(CefRefPtr<CefBrowser> browser, double delta) {
|
||||
return;
|
||||
}
|
||||
|
||||
browser->GetHost()->SetZoomLevel(
|
||||
browser->GetHost()->GetZoomLevel() + delta);
|
||||
browser->GetHost()->SetZoomLevel(browser->GetHost()->GetZoomLevel() + delta);
|
||||
}
|
||||
|
||||
const char kPrompt[] = "Prompt.";
|
||||
@@ -234,8 +236,8 @@ class PromptHandler : public CefMessageRouterBrowserSide::Handler {
|
||||
}
|
||||
|
||||
static void SetDSFOnMainThread(CefRefPtr<CefBrowser> browser, float dsf) {
|
||||
RootWindow::GetForBrowser(browser->GetIdentifier())->
|
||||
SetDeviceScaleFactor(dsf);
|
||||
RootWindow::GetForBrowser(browser->GetIdentifier())
|
||||
->SetDeviceScaleFactor(dsf);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -247,9 +249,9 @@ void Prompt(CefRefPtr<CefBrowser> browser,
|
||||
// 1. Show a prompt() dialog via JavaScript.
|
||||
// 2. Pass the result to window.cefQuery().
|
||||
// 3. Handle the result in PromptHandler::OnQuery.
|
||||
const std::string& code =
|
||||
"window.cefQuery({'request': '" + std::string(kPrompt) + type +
|
||||
":' + prompt('" + label + "', '" + default_value + "')});";
|
||||
const std::string& code = "window.cefQuery({'request': '" +
|
||||
std::string(kPrompt) + type + ":' + prompt('" +
|
||||
label + "', '" + default_value + "')});";
|
||||
browser->GetMainFrame()->ExecuteJavaScript(
|
||||
code, browser->GetMainFrame()->GetURL(), 0);
|
||||
}
|
||||
@@ -277,8 +279,8 @@ void PromptDSF(CefRefPtr<CefBrowser> browser) {
|
||||
|
||||
// Format the default value string.
|
||||
std::stringstream ss;
|
||||
ss << RootWindow::GetForBrowser(browser->GetIdentifier())->
|
||||
GetDeviceScaleFactor();
|
||||
ss << RootWindow::GetForBrowser(browser->GetIdentifier())
|
||||
->GetDeviceScaleFactor();
|
||||
|
||||
Prompt(browser, kPromptDSF, "Enter Device Scale Factor", ss.str());
|
||||
}
|
||||
@@ -300,11 +302,9 @@ void EndTracing(CefRefPtr<CefBrowser> browser) {
|
||||
return;
|
||||
}
|
||||
|
||||
class Client : public CefEndTracingCallback,
|
||||
public CefRunFileDialogCallback {
|
||||
class Client : public CefEndTracingCallback, public CefRunFileDialogCallback {
|
||||
public:
|
||||
explicit Client(CefRefPtr<CefBrowser> browser)
|
||||
: browser_(browser) {
|
||||
explicit Client(CefRefPtr<CefBrowser> browser) : browser_(browser) {
|
||||
RunDialog();
|
||||
}
|
||||
|
||||
@@ -316,12 +316,12 @@ void EndTracing(CefRefPtr<CefBrowser> browser) {
|
||||
|
||||
// Results in a call to OnFileDialogDismissed.
|
||||
browser_->GetHost()->RunFileDialog(
|
||||
static_cast<cef_file_dialog_mode_t>(
|
||||
FILE_DIALOG_SAVE | FILE_DIALOG_OVERWRITEPROMPT_FLAG),
|
||||
static_cast<cef_file_dialog_mode_t>(FILE_DIALOG_SAVE |
|
||||
FILE_DIALOG_OVERWRITEPROMPT_FLAG),
|
||||
CefString(), // title
|
||||
path,
|
||||
std::vector<CefString>(), // accept_filters
|
||||
0, // selected_accept_filter
|
||||
0, // selected_accept_filter
|
||||
this);
|
||||
}
|
||||
|
||||
@@ -337,8 +337,7 @@ void EndTracing(CefRefPtr<CefBrowser> browser) {
|
||||
}
|
||||
}
|
||||
|
||||
void OnEndTracingComplete(
|
||||
const CefString& tracing_file) OVERRIDE {
|
||||
void OnEndTracingComplete(const CefString& tracing_file) OVERRIDE {
|
||||
Alert(browser_,
|
||||
"File \"" + tracing_file.ToString() + "\" saved successfully.");
|
||||
}
|
||||
@@ -359,11 +358,9 @@ void PrintToPDF(CefRefPtr<CefBrowser> browser) {
|
||||
return;
|
||||
}
|
||||
|
||||
class Client : public CefPdfPrintCallback,
|
||||
public CefRunFileDialogCallback {
|
||||
class Client : public CefPdfPrintCallback, public CefRunFileDialogCallback {
|
||||
public:
|
||||
explicit Client(CefRefPtr<CefBrowser> browser)
|
||||
: browser_(browser) {
|
||||
explicit Client(CefRefPtr<CefBrowser> browser) : browser_(browser) {
|
||||
RunDialog();
|
||||
}
|
||||
|
||||
@@ -378,11 +375,10 @@ void PrintToPDF(CefRefPtr<CefBrowser> browser) {
|
||||
|
||||
// Results in a call to OnFileDialogDismissed.
|
||||
browser_->GetHost()->RunFileDialog(
|
||||
static_cast<cef_file_dialog_mode_t>(
|
||||
FILE_DIALOG_SAVE | FILE_DIALOG_OVERWRITEPROMPT_FLAG),
|
||||
static_cast<cef_file_dialog_mode_t>(FILE_DIALOG_SAVE |
|
||||
FILE_DIALOG_OVERWRITEPROMPT_FLAG),
|
||||
CefString(), // title
|
||||
path,
|
||||
accept_filters,
|
||||
path, accept_filters,
|
||||
0, // selected_accept_filter
|
||||
this);
|
||||
}
|
||||
@@ -404,8 +400,8 @@ void PrintToPDF(CefRefPtr<CefBrowser> browser) {
|
||||
}
|
||||
|
||||
void OnPdfPrintFinished(const CefString& path, bool ok) OVERRIDE {
|
||||
Alert(browser_, "File \"" + path.ToString() +"\" " +
|
||||
(ok ? "saved successfully." : "failed to save."));
|
||||
Alert(browser_, "File \"" + path.ToString() + "\" " +
|
||||
(ok ? "saved successfully." : "failed to save."));
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -424,8 +420,7 @@ void RunOtherTests(CefRefPtr<CefBrowser> browser) {
|
||||
// Provider that dumps the request contents.
|
||||
class RequestDumpResourceProvider : public CefResourceManager::Provider {
|
||||
public:
|
||||
explicit RequestDumpResourceProvider(const std::string& url)
|
||||
: url_(url) {
|
||||
explicit RequestDumpResourceProvider(const std::string& url) : url_(url) {
|
||||
DCHECK(!url.empty());
|
||||
}
|
||||
|
||||
@@ -439,12 +434,10 @@ class RequestDumpResourceProvider : public CefResourceManager::Provider {
|
||||
}
|
||||
|
||||
const std::string& dump = DumpRequestContents(request->request());
|
||||
std::string str = "<html><body bgcolor=\"white\"><pre>" + dump +
|
||||
"</pre></body></html>";
|
||||
CefRefPtr<CefStreamReader> stream =
|
||||
CefStreamReader::CreateForData(
|
||||
static_cast<void*>(const_cast<char*>(str.c_str())),
|
||||
str.size());
|
||||
std::string str =
|
||||
"<html><body bgcolor=\"white\"><pre>" + dump + "</pre></body></html>";
|
||||
CefRefPtr<CefStreamReader> stream = CefStreamReader::CreateForData(
|
||||
static_cast<void*>(const_cast<char*>(str.c_str())), str.size());
|
||||
DCHECK(stream.get());
|
||||
request->Continue(new CefStreamResourceHandler("text/html", stream));
|
||||
return true;
|
||||
@@ -500,7 +493,7 @@ void RunTest(CefRefPtr<CefBrowser> browser, int id) {
|
||||
|
||||
switch (id) {
|
||||
case ID_TESTS_GETSOURCE:
|
||||
RunGetSourceTest(browser);
|
||||
RunGetSourceTest(browser);
|
||||
break;
|
||||
case ID_TESTS_GETTEXT:
|
||||
RunGetTextTest(browser);
|
||||
@@ -562,8 +555,8 @@ std::string DumpRequestContents(CefRefPtr<CefRequest> request) {
|
||||
ss << "\nHeaders:";
|
||||
CefRequest::HeaderMap::const_iterator it = headerMap.begin();
|
||||
for (; it != headerMap.end(); ++it) {
|
||||
ss << "\n\t" << std::string((*it).first) << ": " <<
|
||||
std::string((*it).second);
|
||||
ss << "\n\t" << std::string((*it).first) << ": "
|
||||
<< std::string((*it).second);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -588,7 +581,7 @@ std::string DumpRequestContents(CefRefPtr<CefRequest> request) {
|
||||
char* bytes = new char[size];
|
||||
element->GetBytes(size, bytes);
|
||||
ss << std::string(bytes, size);
|
||||
delete [] bytes;
|
||||
delete[] bytes;
|
||||
}
|
||||
} else if (element->GetType() == PDE_TYPE_FILE) {
|
||||
ss << "\n\tFile: " << std::string(element->GetFile());
|
||||
@@ -600,15 +593,17 @@ std::string DumpRequestContents(CefRefPtr<CefRequest> request) {
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
std::string GetDataURI(const std::string& data,
|
||||
const std::string& mime_type) {
|
||||
std::string GetDataURI(const std::string& data, const std::string& mime_type) {
|
||||
return "data:" + mime_type + ";base64," +
|
||||
CefURIEncode(CefBase64Encode(data.data(), data.size()), false).ToString();
|
||||
CefURIEncode(CefBase64Encode(data.data(), data.size()), false)
|
||||
.ToString();
|
||||
}
|
||||
|
||||
std::string GetErrorString(cef_errorcode_t code) {
|
||||
// Case condition that returns |code| as a string.
|
||||
#define CASE(code) case code: return #code
|
||||
// Case condition that returns |code| as a string.
|
||||
#define CASE(code) \
|
||||
case code: \
|
||||
return #code
|
||||
|
||||
switch (code) {
|
||||
CASE(ERR_NONE);
|
||||
@@ -679,20 +674,20 @@ void SetupResourceManager(CefRefPtr<CefResourceManager> resource_manager) {
|
||||
|
||||
// Add provider for resource dumps.
|
||||
resource_manager->AddProvider(
|
||||
new RequestDumpResourceProvider(test_origin + "request.html"),
|
||||
0, std::string());
|
||||
new RequestDumpResourceProvider(test_origin + "request.html"), 0,
|
||||
std::string());
|
||||
|
||||
// Add provider for bundled resource files.
|
||||
// Add provider for bundled resource files.
|
||||
#if defined(OS_WIN)
|
||||
// Read resources from the binary.
|
||||
resource_manager->AddProvider(CreateBinaryResourceProvider(test_origin),
|
||||
100, std::string());
|
||||
resource_manager->AddProvider(CreateBinaryResourceProvider(test_origin), 100,
|
||||
std::string());
|
||||
#elif defined(OS_POSIX)
|
||||
// Read resources from a directory on disk.
|
||||
std::string resource_dir;
|
||||
if (GetResourceDir(resource_dir)) {
|
||||
resource_manager->AddDirectoryProvider(test_origin, resource_dir,
|
||||
100, std::string());
|
||||
resource_manager->AddDirectoryProvider(test_origin, resource_dir, 100,
|
||||
std::string());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user