Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxVector<T> instead of OBJARRAY macros for wxHtmlTextPieces (slightly better performance)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 15:21:46 +00:00
parent 90adb9041c
commit 3c47c04740
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/html/htmlpars.cpp
View File

@@ -29,7 +29,7 @@
#include "wx/fontmap.h" #include "wx/fontmap.h"
#include "wx/html/htmldefs.h" #include "wx/html/htmldefs.h"
#include "wx/html/htmlpars.h" #include "wx/html/htmlpars.h"
#include "wx/arrimpl.cpp" #include "wx/vector.h"
#ifdef __WXWINCE__ #ifdef __WXWINCE__
#include "wx/msw/wince/missing.h" // for bsearch() #include "wx/msw/wince/missing.h" // for bsearch()
@@ -47,12 +47,15 @@ const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");
class wxHtmlTextPiece class wxHtmlTextPiece
{ {
public: public:
wxHtmlTextPiece() {}
wxHtmlTextPiece(int pos, int lng) : m_pos(pos), m_lng(lng) {} wxHtmlTextPiece(int pos, int lng) : m_pos(pos), m_lng(lng) {}
int m_pos, m_lng; int m_pos, m_lng;
}; };
WX_DECLARE_OBJARRAY(wxHtmlTextPiece, wxHtmlTextPieces); // NB: this is an empty class and not typedef because of forward declaration
WX_DEFINE_OBJARRAY(wxHtmlTextPieces) class wxHtmlTextPieces : public wxVector<wxHtmlTextPiece>
{
};
class wxHtmlParserState class wxHtmlParserState
{ {
@@ -168,7 +171,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
{ {
// add text to m_TextPieces: // add text to m_TextPieces:
if (i - textBeginning > 0) if (i - textBeginning > 0)
m_TextPieces->Add( m_TextPieces->push_back(
wxHtmlTextPiece(textBeginning, i - textBeginning)); wxHtmlTextPiece(textBeginning, i - textBeginning));
// if it is a comment, skip it: // if it is a comment, skip it:
@@ -230,7 +233,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
// add remaining text to m_TextPieces: // add remaining text to m_TextPieces:
if (end_pos - textBeginning > 0) if (end_pos - textBeginning > 0)
m_TextPieces->Add( m_TextPieces->push_back(
wxHtmlTextPiece(textBeginning, end_pos - textBeginning)); wxHtmlTextPiece(textBeginning, end_pos - textBeginning));
} }
@@ -262,7 +265,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
if (end_pos <= begin_pos) return; if (end_pos <= begin_pos) return;
wxHtmlTextPieces& pieces = *m_TextPieces; wxHtmlTextPieces& pieces = *m_TextPieces;
size_t piecesCnt = pieces.GetCount(); size_t piecesCnt = pieces.size();
while (begin_pos < end_pos) while (begin_pos < end_pos)
{ {