From 012baf1ff26c08c69bc01fe4ce01df0a794b0b15 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 14:27:58 +0200
Subject: [PATCH] Remove unnecessary heap allocations in wxHtmlDCRenderer

Make m_Parser and m_FS simple objects instead of pointers as it's
completely unnecessary to allocate them on the heap here.

Note that both wxHtmlWinParser (by explicitly including its header) and
wxFileSystem (which is implicitly included via wx/html/htmlpars.h) are
fully declared in the header, so using pointers doesn't even help with
reducing compilation dependencies.

No real changes.
---
 include/wx/html/htmprint.h |  4 ++--
 src/html/htmprint.cpp      | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 830a1d8362..554413d44c 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -87,8 +87,8 @@ private:
     void DoSetHtmlCell(wxHtmlContainerCell* cell);
 
     wxDC *m_DC;
-    wxHtmlWinParser *m_Parser;
-    wxFileSystem *m_FS;
+    wxFileSystem m_FS;
+    wxHtmlWinParser m_Parser;
     wxHtmlContainerCell *m_Cells;
     int m_Width, m_Height;
     bool m_ownsCells;
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 86b0b7f51b..2ed4e19256 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -71,9 +71,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
     m_Width = m_Height = 0;
     m_Cells = NULL;
     m_ownsCells = false;
-    m_Parser = new wxHtmlWinParser();
-    m_FS = new wxFileSystem();
-    m_Parser->SetFS(m_FS);
+    m_Parser.SetFS(&m_FS);
     SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);
 }
 
@@ -83,9 +81,6 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
 {
     if ( m_ownsCells )
         delete m_Cells;
-
-    if (m_Parser) delete m_Parser;
-    if (m_FS) delete m_FS;
 }
 
 
@@ -93,7 +88,7 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
 void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale, double font_scale)
 {
     m_DC = dc;
-    m_Parser->SetDC(m_DC, pixel_scale, font_scale);
+    m_Parser.SetDC(m_DC, pixel_scale, font_scale);
 }
 
 
@@ -113,9 +108,9 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat
     wxCHECK_RET( m_DC, "SetDC() must be called before SetHtmlText()" );
     wxCHECK_RET( m_Width, "SetSize() must be called before SetHtmlText()" );
 
-    m_FS->ChangePathTo(basepath, isdir);
+    m_FS.ChangePathTo(basepath, isdir);
 
-    wxHtmlContainerCell* const cell = (wxHtmlContainerCell*) m_Parser->Parse(html);
+    wxHtmlContainerCell* const cell = (wxHtmlContainerCell*) m_Parser.Parse(html);
     wxCHECK_RET( cell, "Failed to parse HTML" );
 
     DoSetHtmlCell(cell);
@@ -144,7 +139,7 @@ void wxHtmlDCRenderer::SetHtmlCell(wxHtmlContainerCell& cell)
 void wxHtmlDCRenderer::SetFonts(const wxString& normal_face, const wxString& fixed_face,
                                 const int *sizes)
 {
-    m_Parser->SetFonts(normal_face, fixed_face, sizes);
+    m_Parser.SetFonts(normal_face, fixed_face, sizes);
 
     if ( m_Cells )
         m_Cells->Layout(m_Width);
@@ -155,7 +150,7 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
                                         const wxString& normal_face,
                                         const wxString& fixed_face)
 {
-    m_Parser->SetStandardFonts(size, normal_face, fixed_face);
+    m_Parser.SetStandardFonts(size, normal_face, fixed_face);
 
     if ( m_Cells )
         m_Cells->Layout(m_Width);