mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix indentions

Browse source
This commit is contained in:
Cheng Zhao 2017-12-19 10:42:36 +09:00
parent ae7b96991c
commit b27e42f3f7
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
atom/renderer/api/atom_api_web_frame.cc
View file

@ -253,9 +253,9 @@ void WebFrame::ExecuteJavaScript(const base::string16& code,
} }
void WebFrame::ExecuteJavaScriptInIsolatedWorld( void WebFrame::ExecuteJavaScriptInIsolatedWorld(
int world_id, int world_id,
const std::vector<mate::Dictionary>& scripts, const std::vector<mate::Dictionary>& scripts,
mate::Arguments* args) { mate::Arguments* args) {
std::vector<blink::WebScriptSource> sources; std::vector<blink::WebScriptSource> sources;
for (const auto& script : scripts) { for (const auto& script : scripts) {
@ -279,7 +279,7 @@ void WebFrame::ExecuteJavaScriptInIsolatedWorld(
args->GetNext(&has_user_gesture); args->GetNext(&has_user_gesture);
blink::WebLocalFrame::ScriptExecutionType scriptExecutionType = blink::WebLocalFrame::ScriptExecutionType scriptExecutionType =
blink::WebLocalFrame::kSynchronous; blink::WebLocalFrame::kSynchronous;
args->GetNext(&scriptExecutionType); args->GetNext(&scriptExecutionType);
ScriptExecutionCallback::CompletionCallback completion_callback; ScriptExecutionCallback::CompletionCallback completion_callback;
@ -292,23 +292,26 @@ void WebFrame::ExecuteJavaScriptInIsolatedWorld(
scriptExecutionType, callback.release()); scriptExecutionType, callback.release());
} }
void WebFrame::SetIsolatedWorldSecurityOrigin(int world_id, void WebFrame::SetIsolatedWorldSecurityOrigin(
const std::string& origin_url) { int world_id,
web_frame_->SetIsolatedWorldSecurityOrigin( const std::string& origin_url) {
web_frame_->SetIsolatedWorldSecurityOrigin(
world_id, world_id,
blink::WebSecurityOrigin::CreateFromString( blink::WebSecurityOrigin::CreateFromString(
blink::WebString::FromUTF8(origin_url))); blink::WebString::FromUTF8(origin_url)));
} }
void WebFrame::SetIsolatedWorldContentSecurityPolicy(int world_id, void WebFrame::SetIsolatedWorldContentSecurityPolicy(
const std::string& security_policy) { int world_id,
const std::string& security_policy) {
web_frame_->SetIsolatedWorldContentSecurityPolicy( web_frame_->SetIsolatedWorldContentSecurityPolicy(
world_id, blink::WebString::FromUTF8(security_policy)); world_id, blink::WebString::FromUTF8(security_policy));
} }
void WebFrame::SetIsolatedWorldHumanReadableName(int world_id, void WebFrame::SetIsolatedWorldHumanReadableName(
const std::string& name) { int world_id,
web_frame_->SetIsolatedWorldHumanReadableName( const std::string& name) {
web_frame_->SetIsolatedWorldHumanReadableName(
world_id, blink::WebString::FromUTF8(name)); world_id, blink::WebString::FromUTF8(name));
} }