github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick 3a6f6fbfd8 from chromium (#27801)

Browse Source 
* chore: cherry-pick 3a6f6fbfd8 from chromium

Backports https://chromium-review.googlesource.com/c/chromium/src/+/2692927

* fix: compilation errors
This commit is contained in:
Robo
2021-02-18 15:34:13 -08:00
committed by GitHub
parent c3925c9274
commit 952797c6fb
2 changed files with 141 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -182,3 +182,4 @@ cherry-pick-9afec1792cfc.patch
cherry-pick-76cb1cc32baa.patch
websocket_don_t_clear_event_queue_on_destruction.patch
disable_gpu_acceleration_on_all_mesa_software_rasterizers.patch
stop_using_raw_webcontents_ptr_in_dragdownloadfile.patch

140
patches/chromium/stop_using_raw_webcontents_ptr_in_dragdownloadfile.patch Normal file
View File

@@ -0,0 +1,140 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Min Qin <qinmin@chromium.org>
Date: Fri, 12 Feb 2021 22:45:08 +0000
Subject: Stop using raw WebContents ptr in DragDownloadFile
BUG=1172192
(cherry picked from commit 99dc876a13df19f3512bcfb97e794ab5d1b28905)
Change-Id: Ie029713553ff88c1e271db1c84396e1ddda19286
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2666189
Reviewed-by: Xing Liu <xingliu@chromium.org>
Commit-Queue: Min Qin <qinmin@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#849692}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2692927
Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Cr-Commit-Position: refs/branch-heads/4324@{#2200}
Cr-Branched-From: c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8-refs/heads/master@{#827102}
diff --git a/content/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc
index a219564120137be65819b06b6c3b718a0eb0e53d..2ddc925c0c01a6f81709caaa61b126dde325aef1 100644
--- a/content/browser/download/drag_download_file.cc
+++ b/content/browser/download/drag_download_file.cc
@@ -38,15 +38,17 @@ class DragDownloadFile::DragDownloadFileUI
DragDownloadFileUI(const GURL& url,
const Referrer& referrer,
const std::string& referrer_encoding,
- WebContents* web_contents,
+ int render_process_id,
+ int render_frame_id,
OnCompleted on_completed)
: on_completed_(std::move(on_completed)),
url_(url),
referrer_(referrer),
referrer_encoding_(referrer_encoding),
- web_contents_(web_contents) {
+ render_process_id_(render_process_id),
+ render_frame_id_(render_frame_id) {
DCHECK(on_completed_);
- DCHECK(web_contents_);
+ DCHECK_GE(render_frame_id_, 0);
// May be called on any thread.
// Do not call weak_ptr_factory_.GetWeakPtr() outside the UI thread.
}
@@ -55,6 +57,10 @@ class DragDownloadFile::DragDownloadFileUI
const base::FilePath& file_path) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ RenderFrameHost* host =
+ RenderFrameHost::FromID(render_process_id_, render_frame_id_);
+ if (!host)
+ return;
// TODO(https://crbug.com/614134) This should use the frame actually
// containing the link being dragged rather than the main frame of the tab.
net::NetworkTrafficAnnotationTag traffic_annotation =
@@ -80,9 +86,9 @@ class DragDownloadFile::DragDownloadFileUI
}
}
})");
- std::unique_ptr<download::DownloadUrlParameters> params(
- DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
- web_contents_, url_, traffic_annotation));
+ auto params = std::make_unique<download::DownloadUrlParameters>(
+ url_, render_process_id_, host->GetRenderViewHost()->GetRoutingID(),
+ render_frame_id_, traffic_annotation);
params->set_referrer(referrer_.url);
params->set_referrer_policy(
Referrer::ReferrerPolicyForUrlRequest(referrer_.policy));
@@ -92,7 +98,7 @@ class DragDownloadFile::DragDownloadFileUI
params->set_file_path(file_path);
params->set_file(std::move(file)); // Nulls file.
params->set_download_source(download::DownloadSource::DRAG_AND_DROP);
- BrowserContext::GetDownloadManager(web_contents_->GetBrowserContext())
+ BrowserContext::GetDownloadManager(host->GetProcess()->GetBrowserContext())
->DownloadUrl(std::move(params));
}
@@ -166,7 +172,8 @@ class DragDownloadFile::DragDownloadFileUI
GURL url_;
Referrer referrer_;
std::string referrer_encoding_;
- WebContents* web_contents_;
+ int render_process_id_;
+ int render_frame_id_;
download::DownloadItem* download_item_ = nullptr;
// Only used in the callback from DownloadManager::DownloadUrl().
@@ -183,8 +190,10 @@ DragDownloadFile::DragDownloadFile(const base::FilePath& file_path,
WebContents* web_contents)
: file_path_(file_path), file_(std::move(file)) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ RenderFrameHost* host = web_contents->GetMainFrame();
drag_ui_ = new DragDownloadFileUI(
- url, referrer, referrer_encoding, web_contents,
+ url, referrer, referrer_encoding, host->GetProcess()->GetID(),
+ host->GetRoutingID(),
base::BindOnce(&DragDownloadFile::DownloadCompleted,
weak_ptr_factory_.GetWeakPtr()));
DCHECK(!file_path_.empty());
diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc
index dc93fac88fc041e2cbb8e47a0a5ea36cc0f07412..2e8130cbd056bccf5c2b7d6484990c654bd23eee 100644
--- a/content/browser/download/drag_download_file_browsertest.cc
+++ b/content/browser/download/drag_download_file_browsertest.cc
@@ -21,6 +21,7 @@
#include "content/public/test/content_browser_test.h"
#include "content/public/test/content_browser_test_utils.h"
#include "content/public/test/download_test_observer.h"
+#include "content/public/test/test_utils.h"
#include "content/shell/browser/shell.h"
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/browser/shell_download_manager_delegate.h"
@@ -129,6 +130,28 @@ IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_Complete) {
RunUntilSucceed();
}
+IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_ClosePage) {
+ base::FilePath name(
+ downloads_directory().AppendASCII("DragDownloadFileTest_Complete.txt"));
+ GURL url = embedded_test_server()->GetURL("/download/download-test.lib");
+ Referrer referrer;
+ std::string referrer_encoding;
+ auto file = std::make_unique<DragDownloadFile>(name, base::File(), url,
+ referrer, referrer_encoding,
+ shell()->web_contents());
+ scoped_refptr<MockDownloadFileObserver> observer(
+ new MockDownloadFileObserver());
+ ON_CALL(*observer.get(), OnDownloadAborted())
+ .WillByDefault(InvokeWithoutArgs(this, &DragDownloadFileTest::FailFast));
+ DownloadManager* manager = BrowserContext::GetDownloadManager(
+ shell()->web_contents()->GetBrowserContext());
+ file->Start(observer.get());
+ shell()->web_contents()->Close();
+ RunAllTasksUntilIdle();
+ std::vector<download::DownloadItem*> downloads;
+ manager->GetAllDownloads(&downloads);
+ ASSERT_EQ(0u, downloads.size());
+}
// TODO(benjhayden): Test Stop().
} // namespace content