Compare commits

...

1 Commits

Author SHA1 Message Date
Keeley Hammond
5986861c4b Revert "fix: destroy url loader wrapper when JS env exits (#44574)"
This reverts commit 0d6743e79b.
2025-01-28 11:59:43 -08:00
2 changed files with 7 additions and 14 deletions

View File

@@ -383,13 +383,13 @@ void SimpleURLLoaderWrapper::Start() {
loader_->SetAllowHttpErrorResults(true);
loader_->SetURLLoaderFactoryOptions(request_options_);
loader_->SetOnResponseStartedCallback(base::BindOnce(
&SimpleURLLoaderWrapper::OnResponseStarted, weak_factory_.GetWeakPtr()));
&SimpleURLLoaderWrapper::OnResponseStarted, base::Unretained(this)));
loader_->SetOnRedirectCallback(base::BindRepeating(
&SimpleURLLoaderWrapper::OnRedirect, weak_factory_.GetWeakPtr()));
&SimpleURLLoaderWrapper::OnRedirect, base::Unretained(this)));
loader_->SetOnUploadProgressCallback(base::BindRepeating(
&SimpleURLLoaderWrapper::OnUploadProgress, weak_factory_.GetWeakPtr()));
&SimpleURLLoaderWrapper::OnUploadProgress, base::Unretained(this)));
loader_->SetOnDownloadProgressCallback(base::BindRepeating(
&SimpleURLLoaderWrapper::OnDownloadProgress, weak_factory_.GetWeakPtr()));
&SimpleURLLoaderWrapper::OnDownloadProgress, base::Unretained(this)));
url_loader_factory_ = GetURLLoaderFactoryForURL(request_ref->url);
loader_->DownloadAsStream(url_loader_factory_.get(), this);
@@ -721,19 +721,14 @@ void SimpleURLLoaderWrapper::OnDataReceived(std::string_view string_view,
}
void SimpleURLLoaderWrapper::OnComplete(bool success) {
auto self = weak_factory_.GetWeakPtr();
if (success) {
Emit("complete");
} else {
Emit("error", net::ErrorToString(loader_->NetError()));
}
// If users initiate process shutdown when the event is emitted, then
// we would perform cleanup of the wrapper and we should bail out below.
if (self) {
loader_.reset();
pinned_wrapper_.Reset();
pinned_chunk_pipe_getter_.Reset();
}
loader_.reset();
pinned_wrapper_.Reset();
pinned_chunk_pipe_getter_.Reset();
}
void SimpleURLLoaderWrapper::OnResponseStarted(

View File

@@ -21,7 +21,6 @@
#include "services/network/public/mojom/url_loader_network_service_observer.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
#include "shell/browser/event_emitter_mixin.h"
#include "shell/common/gin_helper/cleaned_up_at_exit.h"
#include "url/gurl.h"
#include "v8/include/v8-forward.h"
@@ -51,7 +50,6 @@ namespace electron::api {
class SimpleURLLoaderWrapper final
: public gin::Wrappable<SimpleURLLoaderWrapper>,
public gin_helper::EventEmitterMixin<SimpleURLLoaderWrapper>,
public gin_helper::CleanedUpAtExit,
private network::SimpleURLLoaderStreamConsumer,
private network::mojom::URLLoaderNetworkServiceObserver {
public: