[webkit-changes] cvs commit: WebCore/khtml/xml dom_docimpl.cpp
dom_nodeimpl.cpp
David
harrison at opensource.apple.com
Wed Oct 5 17:54:07 PDT 2005
harrison 05/10/05 17:54:07
Modified: . ChangeLog
khtml/rendering bidi.cpp bidi.h render_block.cpp
render_box.cpp render_box.h render_container.cpp
render_container.h render_flow.cpp render_flow.h
render_form.cpp render_form.h render_layer.cpp
render_layer.h render_line.cpp render_line.h
render_list.cpp render_list.h render_object.cpp
render_object.h render_replaced.cpp
render_replaced.h render_style.cpp render_table.cpp
render_table.h render_text.cpp render_text.h
khtml/xml dom_docimpl.cpp dom_nodeimpl.cpp
Log:
Reviewed by Darin.
No test cases added or changed because this patch does not address a bug.
For clarity, renamed the "detach()" function to "destroy()" in the following classes:
RenderObject (and subclasses), BidiRun, ClipRects, InlineBox (and subclasses).
* khtml/rendering/bidi.cpp:
(khtml::BidiRun::destroy):
(khtml::BidiRun::operator delete):
(khtml::deleteBidiRuns):
* khtml/rendering/bidi.h:
* khtml/rendering/render_block.cpp:
(khtml::RenderBlock::removeChild):
(khtml::RenderBlock::updateFirstLetter):
* khtml/rendering/render_box.cpp:
(RenderBox::destroy):
(RenderBox::dirtyLineBoxes):
(RenderBox::position):
(RenderBox::deleteLineBoxWrapper):
* khtml/rendering/render_box.h:
* khtml/rendering/render_container.cpp:
(RenderContainer::destroy):
(RenderContainer::updatePseudoChild):
(RenderContainer::removeLeftoverAnonymousBoxes):
* khtml/rendering/render_container.h:
* khtml/rendering/render_flow.cpp:
(RenderFlow::deleteLineBoxes):
(RenderFlow::destroy):
* khtml/rendering/render_flow.h:
* khtml/rendering/render_form.cpp:
(RenderTextArea::destroy):
* khtml/rendering/render_form.h:
* khtml/rendering/render_layer.cpp:
(khtml::ClipRects::operator delete):
(khtml::ClipRects::destroy):
(khtml::RenderLayer::operator delete):
(khtml::RenderLayer::destroy):
(khtml::RenderLayer::removeOnlyThisLayer):
* khtml/rendering/render_layer.h:
(khtml::ClipRects::deref):
* khtml/rendering/render_line.cpp:
(khtml::InlineBox::destroy):
(khtml::InlineBox::operator delete):
(khtml::InlineBox::deleteLine):
(khtml::InlineFlowBox::deleteLine):
(khtml::RootInlineBox::destroy):
(khtml::RootInlineBox::detachEllipsisBox):
* khtml/rendering/render_line.h:
* khtml/rendering/render_list.cpp:
(RenderListItem::setStyle):
(RenderListItem::destroy):
* khtml/rendering/render_list.h:
* khtml/rendering/render_object.cpp:
(RenderObject::operator delete):
(RenderObject::destroy):
* khtml/rendering/render_object.h:
* khtml/rendering/render_replaced.cpp:
(RenderWidget::destroy):
* khtml/rendering/render_replaced.h:
* khtml/rendering/render_style.cpp:
(RenderStyle::operator delete):
* khtml/rendering/render_table.cpp:
(RenderTableSection::destroy):
(RenderTableRow::destroy):
(RenderTableRow::removeChildNode):
(RenderTableCell::destroy):
* khtml/rendering/render_table.h:
* khtml/rendering/render_text.cpp:
(InlineTextBox::destroy):
(InlineTextBox::operator delete):
(InlineTextBox::deleteLine):
(RenderText::destroy):
(RenderText::deleteTextBoxes):
(RenderText::position):
* khtml/rendering/render_text.h:
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::detach):
* khtml/xml/dom_nodeimpl.cpp:
(DOM::NodeImpl::detach):
Revision Changes Path
1.204 +83 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- ChangeLog 5 Oct 2005 10:31:10 -0000 1.203
+++ ChangeLog 6 Oct 2005 00:53:52 -0000 1.204
@@ -1,3 +1,86 @@
+2005-10-05 David Harrison <harrison at apple.com>
+
+ Reviewed by Darin.
+
+ No test cases added or changed because this patch does not address a bug.
+
+ For clarity, renamed the "detach()" function to "destroy()" in the following classes:
+ RenderObject (and subclasses), BidiRun, ClipRects, InlineBox (and subclasses).
+
+ * khtml/rendering/bidi.cpp:
+ (khtml::BidiRun::destroy):
+ (khtml::BidiRun::operator delete):
+ (khtml::deleteBidiRuns):
+ * khtml/rendering/bidi.h:
+ * khtml/rendering/render_block.cpp:
+ (khtml::RenderBlock::removeChild):
+ (khtml::RenderBlock::updateFirstLetter):
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::destroy):
+ (RenderBox::dirtyLineBoxes):
+ (RenderBox::position):
+ (RenderBox::deleteLineBoxWrapper):
+ * khtml/rendering/render_box.h:
+ * khtml/rendering/render_container.cpp:
+ (RenderContainer::destroy):
+ (RenderContainer::updatePseudoChild):
+ (RenderContainer::removeLeftoverAnonymousBoxes):
+ * khtml/rendering/render_container.h:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::deleteLineBoxes):
+ (RenderFlow::destroy):
+ * khtml/rendering/render_flow.h:
+ * khtml/rendering/render_form.cpp:
+ (RenderTextArea::destroy):
+ * khtml/rendering/render_form.h:
+ * khtml/rendering/render_layer.cpp:
+ (khtml::ClipRects::operator delete):
+ (khtml::ClipRects::destroy):
+ (khtml::RenderLayer::operator delete):
+ (khtml::RenderLayer::destroy):
+ (khtml::RenderLayer::removeOnlyThisLayer):
+ * khtml/rendering/render_layer.h:
+ (khtml::ClipRects::deref):
+ * khtml/rendering/render_line.cpp:
+ (khtml::InlineBox::destroy):
+ (khtml::InlineBox::operator delete):
+ (khtml::InlineBox::deleteLine):
+ (khtml::InlineFlowBox::deleteLine):
+ (khtml::RootInlineBox::destroy):
+ (khtml::RootInlineBox::detachEllipsisBox):
+ * khtml/rendering/render_line.h:
+ * khtml/rendering/render_list.cpp:
+ (RenderListItem::setStyle):
+ (RenderListItem::destroy):
+ * khtml/rendering/render_list.h:
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::operator delete):
+ (RenderObject::destroy):
+ * khtml/rendering/render_object.h:
+ * khtml/rendering/render_replaced.cpp:
+ (RenderWidget::destroy):
+ * khtml/rendering/render_replaced.h:
+ * khtml/rendering/render_style.cpp:
+ (RenderStyle::operator delete):
+ * khtml/rendering/render_table.cpp:
+ (RenderTableSection::destroy):
+ (RenderTableRow::destroy):
+ (RenderTableRow::removeChildNode):
+ (RenderTableCell::destroy):
+ * khtml/rendering/render_table.h:
+ * khtml/rendering/render_text.cpp:
+ (InlineTextBox::destroy):
+ (InlineTextBox::operator delete):
+ (InlineTextBox::deleteLine):
+ (RenderText::destroy):
+ (RenderText::deleteTextBoxes):
+ (RenderText::position):
+ * khtml/rendering/render_text.h:
+ * khtml/xml/dom_docimpl.cpp:
+ (DocumentImpl::detach):
+ * khtml/xml/dom_nodeimpl.cpp:
+ (DOM::NodeImpl::detach):
+
2005-10-05 Maciej Stachowiak <mjs at apple.com>
Reviewed by Eric.
1.145 +3 -3 WebCore/khtml/rendering/bidi.cpp
Index: bidi.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- bidi.cpp 3 Oct 2005 21:12:36 -0000 1.144
+++ bidi.cpp 6 Oct 2005 00:53:55 -0000 1.145
@@ -147,7 +147,7 @@
static bool inBidiRunDetach;
#endif
-void BidiRun::detach(RenderArena* renderArena)
+void BidiRun::destroy(RenderArena* renderArena)
{
#ifndef NDEBUG
inBidiRunDetach = true;
@@ -170,7 +170,7 @@
{
assert(inBidiRunDetach);
- // Stash size where detach can find it.
+ // Stash size where destroy() can find it.
*(size_t*)ptr = sz;
}
@@ -182,7 +182,7 @@
BidiRun* curr = sFirstBidiRun;
while (curr) {
BidiRun* s = curr->nextRun;
- curr->detach(arena);
+ curr->destroy(arena);
curr = s;
}
1.17 +1 -1 WebCore/khtml/rendering/bidi.h
Index: bidi.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/bidi.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bidi.h 24 Sep 2005 11:45:16 -0000 1.16
+++ bidi.h 6 Oct 2005 00:53:55 -0000 1.17
@@ -72,7 +72,7 @@
}
}
- void detach(RenderArena* renderArena);
+ void destroy(RenderArena* renderArena);
// Overloaded new operator.
void* operator new(size_t sz, RenderArena* renderArena) throw();
1.208 +3 -3 WebCore/khtml/rendering/render_block.cpp
Index: render_block.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- render_block.cpp 3 Oct 2005 21:12:37 -0000 1.207
+++ render_block.cpp 6 Oct 2005 00:53:55 -0000 1.208
@@ -324,7 +324,7 @@
no->setNeedsLayoutAndMinMaxRecalc();
}
// Nuke the now-empty block.
- next->detach();
+ next->destroy();
}
RenderFlow::removeChild(oldChild);
@@ -346,7 +346,7 @@
}
// Nuke the now-empty block.
- anonBlock->detach();
+ anonBlock->destroy();
}
}
@@ -3381,7 +3381,7 @@
letter->setStyle(newStyle);
firstLetter->addChild(letter);
- textObj->detach();
+ textObj->destroy();
}
}
}
1.171 +10 -10 WebCore/khtml/rendering/render_box.cpp
Index: render_box.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- render_box.cpp 4 Oct 2005 05:42:35 -0000 1.170
+++ render_box.cpp 6 Oct 2005 00:53:56 -0000 1.171
@@ -135,30 +135,30 @@
//kdDebug( 6040 ) << "Element destructor: this=" << nodeName().qstring() << endl;
}
-void RenderBox::detach()
+void RenderBox::destroy()
{
// A lot of the code in this funtion is just pasted into
- // RenderWidget::detach. If anything in this function changes,
- // be sure to fix RenderWidget::detach() as well.
+ // RenderWidget::destroy. If anything in this function changes,
+ // be sure to fix RenderWidget::destroy() as well.
RenderLayer* layer = m_layer;
RenderArena* arena = renderArena();
- // This must be done before we detach the RenderObject.
+ // This must be done before we destroy the RenderObject.
if (layer)
layer->clearClipRect();
if (m_inlineBoxWrapper) {
if (!documentBeingDestroyed())
m_inlineBoxWrapper->remove();
- m_inlineBoxWrapper->detach(arena);
+ m_inlineBoxWrapper->destroy(arena);
m_inlineBoxWrapper = 0;
}
- RenderObject::detach();
+ RenderObject::destroy();
if (layer)
- layer->detach(arena);
+ layer->destroy(arena);
}
int RenderBox::contentWidth() const
@@ -676,7 +676,7 @@
{
if (m_inlineBoxWrapper) {
if (fullLayout) {
- m_inlineBoxWrapper->detach(renderArena());
+ m_inlineBoxWrapper->destroy(renderArena());
m_inlineBoxWrapper = 0;
}
else
@@ -704,7 +704,7 @@
// Nuke the box.
box->remove();
- box->detach(renderArena());
+ box->destroy(renderArena());
}
else if (isReplaced()) {
m_x = box->xPos();
@@ -724,7 +724,7 @@
void RenderBox::deleteLineBoxWrapper()
{
if (m_inlineBoxWrapper)
- m_inlineBoxWrapper->detach(renderArena());
+ m_inlineBoxWrapper->destroy(renderArena());
m_inlineBoxWrapper = 0;
}
1.59 +1 -1 WebCore/khtml/rendering/render_box.h
Index: render_box.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_box.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- render_box.h 29 Sep 2005 20:10:56 -0000 1.58
+++ render_box.h 6 Oct 2005 00:53:56 -0000 1.59
@@ -51,7 +51,7 @@
virtual void paint(PaintInfo& i, int _tx, int _ty);
virtual bool nodeAtPoint(NodeInfo& i, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction);
- virtual void detach();
+ virtual void destroy();
virtual int minWidth() const { return m_minWidth; }
virtual int maxWidth() const { return m_maxWidth; }
1.70 +6 -6 WebCore/khtml/rendering/render_container.cpp
Index: render_container.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_container.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- render_container.cpp 3 Oct 2005 21:12:38 -0000 1.69
+++ render_container.cpp 6 Oct 2005 00:53:56 -0000 1.70
@@ -57,19 +57,19 @@
{
}
-void RenderContainer::detach()
+void RenderContainer::destroy()
{
if (continuation())
- continuation()->detach();
+ continuation()->destroy();
while (m_first) {
if (m_first->isListMarker())
m_first->remove();
else
- m_first->detach();
+ m_first->destroy();
}
- RenderBox::detach();
+ RenderBox::destroy();
}
bool RenderContainer::canHaveChildren() const
@@ -244,7 +244,7 @@
if (child && child->style()->styleType() == type) {
oldContentPresent = false;
removeChild(child);
- child->detach();
+ child->destroy();
child = (type == RenderStyle::BEFORE) ? firstChild() : lastChild();
}
}
@@ -455,7 +455,7 @@
c->m_first = 0;
c->m_next = 0;
}
- child->detach();
+ child->destroy();
}
child = next;
}
1.18 +1 -1 WebCore/khtml/rendering/render_container.h
Index: render_container.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_container.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- render_container.h 14 Feb 2005 18:19:18 -0000 1.17
+++ render_container.h 6 Oct 2005 00:53:56 -0000 1.18
@@ -48,7 +48,7 @@
virtual void addChild(RenderObject *newChild, RenderObject *beforeChild = 0);
virtual void removeChild(RenderObject *oldChild);
- virtual void detach();
+ virtual void destroy();
virtual RenderObject* removeChildNode(RenderObject* child);
virtual void appendChildNode(RenderObject* child);
1.167 +4 -4 WebCore/khtml/rendering/render_flow.cpp
Index: render_flow.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_flow.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- render_flow.cpp 3 Oct 2005 21:12:38 -0000 1.166
+++ render_flow.cpp 6 Oct 2005 00:53:56 -0000 1.167
@@ -173,7 +173,7 @@
InlineRunBox *curr=m_firstLineBox, *next=0;
while (curr) {
next = curr->nextLineBox();
- curr->detach(arena);
+ curr->destroy(arena);
curr = next;
}
m_firstLineBox = 0;
@@ -181,11 +181,11 @@
}
}
-void RenderFlow::detach()
+void RenderFlow::destroy()
{
if (!documentBeingDestroyed()) {
if (m_firstLineBox) {
- // We can't wait for RenderContainer::detach to clear the selection,
+ // We can't wait for RenderContainer::destroy to clear the selection,
// because by then we will have nuked the line boxes.
if (isSelectionBorder())
canvas()->clearSelection();
@@ -217,7 +217,7 @@
deleteLineBoxes();
- RenderContainer::detach();
+ RenderContainer::destroy();
}
void RenderFlow::dirtyLinesFromChangedChild(RenderObject* child)
1.62 +1 -1 WebCore/khtml/rendering/render_flow.h
Index: render_flow.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_flow.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- render_flow.h 3 May 2005 20:55:32 -0000 1.61
+++ render_flow.h 6 Oct 2005 00:53:57 -0000 1.62
@@ -60,7 +60,7 @@
void attachLineBox(InlineFlowBox* lineBox);
void removeLineBox(InlineFlowBox* lineBox);
void deleteLineBoxes();
- virtual void detach();
+ virtual void destroy();
virtual void dirtyLinesFromChangedChild(RenderObject* child);
1.126 +2 -2 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- render_form.cpp 3 Oct 2005 21:12:39 -0000 1.125
+++ render_form.cpp 6 Oct 2005 00:53:57 -0000 1.126
@@ -1453,10 +1453,10 @@
connect(edit,SIGNAL(selectionChanged()),this,SLOT(slotSelectionChanged()));
}
-void RenderTextArea::detach()
+void RenderTextArea::destroy()
{
element()->updateValue();
- RenderFormElement::detach();
+ RenderFormElement::destroy();
}
void RenderTextArea::handleFocusOut()
1.56 +1 -1 WebCore/khtml/rendering/render_form.h
Index: render_form.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- render_form.h 16 Sep 2005 22:42:16 -0000 1.55
+++ render_form.h 6 Oct 2005 00:53:57 -0000 1.56
@@ -421,7 +421,7 @@
public:
RenderTextArea(DOM::HTMLTextAreaElementImpl *element);
- virtual void detach();
+ virtual void destroy();
virtual const char *renderName() const { return "RenderTextArea"; }
virtual void calcMinMaxWidth();
1.107 +5 -5 WebCore/khtml/rendering/render_layer.cpp
Index: render_layer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- render_layer.cpp 3 Oct 2005 21:12:39 -0000 1.106
+++ render_layer.cpp 6 Oct 2005 00:53:57 -0000 1.107
@@ -87,11 +87,11 @@
void ClipRects::operator delete(void* ptr, size_t sz)
{
- // Stash size where detach can find it.
+ // Stash size where destroy can find it.
*(size_t *)ptr = sz;
}
-void ClipRects::detach(RenderArena* renderArena)
+void ClipRects::destroy(RenderArena* renderArena)
{
delete this;
@@ -338,11 +338,11 @@
{
assert(inRenderLayerDetach);
- // Stash size where detach can find it.
+ // Stash size where destroy can find it.
*(size_t *)ptr = sz;
}
-void RenderLayer::detach(RenderArena* renderArena)
+void RenderLayer::destroy(RenderArena* renderArena)
{
#ifndef NDEBUG
inRenderLayerDetach = true;
@@ -432,7 +432,7 @@
current = next;
}
- detach(renderer()->renderArena());
+ destroy(renderer()->renderArena());
}
void RenderLayer::insertOnlyThisLayer()
1.48 +3 -3 WebCore/khtml/rendering/render_layer.h
Index: render_layer.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- render_layer.h 12 Jul 2005 20:26:41 -0000 1.47
+++ render_layer.h 6 Oct 2005 00:53:57 -0000 1.48
@@ -87,9 +87,9 @@
const QRect& posClipRect() { return m_posClipRect; }
void ref() { m_refCnt++; }
- void deref(RenderArena* renderArena) { if (--m_refCnt == 0) detach(renderArena); }
+ void deref(RenderArena* renderArena) { if (--m_refCnt == 0) destroy(renderArena); }
- void detach(RenderArena* renderArena);
+ void destroy(RenderArena* renderArena);
// Overloaded new operator.
void* operator new(size_t sz, RenderArena* renderArena) throw();
@@ -290,7 +290,7 @@
QRect repaintRect() const { return m_repaintRect; }
- void detach(RenderArena* renderArena);
+ void destroy(RenderArena* renderArena);
// Overloaded new operator. Derived classes must override operator new
// in order to allocate out of the RenderArena.
1.54 +7 -7 WebCore/khtml/rendering/render_line.cpp
Index: render_line.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- render_line.cpp 3 Oct 2005 21:12:40 -0000 1.53
+++ render_line.cpp 6 Oct 2005 00:53:57 -0000 1.54
@@ -78,7 +78,7 @@
parent()->removeChild(this);
}
-void InlineBox::detach(RenderArena* renderArena)
+void InlineBox::destroy(RenderArena* renderArena)
{
#ifndef NDEBUG
inInlineBoxDetach = true;
@@ -102,7 +102,7 @@
{
assert(inInlineBoxDetach);
- // Stash size where detach can find it.
+ // Stash size where destroy can find it.
*(size_t *)ptr = sz;
}
@@ -139,7 +139,7 @@
void InlineBox::deleteLine(RenderArena* arena)
{
m_object->setInlineBoxWrapper(0);
- detach(arena);
+ destroy(arena);
}
void InlineBox::extractLine()
@@ -359,7 +359,7 @@
}
static_cast<RenderFlow*>(m_object)->removeLineBox(this);
- detach(arena);
+ destroy(arena);
}
void InlineFlowBox::extractLine()
@@ -1122,16 +1122,16 @@
return false;
}
-void RootInlineBox::detach(RenderArena* arena)
+void RootInlineBox::destroy(RenderArena* arena)
{
detachEllipsisBox(arena);
- InlineFlowBox::detach(arena);
+ InlineFlowBox::destroy(arena);
}
void RootInlineBox::detachEllipsisBox(RenderArena* arena)
{
if (m_ellipsisBox) {
- m_ellipsisBox->detach(arena);
+ m_ellipsisBox->destroy(arena);
m_ellipsisBox = 0;
}
}
1.32 +2 -2 WebCore/khtml/rendering/render_line.h
Index: render_line.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- render_line.h 16 Sep 2005 22:42:16 -0000 1.31
+++ render_line.h 6 Oct 2005 00:53:57 -0000 1.32
@@ -52,7 +52,7 @@
virtual ~InlineBox() {};
- virtual void detach(RenderArena* renderArena);
+ virtual void destroy(RenderArena* renderArena);
virtual void deleteLine(RenderArena* arena);
virtual void extractLine();
@@ -306,7 +306,7 @@
m_blockHeight(0), m_endsWithBreak(false), m_hasSelectedChildren(false), m_ellipsisBox(0)
{}
- virtual void detach(RenderArena* renderArena);
+ virtual void destroy(RenderArena* renderArena);
void detachEllipsisBox(RenderArena* renderArena);
RootInlineBox* nextRootBox() { return static_cast<RootInlineBox*>(m_nextLine); }
1.72 +4 -4 WebCore/khtml/rendering/render_list.cpp
Index: render_list.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- render_list.cpp 3 Oct 2005 21:12:40 -0000 1.71
+++ render_list.cpp 6 Oct 2005 00:53:57 -0000 1.72
@@ -157,7 +157,7 @@
m_marker->setStyle(newStyle);
newStyle->deref(renderArena());
} else if (m_marker) {
- m_marker->detach();
+ m_marker->destroy();
m_marker = 0;
}
}
@@ -166,13 +166,13 @@
{
}
-void RenderListItem::detach()
+void RenderListItem::destroy()
{
if (m_marker) {
- m_marker->detach();
+ m_marker->destroy();
m_marker = 0;
}
- RenderBlock::detach();
+ RenderBlock::destroy();
}
void RenderListItem::calcListValue()
1.26 +1 -1 WebCore/khtml/rendering/render_list.h
Index: render_list.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- render_list.h 16 Sep 2005 22:42:16 -0000 1.25
+++ render_list.h 6 Oct 2005 00:53:58 -0000 1.26
@@ -95,7 +95,7 @@
RenderListItem(DOM::NodeImpl*);
virtual ~RenderListItem();
- virtual void detach();
+ virtual void destroy();
virtual const char *renderName() const { return "RenderListItem"; }
1.219 +4 -4 WebCore/khtml/rendering/render_object.cpp
Index: render_object.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_object.cpp,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- render_object.cpp 3 Oct 2005 21:12:40 -0000 1.218
+++ render_object.cpp 6 Oct 2005 00:53:58 -0000 1.219
@@ -72,7 +72,7 @@
{
assert(baseOfRenderObjectBeingDeleted == ptr);
- // Stash size where detach can find it.
+ // Stash size where destroy can find it.
*(size_t *)ptr = sz;
}
@@ -2030,11 +2030,11 @@
parent()->removeChild(this);
}
-void RenderObject::detach()
+void RenderObject::destroy()
{
- // By default no ref-counting. RenderWidget::detach() doesn't call
+ // By default no ref-counting. RenderWidget::destroy() doesn't call
// this function because it needs to do ref-counting. If anything
- // in this function changes, be sure to fix RenderWidget::detach() as well.
+ // in this function changes, be sure to fix RenderWidget::destroy() as well.
remove();
1.160 +1 -1 WebCore/khtml/rendering/render_object.h
Index: render_object.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_object.h,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- render_object.h 29 Sep 2005 20:10:57 -0000 1.159
+++ render_object.h 6 Oct 2005 00:53:58 -0000 1.160
@@ -818,7 +818,7 @@
// as a hook to detect the case of document destruction and don't waste time doing unnecessary work.
bool documentBeingDestroyed() const { return !document()->renderer(); }
- virtual void detach();
+ virtual void destroy();
const QFont &font(bool firstLine) const {
return style( firstLine )->font();
1.88 +5 -5 WebCore/khtml/rendering/render_replaced.cpp
Index: render_replaced.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- render_replaced.cpp 3 Oct 2005 21:12:41 -0000 1.87
+++ render_replaced.cpp 6 Oct 2005 00:53:58 -0000 1.88
@@ -234,12 +234,12 @@
ref();
}
-void RenderWidget::detach()
+void RenderWidget::destroy()
{
- // We can't call the base class's detach because we don't
+ // We can't call the base class's destroy because we don't
// want to unconditionally delete ourselves (we're ref-counted).
// So the code below includes copied and pasted contents of
- // both RenderBox::detach() and RenderObject::detach().
+ // both RenderBox::destroy() and RenderObject::destroy().
// Fix originally made for <rdar://problem/4228818>.
remove();
@@ -261,7 +261,7 @@
if (m_inlineBoxWrapper) {
if (!documentBeingDestroyed())
m_inlineBoxWrapper->remove();
- m_inlineBoxWrapper->detach(arena);
+ m_inlineBoxWrapper->destroy(arena);
m_inlineBoxWrapper = 0;
}
@@ -269,7 +269,7 @@
deref(arena);
if (layer)
- layer->detach(arena);
+ layer->destroy(arena);
}
RenderWidget::~RenderWidget()
1.33 +1 -1 WebCore/khtml/rendering/render_replaced.h
Index: render_replaced.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- render_replaced.h 16 Sep 2005 22:42:16 -0000 1.32
+++ render_replaced.h 6 Oct 2005 00:53:59 -0000 1.33
@@ -87,7 +87,7 @@
virtual bool isWidget() const { return true; };
- virtual void detach();
+ virtual void destroy();
virtual void layout( );
QWidget *widget() const { return m_widget; }
1.73 +1 -1 WebCore/khtml/rendering/render_style.cpp
Index: render_style.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_style.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- render_style.cpp 3 Oct 2005 21:12:41 -0000 1.72
+++ render_style.cpp 6 Oct 2005 00:53:59 -0000 1.73
@@ -500,7 +500,7 @@
void RenderStyle::operator delete(void* ptr, size_t sz)
{
- // Stash size where detach can find it.
+ // Stash size where destroy can find it.
*(size_t *)ptr = sz;
}
1.135 +7 -7 WebCore/khtml/rendering/render_table.cpp
Index: render_table.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_table.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- render_table.cpp 3 Oct 2005 21:12:41 -0000 1.134
+++ render_table.cpp 6 Oct 2005 00:53:59 -0000 1.135
@@ -821,14 +821,14 @@
clearGrid();
}
-void RenderTableSection::detach()
+void RenderTableSection::destroy()
{
// recalc cell info because RenderTable has unguarded pointers
// stored that point to this RenderTableSection.
if (table())
table()->setNeedSectionRecalc();
- RenderContainer::detach();
+ RenderContainer::destroy();
}
void RenderTableSection::setStyle(RenderStyle* _style)
@@ -1475,13 +1475,13 @@
setInline(false); // our object is not Inline
}
-void RenderTableRow::detach()
+void RenderTableRow::destroy()
{
RenderTableSection *s = section();
if (s) {
s->setNeedCellRecalc();
}
- RenderContainer::detach();
+ RenderContainer::destroy();
}
void RenderTableRow::setStyle(RenderStyle* style)
@@ -1534,7 +1534,7 @@
RenderObject* RenderTableRow::removeChildNode(RenderObject* child)
{
-// RenderTableCell detach should do it
+// RenderTableCell destroy should do it
// if ( section() )
// section()->setNeedCellRecalc();
return RenderContainer::removeChildNode( child );
@@ -1594,12 +1594,12 @@
m_percentageHeight = 0;
}
-void RenderTableCell::detach()
+void RenderTableCell::destroy()
{
if (parent() && section())
section()->setNeedCellRecalc();
- RenderBlock::detach();
+ RenderBlock::destroy();
}
void RenderTableCell::updateFromElement()
1.47 +3 -3 WebCore/khtml/rendering/render_table.h
Index: render_table.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_table.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- render_table.h 16 Sep 2005 22:42:16 -0000 1.46
+++ render_table.h 6 Oct 2005 00:53:59 -0000 1.47
@@ -204,7 +204,7 @@
public:
RenderTableSection(DOM::NodeImpl* node);
~RenderTableSection();
- virtual void detach();
+ virtual void destroy();
virtual void setStyle(RenderStyle *style);
@@ -278,7 +278,7 @@
public:
RenderTableRow(DOM::NodeImpl* node);
- virtual void detach();
+ virtual void destroy();
virtual void setStyle( RenderStyle* );
virtual const char *renderName() const { return "RenderTableRow"; }
@@ -310,7 +310,7 @@
public:
RenderTableCell(DOM::NodeImpl* node);
- virtual void detach();
+ virtual void destroy();
virtual const char *renderName() const { return "RenderTableCell"; }
virtual bool isTableCell() const { return true; }
1.201 +7 -7 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- render_text.cpp 3 Oct 2005 21:12:42 -0000 1.200
+++ render_text.cpp 6 Oct 2005 00:53:59 -0000 1.201
@@ -57,7 +57,7 @@
static bool inInlineTextBoxDetach;
#endif
-void InlineTextBox::detach(RenderArena* renderArena)
+void InlineTextBox::destroy(RenderArena* renderArena)
{
#ifndef NDEBUG
inInlineTextBoxDetach = true;
@@ -80,7 +80,7 @@
{
assert(inInlineTextBoxDetach);
- // Stash size where detach can find it.
+ // Stash size where destroy can find it.
*(size_t *)ptr = sz;
}
@@ -179,7 +179,7 @@
void InlineTextBox::deleteLine(RenderArena* arena)
{
static_cast<RenderText*>(m_object)->removeTextBox(this);
- detach(arena);
+ destroy(arena);
}
void InlineTextBox::extractLine()
@@ -829,7 +829,7 @@
if(str) str->deref();
}
-void RenderText::detach()
+void RenderText::destroy()
{
if (!documentBeingDestroyed()) {
if (firstTextBox()) {
@@ -845,7 +845,7 @@
parent()->dirtyLinesFromChangedChild(this);
}
deleteTextBoxes();
- RenderObject::detach();
+ RenderObject::destroy();
}
void RenderText::extractTextBox(InlineTextBox* box)
@@ -895,7 +895,7 @@
InlineTextBox *curr = firstTextBox(), *next = 0;
while (curr) {
next = curr->nextTextBox();
- curr->detach(arena);
+ curr->destroy(arena);
curr = next;
}
m_firstTextBox = m_lastTextBox = 0;
@@ -1693,7 +1693,7 @@
if (len == 0) {
// We want the box to be destroyed.
s->remove();
- s->detach(renderArena());
+ s->destroy(renderArena());
m_firstTextBox = m_lastTextBox = 0;
return;
}
1.91 +2 -2 WebCore/khtml/rendering/render_text.h
Index: render_text.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- render_text.h 24 Sep 2005 11:45:17 -0000 1.90
+++ render_text.h 6 Oct 2005 00:53:59 -0000 1.91
@@ -79,7 +79,7 @@
void offsetRun(int d) { m_start += d; }
- void detach(RenderArena* arena);
+ void destroy(RenderArena* arena);
QRect selectionRect(int absx, int absy, int startPos, int endPos);
bool isSelected(int startPos, int endPos) const;
@@ -176,7 +176,7 @@
void attachTextBox(InlineTextBox* textBox);
void removeTextBox(InlineTextBox* textBox);
void deleteTextBoxes();
- virtual void detach();
+ virtual void destroy();
DOM::DOMString data() const { return str; }
DOM::DOMStringImpl *string() const { return str; }
1.259 +1 -1 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- dom_docimpl.cpp 3 Oct 2005 21:12:51 -0000 1.258
+++ dom_docimpl.cpp 6 Oct 2005 00:54:05 -0000 1.259
@@ -1135,7 +1135,7 @@
ContainerNodeImpl::detach();
if ( render )
- render->detach();
+ render->destroy();
if (m_paintDevice == m_view)
setPaintDevice(0);
1.197 +2 -2 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- dom_nodeimpl.cpp 3 Oct 2005 21:34:48 -0000 1.196
+++ dom_nodeimpl.cpp 6 Oct 2005 00:54:06 -0000 1.197
@@ -1228,9 +1228,9 @@
// assert(m_attached);
if (m_render)
- m_render->detach();
-
+ m_render->destroy();
m_render = 0;
+
DocumentImpl *doc = getDocument();
if (doc)
doc->incDOMTreeVersion();
More information about the webkit-changes
mailing list