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

Remove unneeded cleanup code

Browse source
This commit is contained in:
Cheng Zhao 2016-04-25 10:23:36 +09:00
parent 60d2cb8a84
commit 993695af07
5 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_debugger.cc
View file

@ -167,16 +167,8 @@ void Debugger::BuildPrototype(v8::Isolate* isolate,
.SetMethod("sendCommand", &Debugger::SendCommand); .SetMethod("sendCommand", &Debugger::SendCommand);
} }
void ClearWrapDebugger() {
g_wrap_debugger.Reset();
}
void SetWrapDebugger(const WrapDebuggerCallback& callback) { void SetWrapDebugger(const WrapDebuggerCallback& callback) {
g_wrap_debugger = callback; g_wrap_debugger = callback;
// Cleanup the wrapper on exit.
atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
base::Bind(ClearWrapDebugger));
} }
} // namespace api } // namespace api

8
atom/browser/api/atom_api_download_item.cc
View file

@ -184,16 +184,8 @@ mate::Handle<DownloadItem> DownloadItem::Create(
return handle; return handle;
} }
void ClearWrapDownloadItem() {
g_wrap_download_item.Reset();
}
void SetWrapDownloadItem(const WrapDownloadItemCallback& callback) { void SetWrapDownloadItem(const WrapDownloadItemCallback& callback) {
g_wrap_download_item = callback; g_wrap_download_item = callback;
// Cleanup the wrapper on exit.
atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
base::Bind(ClearWrapDownloadItem));
} }
} // namespace api } // namespace api

8
atom/browser/api/atom_api_session.cc
View file

@ -494,16 +494,8 @@ void Session::BuildPrototype(v8::Isolate* isolate,
.SetProperty("webRequest", &Session::WebRequest); .SetProperty("webRequest", &Session::WebRequest);
} }
void ClearWrapSession() {
g_wrap_session.Reset();
}
void SetWrapSession(const WrapSessionCallback& callback) { void SetWrapSession(const WrapSessionCallback& callback) {
g_wrap_session = callback; g_wrap_session = callback;
// Cleanup the wrapper on exit.
atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
base::Bind(ClearWrapSession));
} }
} // namespace api } // namespace api

8
atom/browser/api/atom_api_web_contents.cc
View file

@ -1309,16 +1309,8 @@ mate::Handle<WebContents> WebContents::Create(
return handle; return handle;
} }
void ClearWrapWebContents() {
g_wrap_web_contents.Reset();
}
void SetWrapWebContents(const WrapWebContentsCallback& callback) { void SetWrapWebContents(const WrapWebContentsCallback& callback) {
g_wrap_web_contents = callback; g_wrap_web_contents = callback;
// Cleanup the wrapper on exit.
atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
base::Bind(ClearWrapWebContents));
} }
} // namespace api } // namespace api

7
atom/browser/api/trackable_object.h
View file

@ -114,8 +114,6 @@ class TrackableObject : public TrackableObjectBase,
void AfterInit(v8::Isolate* isolate) override { void AfterInit(v8::Isolate* isolate) override {
if (!weak_map_) { if (!weak_map_) {
weak_map_.reset(new atom::IDWeakMap); weak_map_.reset(new atom::IDWeakMap);
RegisterDestructionCallback(
base::Bind(&TrackableObject<T>::ReleaseAllWeakReferences));
} }
weak_map_id_ = weak_map_->Add(isolate, Wrappable<T>::GetWrapper()); weak_map_id_ = weak_map_->Add(isolate, Wrappable<T>::GetWrapper());
if (wrapped_) if (wrapped_)
@ -123,11 +121,6 @@ class TrackableObject : public TrackableObjectBase,
} }
private: private:
// Releases all weak references in weak map, called when app is terminating.
static void ReleaseAllWeakReferences() {
weak_map_.reset();
}
static scoped_ptr<atom::IDWeakMap> weak_map_; static scoped_ptr<atom::IDWeakMap> weak_map_;
DISALLOW_COPY_AND_ASSIGN(TrackableObject); DISALLOW_COPY_AND_ASSIGN(TrackableObject);