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

Fix node integration not working

Browse source
This commit is contained in:
Cheng Zhao 2016-03-09 12:40:06 +09:00
parent a31cbd24a1
commit dd4d3db47b
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/atom_browser_client.cc
View file

@ -49,7 +49,7 @@ namespace {
// The default routing id of WebContents. // The default routing id of WebContents.
// In Electron each RenderProcessHost only has one WebContents, so this ID is // In Electron each RenderProcessHost only has one WebContents, so this ID is
// same for every WebContents. // same for every WebContents.
int kDefaultRoutingID = 2; int kDefaultRoutingID = 1;
// Next navigation should not restart renderer process. // Next navigation should not restart renderer process.
bool g_suppress_renderer_process_restart = false; bool g_suppress_renderer_process_restart = false;
@ -201,7 +201,6 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
if (ContainsKey(pending_processes_, process_id)) if (ContainsKey(pending_processes_, process_id))
process_id = pending_processes_[process_id]; process_id = pending_processes_[process_id];
// Certain render process will be created with no associated render view, // Certain render process will be created with no associated render view,
// for example: ServiceWorker. // for example: ServiceWorker.
auto rvh = content::RenderViewHost::FromID(process_id, kDefaultRoutingID); auto rvh = content::RenderViewHost::FromID(process_id, kDefaultRoutingID);

4
atom/browser/net/atom_ssl_config_service.cc
View file

@ -29,9 +29,9 @@ uint16_t GetSSLProtocolVersion(const std::string& version_string) {
return version; return version;
} }
std::vector<uint16> ParseCipherSuites( std::vector<uint16_t> ParseCipherSuites(
const std::vector<std::string>& cipher_strings) { const std::vector<std::string>& cipher_strings) {
std::vector<uint16> cipher_suites; std::vector<uint16_t> cipher_suites;
cipher_suites.reserve(cipher_strings.size()); cipher_suites.reserve(cipher_strings.size());
for (auto& cipher_string : cipher_strings) { for (auto& cipher_string : cipher_strings) {