adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Html dtor simplified more.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2025-08-01 02:24:52 -04:00
parent 9ad7d008e5
commit 1f4f31f409
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/html.cc
View File

@ -550,14 +550,6 @@ DilloHtml::~DilloHtml()
delete page_url; delete page_url;
delete base_url; delete base_url;
for (int i = 0; i < images.size(); i++) {
DilloHtmlImage *img = images.at(i);
img->url.reset(); // Was: delete img->url;
img->image.reset(); // Was: a_Image_unref(img->image);
delete img;
}
images.clear();
} }
/** /**
@ -700,7 +692,7 @@ void DilloHtml::loadImages (const DilloUrl *pattern)
const DilloUrl *requester = pattern ? NULL : this->page_url; const DilloUrl *requester = pattern ? NULL : this->page_url;
for (int i = 0; i < images.size(); i++) { for (int i = 0; i < images.size(); i++) {
DilloHtmlImage *hi = images.at(i); DilloHtmlImage *hi = images.at(i).get();
if (hi->image) { if (hi->image) {
assert(hi->url); assert(hi->url);
@ -2130,9 +2122,10 @@ std::shared_ptr< DilloImage > a_Html_image_new(DilloHtml *html, const char *tag,
if (HT2TB(html)->getFgColor()) if (HT2TB(html)->getFgColor())
image->fg_color = HT2TB(html)->getFgColor()->getColor(); image->fg_color = HT2TB(html)->getFgColor()->getColor();
DilloHtmlImage *hi = new DilloHtmlImage{}; auto hi_ = std::make_unique< DilloHtmlImage >();
hi->url = std::move( url ); hi_->url = std::move( url );
html->images.push_back(hi); html->images.push_back( std::move( hi_ ) );
auto *hi = html->images.back().get();
load_now = prefs.load_images || load_now = prefs.load_images ||
!dStrAsciiCasecmp(URL_SCHEME(hi->url.get()), "data") || !dStrAsciiCasecmp(URL_SCHEME(hi->url.get()), "data") ||

2
src/html_common.hh
View File

@ -222,7 +222,7 @@ public: //BUG: for now everything is public
std::vector< std::unique_ptr< DilloHtmlForm > > forms; std::vector< std::unique_ptr< DilloHtmlForm > > forms;
std::vector< std::shared_ptr< DilloHtmlInput > > inputs_outside_form; std::vector< std::shared_ptr< DilloHtmlInput > > inputs_outside_form;
std::vector< std::unique_ptr< DilloUrl > > links; std::vector< std::unique_ptr< DilloUrl > > links;
std::vector< DilloHtmlImage * > images; std::vector< std::unique_ptr< DilloHtmlImage > > images;
dw::ImageMapsList maps; dw::ImageMapsList maps;
private: private: