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

build: rename sandbox bundle (#17831)

Browse source
This commit is contained in:
Samuel Attard 2019-04-17 17:18:03 -04:00 committed by GitHub
parent 81bf15877f
commit 829050daab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
BUILD.gn
View file

@ -80,7 +80,7 @@ npm_action("atom_browserify_sandbox_unwrapped") {
inputs = auto_filenames.sandbox_browserify_deps inputs = auto_filenames.sandbox_browserify_deps
outputs = [ outputs = [
"$target_gen_dir/js2c/preload_bundle_unwrapped.js", "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
] ]
args = [ args = [
@ -194,11 +194,11 @@ js_wrap("atom_browserify_sandbox") {
] ]
inputs = [ inputs = [
"$target_gen_dir/js2c/preload_bundle_unwrapped.js", "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
] ]
outputs = [ outputs = [
"$target_gen_dir/js2c/preload_bundle.js", "$target_gen_dir/js2c/sandbox_bundle.js",
] ]
} }
@ -223,7 +223,7 @@ action("atom_js2c") {
browserify_sources = [ browserify_sources = [
"$target_gen_dir/js2c/content_script_bundle.js", "$target_gen_dir/js2c/content_script_bundle.js",
"$target_gen_dir/js2c/isolated_bundle.js", "$target_gen_dir/js2c/isolated_bundle.js",
"$target_gen_dir/js2c/preload_bundle.js", "$target_gen_dir/js2c/sandbox_bundle.js",
] ]
sources = browserify_sources + [ sources = browserify_sources + [

8
atom/renderer/atom_sandboxed_renderer_client.cc
View file

@ -218,14 +218,14 @@ void AtomSandboxedRendererClient::DidCreateScriptContext(
InitializeBindings(binding, context, render_frame->IsMainFrame()); InitializeBindings(binding, context, render_frame->IsMainFrame());
AddRenderBindings(isolate, binding); AddRenderBindings(isolate, binding);
std::vector<v8::Local<v8::String>> preload_bundle_params = { std::vector<v8::Local<v8::String>> sandbox_preload_bundle_params = {
node::FIXED_ONE_BYTE_STRING(isolate, "binding")}; node::FIXED_ONE_BYTE_STRING(isolate, "binding")};
std::vector<v8::Local<v8::Value>> preload_bundle_args = {binding}; std::vector<v8::Local<v8::Value>> sandbox_preload_bundle_args = {binding};
node::per_process::native_module_loader.CompileAndCall( node::per_process::native_module_loader.CompileAndCall(
isolate->GetCurrentContext(), "electron/js2c/preload_bundle", isolate->GetCurrentContext(), "electron/js2c/sandbox_bundle",
&preload_bundle_params, &preload_bundle_args, nullptr); &sandbox_preload_bundle_params, &sandbox_preload_bundle_args, nullptr);
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
v8::Context::Scope context_scope(context); v8::Context::Scope context_scope(context);