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

Make Archive thread safe

Browse source
This commit is contained in:
Cheng Zhao 2017-03-10 17:33:27 +09:00
parent c068285ff8
commit e496e18f6e
6 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/renderer/atom_renderer_client.cc
View file

@ -13,6 +13,7 @@
#include "atom/common/api/atom_bindings.h"
#include "atom/common/api/event_emitter_caller.h"
#include "atom/common/atom_constants.h"
#include "atom/common/asar/asar_util.h"
#include "atom/common/color_util.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/node_bindings.h"
@ -228,6 +229,7 @@ AtomRendererClient::AtomRendererClient()
}
AtomRendererClient::~AtomRendererClient() {
asar::ClearArchives();
}
void AtomRendererClient::RenderThreadStarted() {

5
atom/renderer/web_worker_observer.cc
View file

@ -6,6 +6,7 @@
#include "atom/common/api/atom_bindings.h"
#include "atom/common/api/event_emitter_caller.h"
#include "atom/common/asar/asar_util.h"
#include "atom/common/node_bindings.h"
#include "base/lazy_instance.h"
#include "base/threading/thread_local.h"
@ -35,6 +36,8 @@ WebWorkerObserver::WebWorkerObserver()
WebWorkerObserver::~WebWorkerObserver() {
lazy_tls.Pointer()->Set(nullptr);
node::FreeEnvironment(node_bindings_->uv_env());
asar::ClearArchives();
}
void WebWorkerObserver::ContextCreated(v8::Local<v8::Context> context) {
@ -64,8 +67,6 @@ void WebWorkerObserver::ContextWillDestroy(v8::Local<v8::Context> context) {
if (env)
mate::EmitEvent(env->isolate(), env->process_object(), "exit");
// Destroy the node environment.
node::FreeEnvironment(env);
delete this;
}