Commit 82240090 authored by darin's avatar darin

WebFoundation:

        * Misc.subproj/WebAssertions.m: (vprintf_stderr_objc):
	Don't use displayableString. Makes us able to build on Panther.

        * WebFoundation.pbproj/project.pbxproj: Project Builder wanted to touch this.

WebCore:

	- fixed another crash on http://www.w3.org/Style/CSS/, but still not done

        * khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
	from RenderObject rather than going at the document directly. Safer because
	it works even when we don't have a node yet.
        * khtml/rendering/render_flow.cpp: (RenderFlow::addChild): Ditto.
        * khtml/rendering/render_layer.cpp:
        (RenderLayer::paint): Ditto.
        (RenderLayer::nodeAtPoint): Ditto.
        (RenderLayer::constructZTree): Ditto.
        * khtml/rendering/render_list.cpp:
        (RenderListItem::setStyle): Ditto.
        * khtml/rendering/render_text.cpp:
        (RenderText::deleteSlaves): Ditto.
        (RenderText::position): Ditto. This is the one that actually crashed.

        * khtml/misc/makeattrs: Fixed handling of failure case.
        * khtml/misc/maketags: Ditto.

        * WebCore.pbproj/project.pbxproj: Project Builder wanted to touch this.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2666 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent aed62356
