| 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,
|
|
|