[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:23:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e5e56cfb47353f03933445cc8f00acc54667aeb3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Feb 2 00:51:09 2003 +0000
Reviewed by Dave.
- reduced the amount of RenderFlow in the world by about 1/2
* khtml/rendering/bidi.h: Take RenderBlock * instead of RenderFlow *.
* khtml/rendering/bidi.cpp:
(BidiIterator::BidiIterator): Take RenderBlock * instead of RenderFlow *.
(RenderBlock::layoutInlineChildren): Fix debug message to say RenderBlock instead of RenderFlow.
(RenderBlock::findNextLineBreak): Fix debug message to say RenderBlock instead of RenderFlow.
* khtml/rendering/render_block.cpp:
(RenderBlock::addChildToFlow): Make RenderBlock * instead of RenderFlow *.
(RenderBlock::layout): Fix debug message to say RenderBlock instead of RenderFlow.
(RenderBlock::layoutBlockChildren): Fix debug message to say RenderBlock instead of RenderFlow.
(RenderBlock::clearFloats): Fix debug message to say RenderBlock instead of RenderFlow.
* khtml/rendering/render_flow.h: Return a RenderFlow * instead of a RenderObject * from createFlow.
* khtml/rendering/render_flow.cpp:
(RenderFlow::createFlow): Use an if statement instead of ? : to get rid of typecasting.
* khtml/rendering/render_html.cpp: (RenderHtml::containingBlockWidth):
Fix parent call to call RenderBlock. Calling RenderFlow was a mistake, but one that didn't matter
since the actual method isn't implemented until up in RenderBox anyway.
* khtml/rendering/render_inline.h: Change some parameters to RenderBlock *.
* khtml/rendering/render_inline.cpp:
(cloneInline): Make this return a RenderInline * instead of a RenderFlow *.
(RenderInline::splitInlines): Change some parameters to RenderBlock * and locals to RenderInline *.
(RenderInline::splitFlow): Change some parameters and locals to RenderBlock *.
* khtml/rendering/render_layer.h: Remove forward declaration of class RenderFlow.
* khtml/rendering/render_object.h: Remove forward declaration and friend declaration of class RenderFlow.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3538 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a314ae7..b96e5c2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,38 @@
+2003-01-31 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave.
+
+ - reduced the amount of RenderFlow in the world by about 1/2
+
+ * khtml/rendering/bidi.h: Take RenderBlock * instead of RenderFlow *.
+ * khtml/rendering/bidi.cpp:
+ (BidiIterator::BidiIterator): Take RenderBlock * instead of RenderFlow *.
+ (RenderBlock::layoutInlineChildren): Fix debug message to say RenderBlock instead of RenderFlow.
+ (RenderBlock::findNextLineBreak): Fix debug message to say RenderBlock instead of RenderFlow.
+
+ * khtml/rendering/render_block.cpp:
+ (RenderBlock::addChildToFlow): Make RenderBlock * instead of RenderFlow *.
+ (RenderBlock::layout): Fix debug message to say RenderBlock instead of RenderFlow.
+ (RenderBlock::layoutBlockChildren): Fix debug message to say RenderBlock instead of RenderFlow.
+ (RenderBlock::clearFloats): Fix debug message to say RenderBlock instead of RenderFlow.
+
+ * khtml/rendering/render_flow.h: Return a RenderFlow * instead of a RenderObject * from createFlow.
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::createFlow): Use an if statement instead of ? : to get rid of typecasting.
+
+ * khtml/rendering/render_html.cpp: (RenderHtml::containingBlockWidth):
+ Fix parent call to call RenderBlock. Calling RenderFlow was a mistake, but one that didn't matter
+ since the actual method isn't implemented until up in RenderBox anyway.
+
+ * khtml/rendering/render_inline.h: Change some parameters to RenderBlock *.
+ * khtml/rendering/render_inline.cpp:
+ (cloneInline): Make this return a RenderInline * instead of a RenderFlow *.
+ (RenderInline::splitInlines): Change some parameters to RenderBlock * and locals to RenderInline *.
+ (RenderInline::splitFlow): Change some parameters and locals to RenderBlock *.
+
+ * khtml/rendering/render_layer.h: Remove forward declaration of class RenderFlow.
+ * khtml/rendering/render_object.h: Remove forward declaration and friend declaration of class RenderFlow.
+
2003-01-31 Trey Matteson <trey at apple.com>
New plumbing for autofill/autocomplete. WebBrowser receives controlText delegate
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a314ae7..b96e5c2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,38 @@
+2003-01-31 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave.
+
+ - reduced the amount of RenderFlow in the world by about 1/2
+
+ * khtml/rendering/bidi.h: Take RenderBlock * instead of RenderFlow *.
+ * khtml/rendering/bidi.cpp:
+ (BidiIterator::BidiIterator): Take RenderBlock * instead of RenderFlow *.
+ (RenderBlock::layoutInlineChildren): Fix debug message to say RenderBlock instead of RenderFlow.
+ (RenderBlock::findNextLineBreak): Fix debug message to say RenderBlock instead of RenderFlow.
+
+ * khtml/rendering/render_block.cpp:
+ (RenderBlock::addChildToFlow): Make RenderBlock * instead of RenderFlow *.
+ (RenderBlock::layout): Fix debug message to say RenderBlock instead of RenderFlow.
+ (RenderBlock::layoutBlockChildren): Fix debug message to say RenderBlock instead of RenderFlow.
+ (RenderBlock::clearFloats): Fix debug message to say RenderBlock instead of RenderFlow.
+
+ * khtml/rendering/render_flow.h: Return a RenderFlow * instead of a RenderObject * from createFlow.
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::createFlow): Use an if statement instead of ? : to get rid of typecasting.
+
+ * khtml/rendering/render_html.cpp: (RenderHtml::containingBlockWidth):
+ Fix parent call to call RenderBlock. Calling RenderFlow was a mistake, but one that didn't matter
+ since the actual method isn't implemented until up in RenderBox anyway.
+
+ * khtml/rendering/render_inline.h: Change some parameters to RenderBlock *.
+ * khtml/rendering/render_inline.cpp:
+ (cloneInline): Make this return a RenderInline * instead of a RenderFlow *.
+ (RenderInline::splitInlines): Change some parameters to RenderBlock * and locals to RenderInline *.
+ (RenderInline::splitFlow): Change some parameters and locals to RenderBlock *.
+
+ * khtml/rendering/render_layer.h: Remove forward declaration of class RenderFlow.
+ * khtml/rendering/render_object.h: Remove forward declaration and friend declaration of class RenderFlow.
+
2003-01-31 Trey Matteson <trey at apple.com>
New plumbing for autofill/autocomplete. WebBrowser receives controlText delegate
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 8408554..ab8f91f 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -192,7 +192,7 @@ BidiIterator::BidiIterator()
pos = 0;
}
-BidiIterator::BidiIterator(RenderFlow *_par)
+BidiIterator::BidiIterator(RenderBlock *_par)
{
par = _par;
obj = first( par );
@@ -206,7 +206,7 @@ BidiIterator::BidiIterator(const BidiIterator &it)
pos = it.pos;
}
-BidiIterator::BidiIterator(RenderFlow *_par, RenderObject *_obj, int _pos)
+BidiIterator::BidiIterator(RenderBlock *_par, RenderObject *_obj, int _pos)
{
par = _par;
obj = _obj;
@@ -1118,7 +1118,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren)
#if BIDI_DEBUG > 1
kdDebug(6041) << " ------- bidi end " << this << " -------" << endl;
#endif
- //kdDebug() << "RenderFlow::layoutInlineChildren time used " << qt.elapsed() << endl;
+ //kdDebug() << "RenderBlock::layoutInlineChildren time used " << qt.elapsed() << endl;
//kdDebug(6040) << "height = " << m_height <<endl;
}
@@ -1327,7 +1327,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, QPtrList<BidiIt
m_height = fb;
width = newLineWidth;
#ifdef DEBUG_LINEBREAKS
- kdDebug() << "RenderFlow::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
+ kdDebug() << "RenderBlock::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
#endif
}
}
@@ -1417,7 +1417,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, QPtrList<BidiIt
m_height = fb;
width = newLineWidth;
#ifdef DEBUG_LINEBREAKS
- kdDebug() << "RenderFlow::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
+ kdDebug() << "RenderBlock::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
#endif
}
diff --git a/WebCore/khtml/rendering/bidi.h b/WebCore/khtml/rendering/bidi.h
index 3329810..8b80894 100644
--- a/WebCore/khtml/rendering/bidi.h
+++ b/WebCore/khtml/rendering/bidi.h
@@ -28,7 +28,7 @@
class RenderArena;
namespace khtml {
- class RenderFlow;
+ class RenderBlock;
class RenderObject;
class BidiContext {
@@ -90,8 +90,8 @@ namespace khtml {
{
public:
BidiIterator();
- BidiIterator(RenderFlow *par);
- BidiIterator(RenderFlow *par, RenderObject *_obj, int _pos = 0);
+ BidiIterator(RenderBlock *par);
+ BidiIterator(RenderBlock *par, RenderObject *_obj, int _pos = 0);
BidiIterator(const BidiIterator &it);
BidiIterator &operator = (const BidiIterator &it);
@@ -117,7 +117,7 @@ private:
void* operator new(size_t sz) throw();
public:
- RenderFlow *par;
+ RenderBlock *par;
RenderObject *obj;
unsigned int pos;
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index eccc354..47f8480 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -197,7 +197,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
newStyle->inheritFrom(style());
newStyle->setDisplay(BLOCK);
- RenderFlow *newBox = new (renderArena()) RenderBlock(0 /* anonymous box */);
+ RenderBlock *newBox = new (renderArena()) RenderBlock(0 /* anonymous box */);
newBox->setStyle(newStyle);
newBox->setIsAnonymousBox(true);
@@ -393,7 +393,7 @@ void RenderBlock::layout()
// << overhangingContents() << "," << isPositioned() << endl;
#ifdef DEBUG_LAYOUT
- kdDebug( 6040 ) << renderName() << "(RenderFlow) " << this << " ::layout() width=" << m_width << ", layouted=" << layouted() << endl;
+ kdDebug( 6040 ) << renderName() << "(RenderBlock) " << this << " ::layout() width=" << m_width << ", layouted=" << layouted() << endl;
if(containingBlock() == static_cast<RenderObject *>(this))
kdDebug( 6040 ) << renderName() << ": containingBlock == this" << endl;
#endif
@@ -567,7 +567,7 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
bool strictMode = isAnonymousBox() ? true : (!element()->getDocument()->inQuirksMode());
- //kdDebug() << "RenderFlow::layoutBlockChildren " << prevMargin << endl;
+ //kdDebug() << "RenderBlock::layoutBlockChildren " << prevMargin << endl;
// take care in case we inherited floats
if (child && floatBottom() > m_height)
@@ -590,7 +590,7 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
if (child->isPositioned())
{
static_cast<RenderBlock*>(child->containingBlock())->insertSpecialObject(child);
- //kdDebug() << "RenderFlow::layoutBlockChildren inserting positioned into " << child->containingBlock()->renderName() << endl;
+ //kdDebug() << "RenderBlock::layoutBlockChildren inserting positioned into " << child->containingBlock()->renderName() << endl;
child = child->nextSibling();
continue;
@@ -612,7 +612,7 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
if (prevFlow)
m_height -= prevFlow->collapsedMarginBottom();
- //kdDebug() << "RenderFlow::layoutBlockChildren inserting float at "<< m_height <<" prevMargin="<<prevMargin << endl;
+ //kdDebug() << "RenderBlock::layoutBlockChildren inserting float at "<< m_height <<" prevMargin="<<prevMargin << endl;
child = child->nextSibling();
continue;
}
@@ -1466,9 +1466,9 @@ RenderBlock::clearFloats()
prev = parent();
if(!prev) return;
}
- //kdDebug() << "RenderFlow::clearFloats found previous "<< (void *)this << " prev=" << (void *)prev<< endl;
+ //kdDebug() << "RenderBlock::clearFloats found previous "<< (void *)this << " prev=" << (void *)prev<< endl;
- // add overhanging special objects from the previous RenderFlow
+ // add overhanging special objects from the previous RenderBlock
if(!prev->isRenderBlock()) return;
RenderBlock * flow = static_cast<RenderBlock *>(prev);
if(!flow->m_specialObjects) return;
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 1873660..60f99e5 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -43,12 +43,13 @@
using namespace DOM;
using namespace khtml;
-RenderObject* RenderFlow::createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena)
+RenderFlow* RenderFlow::createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena)
{
- RenderObject* result =
- (style->display() == INLINE) ?
- (RenderObject*)(new (arena) RenderInline(node)) :
- (RenderObject*)(new (arena) RenderBlock(node));
+ RenderFlow* result;
+ if (style->display() == INLINE)
+ result = new (arena) RenderInline(node);
+ else
+ result = new (arena) RenderBlock(node);
result->setStyle(style);
return result;
}
@@ -57,7 +58,7 @@ RenderFlow* RenderFlow::continuationBefore(RenderObject* beforeChild)
{
if (beforeChild && beforeChild->parent() == this)
return this;
-
+
RenderFlow* curr = continuation();
RenderFlow* nextToLast = this;
RenderFlow* last = this;
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index 1dfb876..e40a668 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -24,8 +24,6 @@
#ifndef RENDER_FLOW_H
#define RENDER_FLOW_H
-#include <qsortedlist.h>
-
#include "render_box.h"
#include "bidi.h"
@@ -55,7 +53,7 @@ public:
virtual void addChildToFlow(RenderObject* newChild, RenderObject* beforeChild) = 0;
virtual void addChild(RenderObject *newChild, RenderObject *beforeChild = 0);
- static RenderObject* createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena);
+ static RenderFlow* createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena);
protected:
// An inline can be split with blocks occurring in between the inline content.
diff --git a/WebCore/khtml/rendering/render_html.cpp b/WebCore/khtml/rendering/render_html.cpp
index 353a21f..b00ff65 100644
--- a/WebCore/khtml/rendering/render_html.cpp
+++ b/WebCore/khtml/rendering/render_html.cpp
@@ -138,5 +138,5 @@ short RenderHtml::containingBlockWidth() const
if (root()->view())
return root()->view()->visibleWidth();
else
- return RenderFlow::containingBlockWidth();
+ return RenderBlock::containingBlockWidth();
}
diff --git a/WebCore/khtml/rendering/render_inline.cpp b/WebCore/khtml/rendering/render_inline.cpp
index d12e1d9..3f44470 100644
--- a/WebCore/khtml/rendering/render_inline.cpp
+++ b/WebCore/khtml/rendering/render_inline.cpp
@@ -90,19 +90,19 @@ void RenderInline::addChildToFlow(RenderObject* newChild, RenderObject* beforeCh
insertPseudoChild(RenderStyle::AFTER, newChild, beforeChild);
}
-static RenderFlow* cloneInline(RenderFlow* src)
+static RenderInline* cloneInline(RenderFlow* src)
{
RenderInline *o = new (src->renderArena()) RenderInline(src->element());
o->setStyle(src->style());
return o;
}
-void RenderInline::splitInlines(RenderFlow* fromBlock, RenderFlow* toBlock,
- RenderFlow* middleBlock,
+void RenderInline::splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock,
+ RenderBlock* middleBlock,
RenderObject* beforeChild, RenderFlow* oldCont)
{
// Create a clone of this inline.
- RenderFlow* clone = cloneInline(this);
+ RenderInline* clone = cloneInline(this);
clone->setContinuation(oldCont);
// Now take all of the children from beforeChild to the end and remove
@@ -126,7 +126,7 @@ void RenderInline::splitInlines(RenderFlow* fromBlock, RenderFlow* toBlock,
RenderFlow* currChild = this;
while (curr && curr != fromBlock) {
// Create a new clone.
- RenderFlow* cloneChild = clone;
+ RenderInline* cloneChild = clone;
clone = cloneInline(curr);
// Insert our child clone as the first child.
@@ -166,17 +166,15 @@ void RenderInline::splitInlines(RenderFlow* fromBlock, RenderFlow* toBlock,
}
}
-void RenderInline::splitFlow(RenderObject* beforeChild, RenderFlow* newBlockBox,
+void RenderInline::splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
RenderObject* newChild, RenderFlow* oldCont)
{
RenderBlock* block = containingBlock();
- RenderFlow* pre = 0;
- RenderFlow* post = 0;
RenderStyle* newStyle = new RenderStyle();
newStyle->inheritFrom(block->style());
newStyle->setDisplay(BLOCK);
- pre = new (renderArena()) RenderBlock(0 /* anonymous box */);
+ RenderBlock *pre = new (renderArena()) RenderBlock(0 /* anonymous box */);
pre->setStyle(newStyle);
pre->setIsAnonymousBox(true);
pre->setChildrenInline(true);
@@ -184,7 +182,7 @@ void RenderInline::splitFlow(RenderObject* beforeChild, RenderFlow* newBlockBox,
newStyle = new RenderStyle();
newStyle->inheritFrom(block->style());
newStyle->setDisplay(BLOCK);
- post = new (renderArena()) RenderBlock(0 /* anonymous box */);
+ RenderBlock *post = new (renderArena()) RenderBlock(0 /* anonymous box */);
post->setStyle(newStyle);
post->setIsAnonymousBox(true);
post->setChildrenInline(true);
diff --git a/WebCore/khtml/rendering/render_inline.h b/WebCore/khtml/rendering/render_inline.h
index 280c897..6686339 100644
--- a/WebCore/khtml/rendering/render_inline.h
+++ b/WebCore/khtml/rendering/render_inline.h
@@ -46,9 +46,9 @@ public:
virtual bool childrenInline() const { return true; }
virtual void addChildToFlow(RenderObject* newChild, RenderObject* beforeChild);
- void splitInlines(RenderFlow* fromBlock, RenderFlow* toBlock, RenderFlow* middleBlock,
+ void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock,
RenderObject* beforeChild, RenderFlow* oldCont);
- void splitFlow(RenderObject* beforeChild, RenderFlow* newBlockBox,
+ void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
RenderObject* newChild, RenderFlow* oldCont);
virtual void setStyle(RenderStyle* _style);
diff --git a/WebCore/khtml/rendering/render_layer.h b/WebCore/khtml/rendering/render_layer.h
index 3c9abbf..1f602c9 100644
--- a/WebCore/khtml/rendering/render_layer.h
+++ b/WebCore/khtml/rendering/render_layer.h
@@ -52,7 +52,6 @@
#include <qvector.h>
namespace khtml {
- class RenderFlow;
class RenderStyle;
class RenderTable;
class CachedObject;
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index fe2c36c..b411071 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -323,7 +323,6 @@ public:
class NodeInfo
{
friend class RenderImage;
- friend class RenderFlow;
friend class RenderText;
friend class RenderObject;
friend class RenderFrameSet;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list