[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:50:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fda9d9cccf502f4abe31c55a3765e3dbbfce4121
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 11 21:30:06 2001 +0000
Fixed brain damage due to my changes re: id -> _id.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 47342aa..d59106d 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -72,13 +72,13 @@ public:
HTMLStackElem * _next
)
:
- id(_id),
+ _id(_id),
level(_level),
node(_node),
next(_next)
{ }
- int id;
+ int _id;
int level;
NodeImpl *node;
HTMLStackElem *next;
@@ -185,39 +185,39 @@ void KHTMLParser::reset()
void KHTMLParser::parseToken(Token *t)
{
- if (t->id > 2*ID_CLOSE_TAG)
+ if (t->_id > 2*ID_CLOSE_TAG)
{
- kdDebug( 6035 ) << "Unknown tag!! tagID = " << t->id << endl;
+ kdDebug( 6035 ) << "Unknown tag!! tagID = " << t->_id << endl;
return;
}
if(discard_until) {
- if(t->id == discard_until)
+ if(t->_id == discard_until)
discard_until = 0;
// do not skip </iframe>
- if ( discard_until || current->id() + ID_CLOSE_TAG != t->id )
+ if ( discard_until || current->id() + ID_CLOSE_TAG != t->_id )
return;
}
#ifdef PARSER_DEBUG
- kdDebug( 6035 ) << "\n\n==> parser: processing token " << getTagName(t->id).string() << "(" << t->id << ")"
+ kdDebug( 6035 ) << "\n\n==> parser: processing token " << getTagName(t->_id).string() << "(" << t->_id << ")"
<< " current = " << getTagName(current->id()).string() << "(" << current->id() << ")" << endl;
kdDebug(6035) << "inline=" << _inline << " inBody=" << inBody << " noRealBody=" << noRealBody << " haveFrameSet=" << haveFrameSet << endl;
#endif
// holy shit. apparently some sites use </br> instead of <br>
// be compatible with IE and NS
- if(t->id == ID_BR+ID_CLOSE_TAG && document->document()->parseMode() != DocumentImpl::Strict)
- t->id -= ID_CLOSE_TAG;
+ if(t->_id == ID_BR+ID_CLOSE_TAG && document->document()->parseMode() != DocumentImpl::Strict)
+ t->_id -= ID_CLOSE_TAG;
- if(t->id > ID_CLOSE_TAG)
+ if(t->_id > ID_CLOSE_TAG)
{
processCloseTag(t);
return;
}
// ignore spaces, if we're not inside a paragraph or other inline code
- if( t->id == ID_TEXT ) {
+ if( t->_id == ID_TEXT ) {
#ifdef PARSER_DEBUG
if(t->text)
kdDebug(6035) << "length="<< t->text->l << " text='" << QConstString(t->text->s, t->text->l).string() << "'" << endl;
@@ -239,12 +239,12 @@ void KHTMLParser::parseToken(Token *t)
// take care of optional close tags
if(endTag[e->id()] == DOM::OPTIONAL)
- popBlock(t->id);
+ popBlock(t->_id);
}
// if this tag is forbidden inside the current context, pop
// blocks until we are allowed to add it...
- while(forbiddenTag[t->id]) popOneBlock();
+ while(forbiddenTag[t->_id]) popOneBlock();
if ( !insertNode(n) ) {
// we couldn't insert the node...
@@ -271,7 +271,7 @@ void KHTMLParser::parseToken(Token *t)
bool KHTMLParser::insertNode(NodeImpl *n)
{
- int id = n->id();
+ int _id = n->id();
// let's be stupid and just try to insert it.
// this should work if the document is wellformed
@@ -284,9 +284,9 @@ bool KHTMLParser::insertNode(NodeImpl *n)
kdDebug( 6035 ) << "added " << n->nodeName().string() << " to " << tmp->nodeName().string() << ", new current=" << newNode->nodeName().string() << endl;
#endif
// don't push elements without end tag on the stack
- if(tagPriority[id] != 0 && !flat)
+ if(tagPriority[_id] != 0 && !flat)
{
- pushBlock(id, tagPriority[id]);
+ pushBlock(_id, tagPriority[_id]);
current = newNode;
#if SPEED_DEBUG < 2
if(!n->attached() && HTMLWidget ) n->attach();
@@ -303,7 +303,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
}
#if SPEED_DEBUG < 1
- if(tagPriority[id] == 0 && n->renderer())
+ if(tagPriority[_id] == 0 && n->renderer())
n->renderer()->calcMinMaxWidth();
#endif
return true;
@@ -316,7 +316,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
bool handled = false;
// switch according to the element to insert
- switch(id)
+ switch(_id)
{
case ID_COMMENT:
break;
@@ -351,7 +351,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
if ( head ) {
DOM::NodeImpl *newNode = head->addChild(n);
if ( newNode ) {
- pushBlock(id, tagPriority[id]);
+ pushBlock(_id, tagPriority[_id]);
current = newNode;
#if SPEED_DEBUG < 2
if(!n->attached() && HTMLWidget)
@@ -455,7 +455,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
switch(current->id())
{
case ID_HTML:
- switch(id)
+ switch(_id)
{
case ID_SCRIPT:
case ID_STYLE:
@@ -493,7 +493,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
break;
case ID_HEAD:
// we can get here only if the element is not allowed in head.
- if (id == ID_HTML)
+ if (_id == ID_HTML)
return false;
else {
// This means the body starts here...
@@ -508,7 +508,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
case ID_BODY:
break;
case ID__KONQBLOCK:
- switch( id ) {
+ switch( _id ) {
case ID_THEAD:
case ID_TFOOT:
case ID_TBODY:
@@ -520,7 +520,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
// and go ahead!
popBlock( ID__KONQBLOCK );
haveKonqBlock = false;
- handled = checkChild( current->id(), id );
+ handled = checkChild( current->id(), _id );
break;
default:
break;
@@ -531,7 +531,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
case ID_TFOOT:
case ID_TBODY:
case ID_TR:
- switch(id)
+ switch(_id)
{
case ID_TABLE:
popBlock(ID_TABLE); // end the table
@@ -558,7 +558,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
( parent->id() == ID_THEAD ||
parent->id() == ID_TBODY ||
parent->id() == ID_TFOOT ) && parentparent->id() == ID_TABLE ) ||
- ( !checkChild( ID_TR, id ) && ( node->id() == ID_THEAD || node->id() == ID_TBODY || node->id() == ID_TFOOT ) &&
+ ( !checkChild( ID_TR, _id ) && ( node->id() == ID_THEAD || node->id() == ID_TBODY || node->id() == ID_TFOOT ) &&
parent->id() == ID_TABLE ) )
{
node = ( node->id() == ID_TR ) ? parentparent : parent;
@@ -594,7 +594,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
} // end switch
break;
case ID_OBJECT:
- discard_until = id + ID_CLOSE_TAG;
+ discard_until = _id + ID_CLOSE_TAG;
return false;
case ID_UL:
case ID_OL:
@@ -631,12 +631,12 @@ bool KHTMLParser::insertNode(NodeImpl *n)
}
break;
case ID_OPTION:
- if (id == ID_OPTGROUP)
+ if (_id == ID_OPTGROUP)
{
popBlock(ID_OPTION);
handled = true;
}
- else if(id == ID_SELECT)
+ else if(_id == ID_SELECT)
{
// IE treats a nested select as </select>. Let's do the same
popBlock( ID_SELECT );
@@ -689,7 +689,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
{
NodeImpl *n = 0;
- switch(t->id)
+ switch(t->_id)
{
case ID_HTML:
n = new HTMLHtmlElementImpl(document);
@@ -800,12 +800,12 @@ NodeImpl *KHTMLParser::getElement(Token* t)
n = new HTMLDListElementImpl(document);
break;
case ID_DD:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
popBlock(ID_DT);
popBlock(ID_DD);
break;
case ID_DT:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
popBlock(ID_DD);
popBlock(ID_DT);
break;
@@ -850,7 +850,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_H4:
case ID_H5:
case ID_H6:
- n = new HTMLHeadingElementImpl(document, t->id);
+ n = new HTMLHeadingElementImpl(document, t->_id);
break;
case ID_HR:
n = new HTMLHRElementImpl(document);
@@ -874,7 +874,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
// ins/del
case ID_DEL:
case ID_INS:
- n = new HTMLModElementImpl(document, t->id);
+ n = new HTMLModElementImpl(document, t->_id);
break;
// anchor
@@ -920,7 +920,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
break;
case ID_COLGROUP:
case ID_COL:
- n = new HTMLTableColElementImpl(document, t->id);
+ n = new HTMLTableColElementImpl(document, t->_id);
break;
case ID_TR:
popBlock(ID_TR);
@@ -930,7 +930,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_TH:
popBlock(ID_TH);
popBlock(ID_TD);
- n = new HTMLTableCellElementImpl(document, t->id);
+ n = new HTMLTableCellElementImpl(document, t->_id);
break;
case ID_TBODY:
case ID_THEAD:
@@ -938,7 +938,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
popBlock( ID_THEAD );
popBlock( ID_TBODY );
popBlock( ID_TFOOT );
- n = new HTMLTableSectionElementImpl(document, t->id);
+ n = new HTMLTableSectionElementImpl(document, t->_id);
break;
// inline elements
@@ -955,7 +955,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_ADDRESS:
case ID_CENTER:
case ID_LISTING:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
break;
// inline
// %fontstyle
@@ -984,7 +984,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_SUB:
case ID_SUP:
case ID_SPAN:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
break;
case ID_BDO:
@@ -1017,7 +1017,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
#endif
break;
default:
- kdDebug( 6035 ) << "Unknown tag " << t->id << "!" << endl;
+ kdDebug( 6035 ) << "Unknown tag " << t->_id << "!" << endl;
}
return n;
}
@@ -1025,7 +1025,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
void KHTMLParser::processCloseTag(Token *t)
{
// support for really broken html. Can't believe I'm supporting such crap (lars)
- switch(t->id)
+ switch(t->_id)
{
case ID_HTML+ID_CLOSE_TAG:
case ID_BODY+ID_CLOSE_TAG:
@@ -1064,7 +1064,7 @@ void KHTMLParser::processCloseTag(Token *t)
child = child->nextSibling();
}
#endif
- popBlock(t->id-ID_CLOSE_TAG);
+ popBlock(t->_id-ID_CLOSE_TAG);
#ifdef PARSER_DEBUG
kdDebug( 6035 ) << "closeTag --> current = " << current->nodeName().string() << endl;
#endif
@@ -1087,13 +1087,13 @@ void KHTMLParser::popBlock( int _id )
#ifdef PARSER_DEBUG
kdDebug( 6035 ) << "popBlock(" << getTagName(_id).string() << ")" << endl;
while(Elem) {
- kdDebug( 6035) << " > " << getTagName(Elem->id).string() << endl;
+ kdDebug( 6035) << " > " << getTagName(Elem->_id).string() << endl;
Elem = Elem->next;
}
Elem = blockStack;
#endif
- while( Elem && (Elem->id != _id))
+ while( Elem && (Elem->_id != _id))
{
if (maxLevel < Elem->level)
{
@@ -1108,7 +1108,7 @@ void KHTMLParser::popBlock( int _id )
while (Elem)
{
- if (Elem->id == _id)
+ if (Elem->_id == _id)
{
popOneBlock();
Elem = 0;
@@ -1129,7 +1129,7 @@ void KHTMLParser::popOneBlock()
#ifndef PARSER_DEBUG
if(!Elem) return;
#else
- kdDebug( 6035 ) << "popping block: " << getTagName(Elem->id).string() << "(" << Elem->id << ")" << endl;
+ kdDebug( 6035 ) << "popping block: " << getTagName(Elem->_id).string() << "(" << Elem->_id << ")" << endl;
#endif
#if SPEED_DEBUG < 1
@@ -1137,7 +1137,7 @@ void KHTMLParser::popOneBlock()
if(current->renderer()) current->renderer()->close();
#endif
- removeForbidden(Elem->id, forbiddenTag);
+ removeForbidden(Elem->_id, forbiddenTag);
blockStack = Elem->next;
// we only set inline to false, if the element we close is a block level element.
diff --git a/WebCore/src/kdelibs/khtml/html/htmlparser.cpp b/WebCore/src/kdelibs/khtml/html/htmlparser.cpp
index 47342aa..d59106d 100644
--- a/WebCore/src/kdelibs/khtml/html/htmlparser.cpp
+++ b/WebCore/src/kdelibs/khtml/html/htmlparser.cpp
@@ -72,13 +72,13 @@ public:
HTMLStackElem * _next
)
:
- id(_id),
+ _id(_id),
level(_level),
node(_node),
next(_next)
{ }
- int id;
+ int _id;
int level;
NodeImpl *node;
HTMLStackElem *next;
@@ -185,39 +185,39 @@ void KHTMLParser::reset()
void KHTMLParser::parseToken(Token *t)
{
- if (t->id > 2*ID_CLOSE_TAG)
+ if (t->_id > 2*ID_CLOSE_TAG)
{
- kdDebug( 6035 ) << "Unknown tag!! tagID = " << t->id << endl;
+ kdDebug( 6035 ) << "Unknown tag!! tagID = " << t->_id << endl;
return;
}
if(discard_until) {
- if(t->id == discard_until)
+ if(t->_id == discard_until)
discard_until = 0;
// do not skip </iframe>
- if ( discard_until || current->id() + ID_CLOSE_TAG != t->id )
+ if ( discard_until || current->id() + ID_CLOSE_TAG != t->_id )
return;
}
#ifdef PARSER_DEBUG
- kdDebug( 6035 ) << "\n\n==> parser: processing token " << getTagName(t->id).string() << "(" << t->id << ")"
+ kdDebug( 6035 ) << "\n\n==> parser: processing token " << getTagName(t->_id).string() << "(" << t->_id << ")"
<< " current = " << getTagName(current->id()).string() << "(" << current->id() << ")" << endl;
kdDebug(6035) << "inline=" << _inline << " inBody=" << inBody << " noRealBody=" << noRealBody << " haveFrameSet=" << haveFrameSet << endl;
#endif
// holy shit. apparently some sites use </br> instead of <br>
// be compatible with IE and NS
- if(t->id == ID_BR+ID_CLOSE_TAG && document->document()->parseMode() != DocumentImpl::Strict)
- t->id -= ID_CLOSE_TAG;
+ if(t->_id == ID_BR+ID_CLOSE_TAG && document->document()->parseMode() != DocumentImpl::Strict)
+ t->_id -= ID_CLOSE_TAG;
- if(t->id > ID_CLOSE_TAG)
+ if(t->_id > ID_CLOSE_TAG)
{
processCloseTag(t);
return;
}
// ignore spaces, if we're not inside a paragraph or other inline code
- if( t->id == ID_TEXT ) {
+ if( t->_id == ID_TEXT ) {
#ifdef PARSER_DEBUG
if(t->text)
kdDebug(6035) << "length="<< t->text->l << " text='" << QConstString(t->text->s, t->text->l).string() << "'" << endl;
@@ -239,12 +239,12 @@ void KHTMLParser::parseToken(Token *t)
// take care of optional close tags
if(endTag[e->id()] == DOM::OPTIONAL)
- popBlock(t->id);
+ popBlock(t->_id);
}
// if this tag is forbidden inside the current context, pop
// blocks until we are allowed to add it...
- while(forbiddenTag[t->id]) popOneBlock();
+ while(forbiddenTag[t->_id]) popOneBlock();
if ( !insertNode(n) ) {
// we couldn't insert the node...
@@ -271,7 +271,7 @@ void KHTMLParser::parseToken(Token *t)
bool KHTMLParser::insertNode(NodeImpl *n)
{
- int id = n->id();
+ int _id = n->id();
// let's be stupid and just try to insert it.
// this should work if the document is wellformed
@@ -284,9 +284,9 @@ bool KHTMLParser::insertNode(NodeImpl *n)
kdDebug( 6035 ) << "added " << n->nodeName().string() << " to " << tmp->nodeName().string() << ", new current=" << newNode->nodeName().string() << endl;
#endif
// don't push elements without end tag on the stack
- if(tagPriority[id] != 0 && !flat)
+ if(tagPriority[_id] != 0 && !flat)
{
- pushBlock(id, tagPriority[id]);
+ pushBlock(_id, tagPriority[_id]);
current = newNode;
#if SPEED_DEBUG < 2
if(!n->attached() && HTMLWidget ) n->attach();
@@ -303,7 +303,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
}
#if SPEED_DEBUG < 1
- if(tagPriority[id] == 0 && n->renderer())
+ if(tagPriority[_id] == 0 && n->renderer())
n->renderer()->calcMinMaxWidth();
#endif
return true;
@@ -316,7 +316,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
bool handled = false;
// switch according to the element to insert
- switch(id)
+ switch(_id)
{
case ID_COMMENT:
break;
@@ -351,7 +351,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
if ( head ) {
DOM::NodeImpl *newNode = head->addChild(n);
if ( newNode ) {
- pushBlock(id, tagPriority[id]);
+ pushBlock(_id, tagPriority[_id]);
current = newNode;
#if SPEED_DEBUG < 2
if(!n->attached() && HTMLWidget)
@@ -455,7 +455,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
switch(current->id())
{
case ID_HTML:
- switch(id)
+ switch(_id)
{
case ID_SCRIPT:
case ID_STYLE:
@@ -493,7 +493,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
break;
case ID_HEAD:
// we can get here only if the element is not allowed in head.
- if (id == ID_HTML)
+ if (_id == ID_HTML)
return false;
else {
// This means the body starts here...
@@ -508,7 +508,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
case ID_BODY:
break;
case ID__KONQBLOCK:
- switch( id ) {
+ switch( _id ) {
case ID_THEAD:
case ID_TFOOT:
case ID_TBODY:
@@ -520,7 +520,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
// and go ahead!
popBlock( ID__KONQBLOCK );
haveKonqBlock = false;
- handled = checkChild( current->id(), id );
+ handled = checkChild( current->id(), _id );
break;
default:
break;
@@ -531,7 +531,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
case ID_TFOOT:
case ID_TBODY:
case ID_TR:
- switch(id)
+ switch(_id)
{
case ID_TABLE:
popBlock(ID_TABLE); // end the table
@@ -558,7 +558,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
( parent->id() == ID_THEAD ||
parent->id() == ID_TBODY ||
parent->id() == ID_TFOOT ) && parentparent->id() == ID_TABLE ) ||
- ( !checkChild( ID_TR, id ) && ( node->id() == ID_THEAD || node->id() == ID_TBODY || node->id() == ID_TFOOT ) &&
+ ( !checkChild( ID_TR, _id ) && ( node->id() == ID_THEAD || node->id() == ID_TBODY || node->id() == ID_TFOOT ) &&
parent->id() == ID_TABLE ) )
{
node = ( node->id() == ID_TR ) ? parentparent : parent;
@@ -594,7 +594,7 @@ bool KHTMLParser::insertNode(NodeImpl *n)
} // end switch
break;
case ID_OBJECT:
- discard_until = id + ID_CLOSE_TAG;
+ discard_until = _id + ID_CLOSE_TAG;
return false;
case ID_UL:
case ID_OL:
@@ -631,12 +631,12 @@ bool KHTMLParser::insertNode(NodeImpl *n)
}
break;
case ID_OPTION:
- if (id == ID_OPTGROUP)
+ if (_id == ID_OPTGROUP)
{
popBlock(ID_OPTION);
handled = true;
}
- else if(id == ID_SELECT)
+ else if(_id == ID_SELECT)
{
// IE treats a nested select as </select>. Let's do the same
popBlock( ID_SELECT );
@@ -689,7 +689,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
{
NodeImpl *n = 0;
- switch(t->id)
+ switch(t->_id)
{
case ID_HTML:
n = new HTMLHtmlElementImpl(document);
@@ -800,12 +800,12 @@ NodeImpl *KHTMLParser::getElement(Token* t)
n = new HTMLDListElementImpl(document);
break;
case ID_DD:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
popBlock(ID_DT);
popBlock(ID_DD);
break;
case ID_DT:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
popBlock(ID_DD);
popBlock(ID_DT);
break;
@@ -850,7 +850,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_H4:
case ID_H5:
case ID_H6:
- n = new HTMLHeadingElementImpl(document, t->id);
+ n = new HTMLHeadingElementImpl(document, t->_id);
break;
case ID_HR:
n = new HTMLHRElementImpl(document);
@@ -874,7 +874,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
// ins/del
case ID_DEL:
case ID_INS:
- n = new HTMLModElementImpl(document, t->id);
+ n = new HTMLModElementImpl(document, t->_id);
break;
// anchor
@@ -920,7 +920,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
break;
case ID_COLGROUP:
case ID_COL:
- n = new HTMLTableColElementImpl(document, t->id);
+ n = new HTMLTableColElementImpl(document, t->_id);
break;
case ID_TR:
popBlock(ID_TR);
@@ -930,7 +930,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_TH:
popBlock(ID_TH);
popBlock(ID_TD);
- n = new HTMLTableCellElementImpl(document, t->id);
+ n = new HTMLTableCellElementImpl(document, t->_id);
break;
case ID_TBODY:
case ID_THEAD:
@@ -938,7 +938,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
popBlock( ID_THEAD );
popBlock( ID_TBODY );
popBlock( ID_TFOOT );
- n = new HTMLTableSectionElementImpl(document, t->id);
+ n = new HTMLTableSectionElementImpl(document, t->_id);
break;
// inline elements
@@ -955,7 +955,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_ADDRESS:
case ID_CENTER:
case ID_LISTING:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
break;
// inline
// %fontstyle
@@ -984,7 +984,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
case ID_SUB:
case ID_SUP:
case ID_SPAN:
- n = new HTMLGenericElementImpl(document, t->id);
+ n = new HTMLGenericElementImpl(document, t->_id);
break;
case ID_BDO:
@@ -1017,7 +1017,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
#endif
break;
default:
- kdDebug( 6035 ) << "Unknown tag " << t->id << "!" << endl;
+ kdDebug( 6035 ) << "Unknown tag " << t->_id << "!" << endl;
}
return n;
}
@@ -1025,7 +1025,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
void KHTMLParser::processCloseTag(Token *t)
{
// support for really broken html. Can't believe I'm supporting such crap (lars)
- switch(t->id)
+ switch(t->_id)
{
case ID_HTML+ID_CLOSE_TAG:
case ID_BODY+ID_CLOSE_TAG:
@@ -1064,7 +1064,7 @@ void KHTMLParser::processCloseTag(Token *t)
child = child->nextSibling();
}
#endif
- popBlock(t->id-ID_CLOSE_TAG);
+ popBlock(t->_id-ID_CLOSE_TAG);
#ifdef PARSER_DEBUG
kdDebug( 6035 ) << "closeTag --> current = " << current->nodeName().string() << endl;
#endif
@@ -1087,13 +1087,13 @@ void KHTMLParser::popBlock( int _id )
#ifdef PARSER_DEBUG
kdDebug( 6035 ) << "popBlock(" << getTagName(_id).string() << ")" << endl;
while(Elem) {
- kdDebug( 6035) << " > " << getTagName(Elem->id).string() << endl;
+ kdDebug( 6035) << " > " << getTagName(Elem->_id).string() << endl;
Elem = Elem->next;
}
Elem = blockStack;
#endif
- while( Elem && (Elem->id != _id))
+ while( Elem && (Elem->_id != _id))
{
if (maxLevel < Elem->level)
{
@@ -1108,7 +1108,7 @@ void KHTMLParser::popBlock( int _id )
while (Elem)
{
- if (Elem->id == _id)
+ if (Elem->_id == _id)
{
popOneBlock();
Elem = 0;
@@ -1129,7 +1129,7 @@ void KHTMLParser::popOneBlock()
#ifndef PARSER_DEBUG
if(!Elem) return;
#else
- kdDebug( 6035 ) << "popping block: " << getTagName(Elem->id).string() << "(" << Elem->id << ")" << endl;
+ kdDebug( 6035 ) << "popping block: " << getTagName(Elem->_id).string() << "(" << Elem->_id << ")" << endl;
#endif
#if SPEED_DEBUG < 1
@@ -1137,7 +1137,7 @@ void KHTMLParser::popOneBlock()
if(current->renderer()) current->renderer()->close();
#endif
- removeForbidden(Elem->id, forbiddenTag);
+ removeForbidden(Elem->_id, forbiddenTag);
blockStack = Elem->next;
// we only set inline to false, if the element we close is a block level element.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list