Correctly unload heavy parts on quit.

Telegram/SourceFiles/history/view/history_view_element.cpp

@@ -607,8 +607,8 @@ auto Element::verticalRepaintRange() const -> VerticalRepaintRange {
 }
 
 void Element::checkHeavyPart() {
-	if (_media) {
+	if (_media && !_media->hasHeavyPart()) {
-		_media->checkHeavyPart();
+		history()->owner().unregisterHeavyViewPart(this);
 	}
 }
 
@@ -745,6 +745,8 @@ void Element::clickHandlerPressedChanged(
 }
 
 Element::~Element() {
+	// Delete media while owner still exists.
+	_media = nullptr;
 	if (_data->mainView() == this) {
 		_data->clearMainView();
 	}

Telegram/SourceFiles/history/view/media/history_view_dice.h

@@ -28,7 +28,9 @@ public:
 
 	void clearStickerLoopPlayed() override {
 	}
-	void checkHeavyPart() override {
+	bool hasHeavyPart() const override {
+		return (_start ? _start->hasHeavyPart() : false)
+			|| (_end ? _end->hasHeavyPart() : false);
 	}
 	void unloadHeavyPart() override {
 		if (_start) {

Telegram/SourceFiles/history/view/media/history_view_document.cpp

@@ -84,6 +84,13 @@ Document::Document(
 	}
 }
 
+Document::~Document() {
+	if (_dataMedia) {
+		_dataMedia = nullptr;
+		_parent->checkHeavyPart();
+	}
+}
+
 float64 Document::dataProgress() const {
 	ensureDataMediaCreated();
 	return _dataMedia->progress();
@@ -494,10 +501,8 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 	}
 }
 
-void Document::checkHeavyPart() {
+bool Document::hasHeavyPart() const {
-	if (!_dataMedia) {
+	return (_dataMedia != nullptr);
-		history()->owner().unregisterHeavyViewPart(_parent);
-	}
 }
 
 void Document::unloadHeavyPart() {

Telegram/SourceFiles/history/view/media/history_view_document.h

@@ -31,6 +31,7 @@ public:
 	Document(
 		not_null<Element*> parent,
 		not_null<DocumentData*> document);
+	~Document();
 
 	void draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
@@ -67,7 +68,7 @@ public:
 	void refreshParentId(not_null<HistoryItem*> realParent) override;
 	void parentTextUpdated() override;
 
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 protected:

Telegram/SourceFiles/history/view/media/history_view_game.h

@@ -80,10 +80,8 @@ public:
 
 	void parentTextUpdated() override;
 
-	void checkHeavyPart() override {
+	bool hasHeavyPart() const override {
-		if (_attach) {
+		return _attach ? _attach->hasHeavyPart() : false;
-			_attach->checkHeavyPart();
-		}
 	}
 	void unloadHeavyPart() override {
 		if (_attach) {

Telegram/SourceFiles/history/view/media/history_view_gif.cpp

@@ -96,12 +96,14 @@ Gif::Gif(
 }
 
 Gif::~Gif() {
+	if (_streamed || _dataMedia) {
 		if (_streamed) {
 			_data->owner().streaming().keepAlive(_data);
 			setStreamed(nullptr);
 		}
 		_dataMedia = nullptr;
-	checkHeavyPart();
+		_parent->checkHeavyPart();
+	}
 }
 
 QSize Gif::sizeForAspectRatio() const {
@@ -728,7 +730,6 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return result;
 	}
-	ensureDataMediaCreated();
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
 
@@ -827,6 +828,7 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 		}
 	}
 	if (QRect(usex + paintx, painty, usew, painth).contains(point)) {
+		ensureDataMediaCreated();
 		result.link = _data->uploading()
 			? _cancell
 			: _realParent->isSending()
@@ -1299,10 +1301,8 @@ void Gif::parentTextUpdated() {
 	}
 }
 
-void Gif::checkHeavyPart() {
+bool Gif::hasHeavyPart() const {
-	if (!_dataMedia && !_streamed) {
+	return _streamed || _dataMedia;
-		history()->owner().unregisterHeavyViewPart(_parent);
-	}
 }
 
 void Gif::unloadHeavyPart() {

Telegram/SourceFiles/history/view/media/history_view_gif.h

@@ -104,7 +104,7 @@ public:
 
 	void parentTextUpdated() override;
 
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 	void refreshParentId(not_null<HistoryItem*> realParent) override;

Telegram/SourceFiles/history/view/media/history_view_invoice.h

@@ -70,10 +70,8 @@ public:
 		return _attach.get();
 	}
 
-	void checkHeavyPart() override {
+	bool hasHeavyPart() const override {
-		if (_attach) {
+		return _attach ? _attach->hasHeavyPart() : false;
-			_attach->checkHeavyPart();
-		}
 	}
 	void unloadHeavyPart() override {
 		if (_attach) {

Telegram/SourceFiles/history/view/media/history_view_media.h

@@ -253,7 +253,8 @@ public:
 		crl::time ms) const {
 	}
 
-	virtual void checkHeavyPart() {
+	virtual bool hasHeavyPart() const {
+		return false;
 	}
 	virtual void unloadHeavyPart() {
 	}

Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp

@@ -61,6 +61,11 @@ GroupedMedia::GroupedMedia(
 	Ensures(result);
 }
 
+GroupedMedia::~GroupedMedia() {
+	// Destroy all parts while the media object is still not destroyed.
+	base::take(_parts).clear();
+}
+
 QSize GroupedMedia::countOptimalSize() {
 	if (_caption.hasSkipBlock()) {
 		_caption.updateSkipBlock(
@@ -422,11 +427,14 @@ int GroupedMedia::checkAnimationCount() {
 	return result;
 }
 
-void GroupedMedia::checkHeavyPart() {
+bool GroupedMedia::hasHeavyPart() const {
 	for (auto &part : _parts) {
-		part.content->checkHeavyPart();
+		if (part.content->hasHeavyPart()) {
+			return true;
 		}
 	}
+	return false;
+}
 
 void GroupedMedia::unloadHeavyPart() {
 	for (auto &part : _parts) {

Telegram/SourceFiles/history/view/media/history_view_media_grouped.h

@@ -27,6 +27,7 @@ public:
 	GroupedMedia(
 		not_null<Element*> parent,
 		const std::vector<not_null<HistoryItem*>> &items);
+	~GroupedMedia();
 
 	void refreshParentId(not_null<HistoryItem*> realParent) override;
 
@@ -88,7 +89,7 @@ public:
 
 	void stopAnimation() override;
 	int checkAnimationCount() override;
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 	void parentTextUpdated() override;

Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h

@@ -34,7 +34,8 @@ public:
 		}
 		virtual void clearStickerLoopPlayed() {
 		}
-		virtual void checkHeavyPart() {
+		virtual bool hasHeavyPart() const {
+			return false;
 		}
 		virtual void unloadHeavyPart() {
 		}
@@ -84,8 +85,8 @@ public:
 		_content->clearStickerLoopPlayed();
 	}
 
-	void checkHeavyPart() override {
+	bool hasHeavyPart() const override {
-		_content->checkHeavyPart();
+		return _content->hasHeavyPart();
 	}
 	void unloadHeavyPart() override {
 		_content->unloadHeavyPart();

Telegram/SourceFiles/history/view/media/history_view_photo.cpp

@@ -52,7 +52,12 @@ Photo::Photo(
 	create(parent->data()->fullId(), chat);
 }
 
-Photo::~Photo() = default;
+Photo::~Photo() {
+	if (_dataMedia) {
+		_dataMedia = nullptr;
+		_parent->checkHeavyPart();
+	}
+}
 
 void Photo::create(FullMsgId contextId, PeerData *chat) {
 	setLinks(
@@ -86,10 +91,8 @@ void Photo::dataMediaCreated() const {
 	history()->owner().registerHeavyViewPart(_parent);
 }
 
-void Photo::checkHeavyPart() {
+bool Photo::hasHeavyPart() const {
-	if (!_dataMedia) {
+	return (_dataMedia != nullptr);
-		history()->owner().unregisterHeavyViewPart(_parent);
-	}
 }
 
 void Photo::unloadHeavyPart() {

Telegram/SourceFiles/history/view/media/history_view_photo.h

@@ -80,7 +80,7 @@ public:
 
 	void parentTextUpdated() override;
 
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 protected:

Telegram/SourceFiles/history/view/media/history_view_sticker.cpp

@@ -65,9 +65,11 @@ Sticker::Sticker(
 }
 
 Sticker::~Sticker() {
+	if (_lottie || _dataMedia) {
 		unloadLottie();
 		_dataMedia = nullptr;
-	checkHeavyPart();
+		_parent->checkHeavyPart();
+	}
 }
 
 bool Sticker::isEmojiSticker() const {
@@ -78,7 +80,9 @@ void Sticker::initSize() {
 	_size = _data->dimensions;
 	if (isEmojiSticker() || _diceIndex >= 0) {
 		_size = GetAnimatedEmojiSize(&_data->session(), _size);
+		if (_diceIndex > 0) {
 			[[maybe_unused]] bool result = readyToDrawLottie();
+		}
 	} else {
 		_size = DownscaledSize(
 			_size,
@@ -292,10 +296,8 @@ void Sticker::setupLottie() {
 	}, _lifetime);
 }
 
-void Sticker::checkHeavyPart() {
+bool Sticker::hasHeavyPart() const {
-	if (!_dataMedia && !_lottie) {
+	return _lottie || _dataMedia;
-		_parent->history()->owner().unregisterHeavyViewPart(_parent);
-	}
 }
 
 void Sticker::unloadHeavyPart() {
@@ -312,7 +314,7 @@ void Sticker::unloadLottie() {
 		_lottieOncePlayed = false;
 	}
 	_lottie = nullptr;
-	checkHeavyPart();
+	_parent->checkHeavyPart();
 }
 
 } // namespace HistoryView

Telegram/SourceFiles/history/view/media/history_view_sticker.h

@@ -50,7 +50,7 @@ public:
 		_lottieOncePlayed = false;
 	}
 
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 	void refreshLink() override;

Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp

@@ -41,8 +41,10 @@ ThemeDocument::ThemeDocument(
 }
 
 ThemeDocument::~ThemeDocument() {
+	if (_dataMedia) {
 		_dataMedia = nullptr;
-	checkHeavyPart();
+		_parent->checkHeavyPart();
+	}
 }
 
 void ThemeDocument::fillPatternFieldsFrom(const QString &url) {
@@ -310,10 +312,8 @@ QString ThemeDocument::additionalInfoString() const {
 	return result;
 }
 
-void ThemeDocument::checkHeavyPart() {
+bool ThemeDocument::hasHeavyPart() const {
-	if (!_dataMedia) {
+	return (_dataMedia != nullptr);
-		_parent->history()->owner().unregisterHeavyViewPart(_parent);
-	}
 }
 
 void ThemeDocument::unloadHeavyPart() {

Telegram/SourceFiles/history/view/media/history_view_theme_document.h

@@ -46,7 +46,7 @@ public:
 	bool isReadyForOpen() const override;
 	QString additionalInfoString() const override;
 
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 protected:

Telegram/SourceFiles/history/view/media/history_view_web_page.cpp

@@ -425,10 +425,8 @@ void WebPage::ensurePhotoMediaCreated() const {
 	history()->owner().registerHeavyViewPart(_parent);
 }
 
-void WebPage::checkHeavyPart() {
+bool WebPage::hasHeavyPart() const {
-	if (_attach) {
+	return _photoMedia || (_attach ? _attach->hasHeavyPart() : false);
-		_attach->checkHeavyPart();
-	}
 }
 
 void WebPage::unloadHeavyPart() {
@@ -821,6 +819,10 @@ QString WebPage::displayedSiteName() const {
 
 WebPage::~WebPage() {
 	history()->owner().unregisterWebPageView(_data, _parent);
+	if (_photoMedia) {
+		_photoMedia = nullptr;
+		_parent->checkHeavyPart();
+	}
 }
 
 } // namespace HistoryView

Telegram/SourceFiles/history/view/media/history_view_web_page.h

@@ -86,7 +86,7 @@ public:
 		return _attach.get();
 	}
 
-	void checkHeavyPart() override;
+	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 	~WebPage();

Telegram/SourceFiles/storage/file_download.cpp

@@ -490,7 +490,7 @@ std::unique_ptr<FileLoader> CreateFileLoader(
 			size,
 			locationType,
 			toCache,
-			fromCloud,
+			LoadFromCloudOrLocal,
 			autoLoading,
 			cacheTag);
 	});