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

Add isolated world web preference option

Browse source
This commit is contained in:
Kevin Sawicki 2016-12-08 15:33:51 -08:00
commit 4bca6fe672
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/web_contents_preferences.cc
View file

@ -119,6 +119,11 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
LOG(ERROR) << "preload url must be file:// protocol."; LOG(ERROR) << "preload url must be file:// protocol.";
} }
// Run Electron APIs and preload script in isolated world
bool isolated;
if (web_preferences.GetBoolean("isolated", &isolated) && isolated)
command_line->AppendSwitch(switches::kIsolatedWorld);
// --background-color. // --background-color.
std::string color; std::string color;
if (web_preferences.GetString(options::kBackgroundColor, &color)) if (web_preferences.GetString(options::kBackgroundColor, &color))

1
atom/common/options_switches.cc
View file

@ -163,6 +163,7 @@ const char kZoomFactor[] = "zoom-factor";
const char kPreloadScript[] = "preload"; const char kPreloadScript[] = "preload";
const char kPreloadURL[] = "preload-url"; const char kPreloadURL[] = "preload-url";
const char kNodeIntegration[] = "node-integration"; const char kNodeIntegration[] = "node-integration";
const char kIsolatedWorld[] = "isolated-world";
const char kGuestInstanceID[] = "guest-instance-id"; const char kGuestInstanceID[] = "guest-instance-id";
const char kOpenerID[] = "opener-id"; const char kOpenerID[] = "opener-id";
const char kScrollBounce[] = "scroll-bounce"; const char kScrollBounce[] = "scroll-bounce";

1
atom/common/options_switches.h
View file

@ -86,6 +86,7 @@ extern const char kZoomFactor[];
extern const char kPreloadScript[]; extern const char kPreloadScript[];
extern const char kPreloadURL[]; extern const char kPreloadURL[];
extern const char kNodeIntegration[]; extern const char kNodeIntegration[];
extern const char kIsolatedWorld[];
extern const char kGuestInstanceID[]; extern const char kGuestInstanceID[];
extern const char kOpenerID[]; extern const char kOpenerID[];
extern const char kScrollBounce[]; extern const char kScrollBounce[];