2002-11-13 Darin Adler <darin@apple.com>
- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
* khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
from RenderObject rather than going at the document directly. Safer because
it works even when we don't have a node yet.
* khtml/rendering/render_flow.cpp: (RenderFlow::addChild): Ditto.
* khtml/rendering/render_layer.cpp:
(RenderLayer::paint): Ditto.
(RenderLayer::nodeAtPoint): Ditto.
(RenderLayer::constructZTree): Ditto.
* khtml/rendering/render_list.cpp:
(RenderListItem::setStyle): Ditto.
* khtml/rendering/render_text.cpp:
(RenderText::deleteSlaves): Ditto.
(RenderText::position): Ditto. This is the one that actually crashed.
* khtml/misc/makeattrs: Fixed handling of failure case.
* khtml/misc/maketags: Ditto.
* WebCore.pbproj/project.pbxproj: Project Builder wanted to touch this.
2002-11-13 Darin Adler <darin@apple.com>
- fixed 3100895 -- REGRESSION: Assertion on http://www.w3.org/Style/CSS/
......
2002-11-13 Darin Adler <darin@apple.com>
- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
* khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
from RenderObject rather than going at the document directly. Safer because
it works even when we don't have a node yet.
* khtml/rendering/render_flow.cpp: (RenderFlow::addChild): Ditto.
* khtml/rendering/render_layer.cpp:
(RenderLayer::paint): Ditto.
(RenderLayer::nodeAtPoint): Ditto.
(RenderLayer::constructZTree): Ditto.
* khtml/rendering/render_list.cpp:
(RenderListItem::setStyle): Ditto.
* khtml/rendering/render_text.cpp:
(RenderText::deleteSlaves): Ditto.
(RenderText::position): Ditto. This is the one that actually crashed.
* khtml/misc/makeattrs: Fixed handling of failure case.
* khtml/misc/maketags: Ditto.
* WebCore.pbproj/project.pbxproj: Project Builder wanted to touch this.
2002-11-13 Darin Adler <darin@apple.com>
- fixed 3100895 -- REGRESSION: Assertion on http://www.w3.org/Style/CSS/
......
2002-11-13 Darin Adler <darin@apple.com>
- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
* khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
from RenderObject rather than going at the document directly. Safer because
it works even when we don't have a node yet.
* khtml/rendering/render_flow.cpp: (RenderFlow::addChild): Ditto.
* khtml/rendering/render_layer.cpp:
(RenderLayer::paint): Ditto.
(RenderLayer::nodeAtPoint): Ditto.
(RenderLayer::constructZTree): Ditto.
* khtml/rendering/render_list.cpp:
(RenderListItem::setStyle): Ditto.
* khtml/rendering/render_text.cpp:
(RenderText::deleteSlaves): Ditto.
(RenderText::position): Ditto. This is the one that actually crashed.
* khtml/misc/makeattrs: Fixed handling of failure case.
* khtml/misc/maketags: Ditto.
* WebCore.pbproj/project.pbxproj: Project Builder wanted to touch this.
2002-11-13 Darin Adler <darin@apple.com>
- fixed 3100895 -- REGRESSION: Assertion on http://www.w3.org/Style/CSS/
......
......@@ -72,7 +72,6 @@
F58C8A07025BD3BC018635CA,
F531DDEC02F0C34D018635CA,
);
hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
......
......@@ -63,7 +63,10 @@ print header "\n#endif\n";
close header;
my $result = system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -s 2 htmlattrs.gperf > htmlattrs.c");
exit $result if $result;
if ($result) {
unlink "htmlattrs.c";
exit $result;
}
system("/bin/sh", "-c", 'perl -pi -e "s/\"\"}/\"\", 0}/g" htmlattrs.c');
open(OUT, ">>htmlattrs.c");
......
......@@ -66,7 +66,10 @@ print header "\n#endif\n";
close header;
my $result = system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag htmltags.gperf > htmltags.c");
exit $result if $result;
if ($result) {
unlink "htmltags.c";
exit $result;
}
open(OUT, ">>htmltags.c");
print OUT "\n\nstatic const char * const tagList[] = {\n";
......
......@@ -85,7 +85,7 @@ void RenderBox::setStyle(RenderStyle *_style)
}
if ((isPositioned() || isRelPositioned()) && !m_layer)
m_layer = new (element()->getDocument()->renderArena()) RenderLayer(this);
m_layer = new (renderArena()) RenderLayer(this);
}
RenderBox::~RenderBox()
......
......@@ -1808,7 +1808,7 @@ void RenderFlow::addChild(RenderObject *newChild, RenderObject *beforeChild)
newStyle->inheritFrom(style());
newStyle->setDisplay(BLOCK);
RenderFlow *newBox = new (element()->getDocument()->renderArena()) RenderFlow(0 /* anonymous box */);
RenderFlow *newBox = new (renderArena()) RenderFlow(0 /* anonymous box */);
newBox->setStyle(newStyle);
newBox->setIsAnonymousBox(true);
......
......@@ -225,7 +225,7 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h)
if (currRect != paintRect)
p->restore(); // Pop the clip.
node->detach(renderer()->element()->getDocument()->renderArena());
node->detach(renderer()->renderArena());
}
bool
......@@ -257,7 +257,7 @@ RenderLayer::nodeAtPoint(RenderObject::NodeInfo& info, int x, int y)
if (inside)
break;
}
node->detach(renderer()->element()->getDocument()->renderArena());
node->detach(renderer()->renderArena());
return inside;
}
......@@ -268,7 +268,7 @@ RenderLayer::constructZTree(QRect damageRect,
bool eventProcessing)
{
// The arena we use for allocating our temporary ztree elements.
RenderArena* renderArena = renderer()->element()->getDocument()->renderArena();
RenderArena* renderArena = renderer()->renderArena();
// This variable stores the result we will hand back.
RenderLayer::RenderZTreeNode* returnNode = 0;
......
......@@ -145,11 +145,11 @@ void RenderListItem::setStyle(RenderStyle *_style)
if(!m_marker && style()->listStyleType() != LNONE) {
m_marker = new (element()->getDocument()->renderArena()) RenderListMarker();
m_marker = new (renderArena()) RenderListMarker();
m_marker->setStyle(newStyle);
insertChildNode( m_marker, firstChild() );
} else if ( m_marker && style()->listStyleType() == LNONE) {
m_marker->detach(element()->getDocument()->renderArena());
m_marker->detach(renderArena());
m_marker = 0;
}
else if ( m_marker ) {
......
......@@ -352,7 +352,7 @@ void RenderText::deleteSlaves()
// us resize() calls
unsigned int len = m_lines.size();
if (len) {
RenderArena* arena = element()->getDocument()->renderArena();
RenderArena* arena = renderArena();
for(unsigned int i=0; i < len; i++) {
TextSlave* s = m_lines.at(i);
if (s)
......@@ -1006,7 +1006,7 @@ void RenderText::position(int x, int y, int from, int len, int width, bool rever
qDebug("setting slave text to *%s*, len=%d, w)=%d" , cstr.string().latin1(), len, width );//" << y << ")" << " height=" << lineHeight(false) << " fontHeight=" << metrics(false).height() << " ascent =" << metrics(false).ascent() << endl;
#endif
TextSlave *s = new (element()->getDocument()->renderArena()) TextSlave(x, y, from, len,
TextSlave *s = new (renderArena()) TextSlave(x, y, from, len,
baselinePosition( firstLine ),
width+spaceAdd, reverse, spaceAdd, firstLine);
......
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