Commit 53a8ad15 authored by darin's avatar darin

- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/

        * khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
        * khtml/rendering/render_text.cpp:
        (RenderText::detach): Pass the render arena in to deleteSlaves.
        (RenderText::deleteSlaves): Use the passed-in arena.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2667 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 82240090
2002-11-13 Darin Adler <darin@apple.com>
- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
* khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
* khtml/rendering/render_text.cpp:
(RenderText::detach): Pass the render arena in to deleteSlaves.
(RenderText::deleteSlaves): Use the passed-in arena.
2002-11-13 Darin Adler <darin@apple.com>
- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
......
2002-11-13 Darin Adler <darin@apple.com>
- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
* khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
* khtml/rendering/render_text.cpp:
(RenderText::detach): Pass the render arena in to deleteSlaves.
(RenderText::deleteSlaves): Use the passed-in arena.
2002-11-13 Darin Adler <darin@apple.com>
- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
......
2002-11-13 Darin Adler <darin@apple.com>
- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
* khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
* khtml/rendering/render_text.cpp:
(RenderText::detach): Pass the render arena in to deleteSlaves.
(RenderText::deleteSlaves): Use the passed-in arena.
2002-11-13 Darin Adler <darin@apple.com>
- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
......
......@@ -340,11 +340,11 @@ RenderText::~RenderText()
void RenderText::detach(RenderArena* renderArena)
{
deleteSlaves();
deleteSlaves(renderArena);
RenderObject::detach(renderArena);
}
void RenderText::deleteSlaves()
void RenderText::deleteSlaves(RenderArena *arena)
{
// this is a slight variant of QArray::clear().
// We don't delete the array itself here because its
......@@ -352,7 +352,8 @@ void RenderText::deleteSlaves()
// us resize() calls
unsigned int len = m_lines.size();
if (len) {
RenderArena* arena = renderArena();
if (!arena)
arena = renderArena();
for(unsigned int i=0; i < len; i++) {
TextSlave* s = m_lines.at(i);
if (s)
......
......@@ -138,7 +138,7 @@ public:
virtual void printObject( QPainter *, int x, int y, int w, int h,
int tx, int ty);
void deleteSlaves();
void deleteSlaves(RenderArena *renderArena = 0);
virtual void detach(RenderArena* renderArena);
DOM::DOMString data() const { return str; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment