Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1399)

Unified Diff: content/renderer/image_downloader/image_downloader_impl.cc

Issue 1873003002: Ensure all AssociatedURLLoader be cancelled before shutting down Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/image_downloader/image_downloader_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/image_downloader/image_downloader_impl.cc
diff --git a/content/renderer/image_downloader/image_downloader_impl.cc b/content/renderer/image_downloader/image_downloader_impl.cc
index 421f421a927c8ca0b8ed86e0f845b158d4fe916c..0fd476c1ecdc4176d854f6c15d95999b122c701b 100644
--- a/content/renderer/image_downloader/image_downloader_impl.cc
+++ b/content/renderer/image_downloader/image_downloader_impl.cc
@@ -11,6 +11,7 @@
#include "base/message_loop/message_loop.h"
#include "content/child/image_decoder.h"
#include "content/public/renderer/render_frame.h"
+#include "content/public/renderer/render_thread.h"
#include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h"
#include "mojo/common/url_type_converters.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
@@ -121,9 +122,11 @@ ImageDownloaderImpl::ImageDownloaderImpl(
mojo::InterfaceRequest<content::mojom::ImageDownloader> request)
: RenderFrameObserver(render_frame), binding_(this, std::move(request)) {
DCHECK(render_frame);
+ RenderThread::Get()->AddObserver(this);
}
ImageDownloaderImpl::~ImageDownloaderImpl() {
+ RenderThread::Get()->RemoveObserver(this);
}
// static
@@ -136,6 +139,11 @@ void ImageDownloaderImpl::CreateMojoService(
new ImageDownloaderImpl(render_frame, std::move(request));
}
+// Ensure all loaders cleared before calling blink::shutdown.
+void ImageDownloaderImpl::OnRenderProcessShutdown() {
+ image_fetchers_.clear();
+}
+
// ImageDownloader methods:
void ImageDownloaderImpl::DownloadImage(const mojo::String& url,
bool is_favicon,
« no previous file with comments | « content/renderer/image_downloader/image_downloader_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698