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

Update to latest chromium and brightray.

Browse source
This commit is contained in:
Cheng Zhao 2013-06-01 22:33:40 +08:00
parent cbb467032d
commit dfa5257ce0
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
browser/atom_browser_client.cc
View file

@ -18,7 +18,7 @@ AtomBrowserClient::~AtomBrowserClient() {
void AtomBrowserClient::OverrideWebkitPrefs( void AtomBrowserClient::OverrideWebkitPrefs(
content::RenderViewHost* render_view_host, content::RenderViewHost* render_view_host,
const GURL& url, const GURL& url,
webkit_glue::WebPreferences* prefs) { WebPreferences* prefs) {
prefs->javascript_enabled = true; prefs->javascript_enabled = true;
prefs->web_security_enabled = false; prefs->web_security_enabled = false;
prefs->javascript_can_open_windows_automatically = true; prefs->javascript_can_open_windows_automatically = true;
@ -26,7 +26,6 @@ void AtomBrowserClient::OverrideWebkitPrefs(
prefs->dom_paste_enabled = true; prefs->dom_paste_enabled = true;
prefs->java_enabled = false; prefs->java_enabled = false;
prefs->allow_scripts_to_close_windows = true; prefs->allow_scripts_to_close_windows = true;
prefs->uses_page_cache = false;
prefs->javascript_can_access_clipboard = true; prefs->javascript_can_access_clipboard = true;
prefs->local_storage_enabled = true; prefs->local_storage_enabled = true;
prefs->databases_enabled = true; prefs->databases_enabled = true;
@ -34,8 +33,8 @@ void AtomBrowserClient::OverrideWebkitPrefs(
prefs->allow_universal_access_from_file_urls = true; prefs->allow_universal_access_from_file_urls = true;
prefs->allow_file_access_from_file_urls = true; prefs->allow_file_access_from_file_urls = true;
prefs->experimental_webgl_enabled = false; prefs->experimental_webgl_enabled = false;
prefs->allow_displaying_insecure_content = true;
prefs->allow_running_insecure_content = true; prefs->allow_running_insecure_content = true;
prefs->enable_scroll_animator = false;
} }
bool AtomBrowserClient::ShouldSwapProcessesForNavigation( bool AtomBrowserClient::ShouldSwapProcessesForNavigation(

2
browser/atom_browser_client.h
View file

@ -17,7 +17,7 @@ class AtomBrowserClient : public brightray::BrowserClient {
protected: protected:
virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
const GURL& url, const GURL& url,
webkit_glue::WebPreferences* prefs) OVERRIDE; WebPreferences* prefs) OVERRIDE;
virtual bool ShouldSwapProcessesForNavigation( virtual bool ShouldSwapProcessesForNavigation(
content::SiteInstance* site_instance, content::SiteInstance* site_instance,
const GURL& current_url, const GURL& current_url,

3
common/node_bindings.cc
View file

@ -40,7 +40,8 @@ void NodeBindings::Initialize() {
// Load node.js. // Load node.js.
v8::HandleScope scope; v8::HandleScope scope;
node::g_context = v8::Context::New(); node::g_context = v8::Persistent<v8::Context>::New(
node::node_isolate, v8::Context::New(node::node_isolate));
{ {
v8::Context::Scope context_scope(node::g_context); v8::Context::Scope context_scope(node::g_context);
v8::Handle<v8::Object> process = node::SetupProcessObject( v8::Handle<v8::Object> process = node::SetupProcessObject(

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit e2c74cd6631fa7289e36e34f5c6e286bb1e961c2 Subproject commit a6afd2ba1700aaa77286f759a4925da29bab6514

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 63dc76d54a2c79ca197e6c3545846f39db0ac66e Subproject commit 1ab526aa029e5af2dff3248f42bfa9d4c404fe12