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

Merge pull request #4314 from deepak1556/download_cancel_patch

Browse source 
fix crash when default download is canceled
This commit is contained in:
Cheng Zhao 2016-02-02 18:40:44 +08:00
commit f624800881
6 changed files with 97 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/node_includes.h"
#include "base/memory/linked_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "native_mate/dictionary.h"
#include "net/base/filename_util.h"
@ -70,8 +71,17 @@ DownloadItem::DownloadItem(content::DownloadItem* download_item) :
}
DownloadItem::~DownloadItem() {
if (download_item_)
OnDownloadDestroyed(download_item_);
Destroy(download_item_);
}
void DownloadItem::Destroy(content::DownloadItem* item) {
if (item) {
OnDownloadDestroyed(item);
MarkDestroyed();
// Destroy the native class in next tick.
base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
}
}
void DownloadItem::OnDownloadUpdated(content::DownloadItem* item) {
@ -79,8 +89,8 @@ void DownloadItem::OnDownloadUpdated(content::DownloadItem* item) {
}
void DownloadItem::OnDownloadDestroyed(content::DownloadItem* download_item) {
download_item_->RemoveObserver(this);
auto iter = g_download_item_objects.find(download_item_->GetId());
download_item->RemoveObserver(this);
auto iter = g_download_item_objects.find(download_item->GetId());
if (iter != g_download_item_objects.end())
g_download_item_objects.erase(iter);
download_item_ = nullptr;

2
atom/browser/api/atom_api_download_item.h
View file

@ -36,6 +36,8 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
static void BuildPrototype(v8::Isolate* isolate,
v8::Local<v8::ObjectTemplate> prototype);
void Destroy(content::DownloadItem* download_item);
protected:
explicit DownloadItem(content::DownloadItem* download_item);
~DownloadItem();

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

@ -306,12 +306,14 @@ void Session::OnDownloadCreated(content::DownloadManager* manager,
auto web_contents = item->GetWebContents();
if (SavePageHandler::IsSavePageTypes(item->GetMimeType()))
return;
auto download_item_handle = DownloadItem::Create(isolate(), item);
bool prevent_default = Emit(
"will-download",
DownloadItem::Create(isolate(), item),
download_item_handle,
api::WebContents::CreateFrom(isolate(), web_contents));
if (prevent_default) {
item->Cancel(true);
download_item_handle->Destroy(item);
item->Remove();
}
}