[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:10:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 95b0257975d8c6f4a8f3cde21fc3690c19c9597f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 3 21:11:49 2002 +0000
Eliminate the KONQBLOCK hack. Fixes ipodhacks.com (a mislayout
caused by malformed html... <table><br>...)
r=mjs
* khtml/css/html4.css:
* khtml/html/dtd.cpp:
(DOM::checkChild):
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::isInline):
* khtml/html/htmlparser.cpp:
(KHTMLParser::reset):
(KHTMLParser::insertNode):
* khtml/html/htmlparser.h:
* khtml/misc/htmltags.c:
(hash_tag):
(findTag):
* khtml/misc/htmltags.h:
* khtml/misc/htmltags.in:
* khtml/rendering/render_flow.cpp:
(RenderFlow::layoutBlockChildren):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2906 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6ab04e3..95f2169 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,27 @@
+2002-12-03 David Hyatt <hyatt at apple.com>
+
+ Eliminate the KONQBLOCK hack. Fixes ipodhacks.com (a mislayout
+ caused by malformed html... <table><br>...)
+
+ r=mjs
+
+ * khtml/css/html4.css:
+ * khtml/html/dtd.cpp:
+ (DOM::checkChild):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isInline):
+ * khtml/html/htmlparser.cpp:
+ (KHTMLParser::reset):
+ (KHTMLParser::insertNode):
+ * khtml/html/htmlparser.h:
+ * khtml/misc/htmltags.c:
+ (hash_tag):
+ (findTag):
+ * khtml/misc/htmltags.h:
+ * khtml/misc/htmltags.in:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::layoutBlockChildren):
+
2002-12-02 David Hyatt <hyatt at apple.com>
Fix for 3032557, wsj.com DHTML elements in the wrong position.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6ab04e3..95f2169 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,27 @@
+2002-12-03 David Hyatt <hyatt at apple.com>
+
+ Eliminate the KONQBLOCK hack. Fixes ipodhacks.com (a mislayout
+ caused by malformed html... <table><br>...)
+
+ r=mjs
+
+ * khtml/css/html4.css:
+ * khtml/html/dtd.cpp:
+ (DOM::checkChild):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isInline):
+ * khtml/html/htmlparser.cpp:
+ (KHTMLParser::reset):
+ (KHTMLParser::insertNode):
+ * khtml/html/htmlparser.h:
+ * khtml/misc/htmltags.c:
+ (hash_tag):
+ (findTag):
+ * khtml/misc/htmltags.h:
+ * khtml/misc/htmltags.in:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::layoutBlockChildren):
+
2002-12-02 David Hyatt <hyatt at apple.com>
Fix for 3032557, wsj.com DHTML elements in the wrong position.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6ab04e3..95f2169 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,27 @@
+2002-12-03 David Hyatt <hyatt at apple.com>
+
+ Eliminate the KONQBLOCK hack. Fixes ipodhacks.com (a mislayout
+ caused by malformed html... <table><br>...)
+
+ r=mjs
+
+ * khtml/css/html4.css:
+ * khtml/html/dtd.cpp:
+ (DOM::checkChild):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isInline):
+ * khtml/html/htmlparser.cpp:
+ (KHTMLParser::reset):
+ (KHTMLParser::insertNode):
+ * khtml/html/htmlparser.h:
+ * khtml/misc/htmltags.c:
+ (hash_tag):
+ (findTag):
+ * khtml/misc/htmltags.h:
+ * khtml/misc/htmltags.in:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::layoutBlockChildren):
+
2002-12-02 David Hyatt <hyatt at apple.com>
Fix for 3032557, wsj.com DHTML elements in the wrong position.
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index 81ed217..65141da 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -67,12 +67,6 @@ div {
display: block;
}
-/* to force a block level context for some cases (broken HTML) */
-
--konqblock {
- display: block;
-}
-
layer {
display: block;
}
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 51367f2..8f52588 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -97,7 +97,6 @@ const unsigned short DOM::tagPriority[] = {
0, // ID_ISINDEX
1, // ID_KBD
0, // ID_KEYGEN
- 5, // ID__KONQBLOCK
1, // ID_LABEL
1, // ID_LAYER
1, // ID_LEGEND
@@ -204,7 +203,6 @@ const tagStatus DOM::endTag[] = {
FORBIDDEN, // ID_ISINDEX
REQUIRED, // ID_KBD
REQUIRED, // ID_KEYGEN
- REQUIRED, // ID__KONQBLOCK
REQUIRED, // ID_LABEL
REQUIRED, // ID_LAYER
REQUIRED, // ID_LEGEND
@@ -378,7 +376,6 @@ static const ushort tag_list_1[] = {
ID_COMMENT,
ID_LI,
ID_XMP,
- ID__KONQBLOCK,
ID_INS,
ID_DEL,
ID_NOBR,
@@ -423,7 +420,6 @@ static const ushort tag_list_3[] = {
ID_COMMENT,
ID_LI,
ID_XMP,
- ID__KONQBLOCK,
ID_MARQUEE,
0
};
@@ -631,9 +627,6 @@ bool DOM::checkChild(ushort tagID, ushort childID)
// ADDRESS: ( _0 | P ) *
if( check_array(childID, tag_list_0) ) return true;
return (childID == ID_P);
- case ID__KONQBLOCK:
- if ( childID == ID__KONQBLOCK ) return false;
- // Fall through!
case ID_LI:
case ID_DT:
case ID_DIV:
@@ -727,6 +720,7 @@ bool DOM::checkChild(ushort tagID, ushort childID)
case ID_TEXT:
case ID_FORM:
case ID_COMMENT:
+ case ID_SCRIPT:
return true;
default:
return false;
@@ -735,7 +729,9 @@ bool DOM::checkChild(ushort tagID, ushort childID)
case ID_TFOOT:
case ID_TBODY:
// THEAD: TR +
- if(childID == ID_FORM || childID == ID_TR || childID == ID_TEXT || childID == ID_COMMENT) return true;
+ if(childID == ID_FORM || childID == ID_TR || childID == ID_TEXT || childID == ID_COMMENT ||
+ childID == ID_SCRIPT)
+ return true;
return false;
case ID_COLGROUP:
// COLGROUP: COL *
@@ -743,6 +739,8 @@ bool DOM::checkChild(ushort tagID, ushort childID)
return false;
case ID_TR:
// TR: _9 +
+ if (childID == ID_SCRIPT)
+ return true;
return check_array(childID, tag_list_9);
case ID_FRAMESET:
// FRAMESET: ( _10 + & NOFRAMES ? )
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 9699175..410ace0 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -96,6 +96,7 @@ bool HTMLElementImpl::isInline() const
case ID_NOBR:
case ID_WBR:
return true;
+
default:
return ElementImpl::isInline();
}
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 13c8a02..060cc08 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -180,8 +180,7 @@ void KHTMLParser::reset()
head = 0;
end = false;
isindex = 0;
- haveKonqBlock = false;
-
+
discard_until = 0;
discardedStackPos = 0;
@@ -521,14 +520,6 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
return false;
return true;
}
- case ID_TD:
- case ID_TH:
- // lets try to close the konqblock
- if ( haveKonqBlock ) {
- popBlock( ID__KONQBLOCK );
- haveKonqBlock = false;
- return insertNode( n );
- }
default:
break;
}
@@ -593,25 +584,6 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
return insertNode(n, flat);
}
break;
- case ID__KONQBLOCK:
- switch( id ) {
- case ID_THEAD:
- case ID_TFOOT:
- case ID_TBODY:
- case ID_TR:
- case ID_TD:
- case ID_TH:
- // now the actual table contents starts
- // lets close our anonymous block before the table
- // and go ahead!
- popBlock( ID__KONQBLOCK );
- haveKonqBlock = false;
- handled = checkChild( current->id(), id );
- break;
- default:
- break;
- }
- break;
case ID_TABLE:
case ID_THEAD:
case ID_TFOOT:
@@ -652,24 +624,14 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
node = ( node->id() == ID_TR ) ? parentparent : parent;
NodeImpl *parent = node->parentNode();
int exceptioncode = 0;
- NodeImpl *container = new HTMLGenericElementImpl( document, ID__KONQBLOCK );
- parent->insertBefore( container, node, exceptioncode );
+ parent->insertBefore( n, node, exceptioncode );
if ( exceptioncode ) {
#ifdef PARSER_DEBUG
- kdDebug( 6035 ) << "adding anonymous container before table failed!" << endl;
+ kdDebug( 6035 ) << "adding content before table failed!" << endl;
#endif
break;
}
- if ( !container->attached() && HTMLWidget ) {
- container->init();
- if (!container->attached())
- container->attach();
- }
- pushBlock( ID__KONQBLOCK, tagPriority[ID__KONQBLOCK] );
- haveKonqBlock = true;
- current = container;
- handled = true;
- break;
+ return true;
}
if ( current->id() == ID_TR )
diff --git a/WebCore/khtml/html/htmlparser.h b/WebCore/khtml/html/htmlparser.h
index c68fdb3..db9bf55 100644
--- a/WebCore/khtml/html/htmlparser.h
+++ b/WebCore/khtml/html/htmlparser.h
@@ -161,7 +161,6 @@ protected:
bool haveContent;
bool haveFrameSet;
bool end;
- bool haveKonqBlock;
bool inSelect;
/*
diff --git a/WebCore/khtml/misc/htmltags.c b/WebCore/khtml/misc/htmltags.c
index b9b20d9..850a3e1 100644
--- a/WebCore/khtml/misc/htmltags.c
+++ b/WebCore/khtml/misc/htmltags.c
@@ -7,7 +7,7 @@ struct tags {
const char *name;
int id;
};
-/* maximum key range = 395, duplicates = 1 */
+/* maximum key range = 305, duplicates = 1 */
#ifdef __GNUC__
__inline
@@ -21,32 +21,32 @@ hash_tag (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 0, 396, 396, 396, 30,
- 40, 50, 55, 10, 20, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 0, 105, 115,
- 35, 0, 65, 100, 10, 10, 0, 35, 45, 25,
- 20, 0, 20, 25, 5, 30, 0, 60, 10, 5,
- 20, 40, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 25,
+ 30, 35, 40, 10, 15, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 0, 5, 30,
+ 35, 0, 105, 5, 47, 10, 0, 25, 45, 30,
+ 15, 0, 100, 25, 5, 30, 0, 87, 90, 0,
+ 20, 115, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
+ 306, 306, 306, 306, 306, 306
};
register int hval = len;
@@ -86,185 +86,173 @@ findTag (register const char *str, register unsigned int len)
{
enum
{
- TOTAL_KEYWORDS = 105,
+ TOTAL_KEYWORDS = 104,
MIN_WORD_LENGTH = 1,
MAX_WORD_LENGTH = 10,
MIN_HASH_VALUE = 1,
- MAX_HASH_VALUE = 395
+ MAX_HASH_VALUE = 305
};
static const unsigned char lengthtable[] =
{
- 1, 2, 2, 4, 1, 2, 2, 3, 1, 2, 1, 2, 3, 4,
- 1, 2, 8, 2, 2, 2, 2, 3, 4, 5, 2, 3, 5, 6,
- 2, 3, 5, 1, 2, 3, 2, 3, 5, 2, 4, 4, 2, 3,
- 4, 6, 4, 6, 5, 4, 5, 1, 2, 4, 6, 2, 3, 4,
- 5, 7, 3, 5, 7, 3, 9, 4, 7, 8, 4, 3, 4, 5,
- 7, 3, 6, 5, 8, 4, 5, 6, 6, 3, 5, 7, 3, 4,
- 5, 6, 6, 7, 8, 6, 3, 5, 6, 6, 8, 7, 8, 3,
- 4, 7, 6, 8, 8, 10, 10
+ 1, 2, 1, 2, 4, 1, 2, 3, 4, 3, 1, 4, 1, 2,
+ 8, 4, 2, 2, 4, 6, 3, 4, 2, 3, 2, 5, 3, 2,
+ 5, 6, 2, 3, 2, 5, 6, 2, 3, 4, 2, 2, 5, 6,
+ 3, 2, 2, 3, 2, 4, 5, 1, 2, 7, 3, 4, 5, 1,
+ 6, 6, 3, 5, 6, 6, 7, 4, 3, 4, 7, 6, 3, 2,
+ 4, 3, 5, 7, 4, 5, 4, 3, 7, 5, 6, 3, 4, 5,
+ 7, 8, 4, 6, 5, 8, 6, 7, 8, 5, 8, 9, 7, 5,
+ 3, 10, 8, 6, 8, 8
};
static const struct tags wordlist_tag[] =
{
{"a", ID_A},
{"tt", ID_TT},
+ {"b", ID_B},
{"tr", ID_TR},
{"area", ID_AREA},
{"i", ID_I},
- {"th", ID_TH},
- {"hr", ID_HR},
- {"var", ID_VAR},
- {"p", ID_P},
- {"h5", ID_H5},
+ {"br", ID_BR},
+ {"wbr", ID_WBR},
+ {"abbr", ID_ABBR},
+ {"big", ID_BIG},
{"q", ID_Q},
- {"em", ID_EM},
- {"pre", ID_PRE},
- {"meta", ID_META},
+ {"nobr", ID_NOBR},
{"s", ID_S},
- {"h6", ID_H6},
+ {"em", ID_EM},
{"textarea", ID_TEXTAREA},
+ {"meta", ID_META},
{"dt", ID_DT},
{"td", ID_TD},
- {"h1", ID_H1},
+ {"base", ID_BASE},
+ {"object", ID_OBJECT},
+ {"bdo", ID_BDO},
+ {"cite", ID_CITE},
{"ol", ID_OL},
- {"map", ID_MAP},
- {"head", ID_HEAD},
- {"thead", ID_THEAD},
- {"h2", ID_H2},
+ {"img", ID_IMG},
+ {"th", ID_TH},
+ {"image", ID_IMG},
{"dir", ID_DIR},
- {"param", ID_PARAM},
- {"option", ID_OPTION},
+ {"hr", ID_HR},
+ {"table", ID_TABLE},
+ {"center", ID_CENTER},
{"li", ID_LI},
- {"div", ID_DIV},
- {"title", ID_TITLE},
- {"u", ID_U},
- {"h3", ID_H3},
{"ins", ID_INS},
- {"h4", ID_H4},
- {"xmp", ID_XMP},
- {"tfoot", ID_TFOOT},
+ {"h5", ID_H5},
+ {"title", ID_TITLE},
+ {"strong", ID_STRONG},
+ {"h6", ID_H6},
+ {"kbd", ID_KBD},
+ {"code", ID_CODE},
{"dd", ID_DD},
- {"span", ID_SPAN},
- {"samp", ID_SAMP},
+ {"h1", ID_H1},
+ {"embed", ID_EMBED},
+ {"strike", ID_STRIKE},
+ {"col", ID_COL},
+ {"h2", ID_H2},
{"dl", ID_DL},
{"del", ID_DEL},
- {"html", ID_HTML},
- {"strike", ID_STRIKE},
+ {"h3", ID_H3},
+ {"head", ID_HEAD},
+ {"thead", ID_THEAD},
+ {"u", ID_U},
+ {"h4", ID_H4},
+ {"noembed", ID_NOEMBED},
+ {"var", ID_VAR},
+ {"link", ID_LINK},
+ {"label", ID_LABEL},
+ {"p", ID_P},
+ {"anchor", ID_A},
+ {"legend", ID_LEGEND},
+ {"pre", ID_PRE},
+ {"tfoot", ID_TFOOT},
+ {"select", ID_SELECT},
+ {"button", ID_BUTTON},
+ {"listing", ID_PRE},
{"font", ID_FONT},
- {"applet", ID_APPLET},
- {"layer", ID_LAYER},
- {"form", ID_FORM},
- {"frame", ID_FRAME},
- {"b", ID_B},
+ {"sub", ID_SUB},
+ {"html", ID_HTML},
+ {"isindex", ID_ISINDEX},
+ {"option", ID_OPTION},
+ {"map", ID_MAP},
{"ul", ID_UL},
{"menu", ID_MENU},
- {"iframe", ID_IFRAME},
- {"br", ID_BR},
- {"sup", ID_SUP},
- {"link", ID_LINK},
- {"input", ID_INPUT},
- {"nolayer", ID_NOLAYER},
- {"wbr", ID_WBR},
- {"style", ID_STYLE},
- {"marquee", ID_MARQUEE},
- {"dfn", ID_DFN},
- {"plaintext", ID_PLAINTEXT},
- {"cite", ID_CITE},
- {"isindex", ID_ISINDEX},
- {"frameset", ID_FRAMESET},
- {"nobr", ID_NOBR},
- {"img", ID_IMG},
- {"base", ID_BASE},
- {"image", ID_IMG},
+ {"div", ID_DIV},
+ {"param", ID_PARAM},
{"address", ID_ADDRESS},
- {"bdo", ID_BDO},
- {"center", ID_CENTER},
+ {"form", ID_FORM},
+ {"frame", ID_FRAME},
+ {"span", ID_SPAN},
+ {"xmp", ID_XMP},
+ {"marquee", ID_MARQUEE},
{"small", ID_SMALL},
- {"noframes", ID_NOFRAMES},
- {"code", ID_CODE},
- {"table", ID_TABLE},
- {"anchor", ID_A},
- {"strong", ID_STRONG},
- {"col", ID_COL},
- {"embed", ID_EMBED},
- {"caption", ID_CAPTION},
- {"kbd", ID_KBD},
+ {"iframe", ID_IFRAME},
+ {"dfn", ID_DFN},
{"body", ID_BODY},
{"tbody", ID_TBODY},
- {"script", ID_SCRIPT},
- {"button", ID_BUTTON},
- {"noembed", ID_NOEMBED},
- {"fieldset", ID_FIELDSET},
- {"select", ID_SELECT},
- {"sub", ID_SUB},
- {"label", ID_LABEL},
+ {"caption", ID_CAPTION},
+ {"basefont", ID_BASEFONT},
+ {"samp", ID_SAMP},
{"keygen", ID_KEYGEN},
- {"legend", ID_LEGEND},
+ {"layer", ID_LAYER},
+ {"frameset", ID_FRAMESET},
+ {"script", ID_SCRIPT},
+ {"nolayer", ID_NOLAYER},
+ {"noframes", ID_NOFRAMES},
+ {"style", ID_STYLE},
{"noscript", ID_NOSCRIPT},
+ {"plaintext", ID_PLAINTEXT},
{"acronym", ID_ACRONYM},
- {"optgroup", ID_OPTGROUP},
- {"big", ID_BIG},
- {"abbr", ID_ABBR},
- {"listing", ID_PRE},
- {"object", ID_OBJECT},
- {"basefont", ID_BASEFONT},
+ {"input", ID_INPUT},
+ {"sup", ID_SUP},
+ {"blockquote", ID_BLOCKQUOTE},
+ {"fieldset", ID_FIELDSET},
+ {"applet", ID_APPLET},
{"colgroup", ID_COLGROUP},
- {"-konqblock", ID__KONQBLOCK},
- {"blockquote", ID_BLOCKQUOTE}
+ {"optgroup", ID_OPTGROUP}
};
static const short lookup[] =
{
- -1, 0, 1, -1, -1, -1, -1, 2,
- -1, 3, -1, 4, 5, -1, -1, -1,
- -1, 6, 7, -1, -1, 8, 9, -1,
- -1, -1, 10, 11, 12, 13, -1, 14,
- 15, 16, -1, -1, -1, -144, -88, -2,
- -1, -1, 19, -1, -1, -1, -1, 20,
- 21, 22, 23, -1, 24, 25, -1, 26,
- 27, 28, 29, -1, 30, 31, 32, 33,
- -1, -1, -1, 34, 35, -1, 36, -1,
- 37, -1, 38, -1, -1, -1, -1, 39,
- -1, -1, 40, 41, 42, -1, 43, -1,
- -1, 44, -1, 45, -1, -1, -1, 46,
- -1, -1, -1, 47, 48, -1, -1, -1,
- -1, -1, 49, 50, -1, 51, -1, 52,
- 53, 54, 55, 56, -1, 57, 58, -1,
- 59, -1, 60, 61, 62, -1, -1, -1,
- -1, 63, -1, -1, 64, 65, 66, -1,
- -1, -1, 67, 68, 69, -1, 70, 71,
- -1, -1, 72, -1, -1, -1, 73, -1,
- -1, 74, 75, 76, 77, -1, -1, -1,
- -1, 78, -1, 79, -1, -1, -1, -1,
- -1, -1, 80, -1, 81, -1, -1, -1,
- -1, -1, 82, -1, -1, -1, -1, -1,
- 83, 84, 85, -1, -1, -1, -1, 86,
- 87, 88, -1, -1, 89, -1, 90, -1,
- 91, 92, -1, -1, -1, -1, 93, -1,
- 94, -1, -1, -1, 95, 96, -1, -1,
- -1, -1, 97, 98, -1, -1, 99, -1,
- -1, -1, 100, -1, 101, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 0, 1, -1, -1, -1, 2, 3,
+ -1, 4, -1, 5, 6, 7, -1, -1,
+ -1, -1, -1, 8, -1, -1, -1, 9,
+ -1, -1, 10, -1, -1, 11, -1, 12,
+ 13, 14, 15, -1, -1, -150, -1, 18,
+ -1, 19, -1, 20, 21, -88, -2, 22,
+ 23, 24, 25, -1, -1, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, -1, -1,
+ 35, -1, -1, -1, 36, 37, -1, -1,
+ 38, -1, 39, 40, 41, -1, 42, 43,
+ -1, -1, 44, 45, 46, -1, 47, 48,
+ 49, 50, -1, -1, 51, -1, -1, -1,
+ -1, -1, 52, 53, 54, 55, -1, 56,
+ -1, -1, 57, -1, 58, -1, 59, 60,
+ -1, 61, -1, -1, -1, -1, -1, -1,
+ -1, -1, 62, -1, 63, 64, 65, 66,
+ -1, -1, -1, 67, -1, 68, 69, -1,
+ 70, -1, 71, -1, 72, -1, 73, -1,
+ 74, 75, -1, -1, -1, 76, -1, -1,
+ -1, 77, 78, 79, 80, -1, 81, 82,
+ 83, -1, 84, 85, 86, -1, 87, -1,
+ -1, -1, 88, -1, -1, -1, -1, -1,
+ -1, -1, 89, -1, -1, 90, -1, -1,
+ -1, -1, -1, 91, -1, -1, -1, -1,
+ -1, 92, -1, 93, -1, -1, 94, 95,
+ -1, -1, 96, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 97, -1, -1, 98, -1, -1, -1,
+ -1, -1, -1, 99, -1, -1, -1, -1,
+ -1, 100, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 101, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 102, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 102, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 103, -1,
- -1, -1, -1, 104
+ -1, 103
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -365,7 +353,6 @@ static const char * const tagList[] = {
"ISINDEX",
"KBD",
"KEYGEN",
- "-KONQBLOCK",
"LABEL",
"LAYER",
"LEGEND",
@@ -469,7 +456,6 @@ static const char * const tagList[] = {
"/ISINDEX",
"/KBD",
"/KEYGEN",
- "/-KONQBLOCK",
"/LABEL",
"/LAYER",
"/LEGEND",
diff --git a/WebCore/khtml/misc/htmltags.h b/WebCore/khtml/misc/htmltags.h
index 750832b..487bb74 100644
--- a/WebCore/khtml/misc/htmltags.h
+++ b/WebCore/khtml/misc/htmltags.h
@@ -60,59 +60,58 @@ DOM::DOMString getTagName(unsigned short id);
#define ID_ISINDEX 50
#define ID_KBD 51
#define ID_KEYGEN 52
-#define ID__KONQBLOCK 53
-#define ID_LABEL 54
-#define ID_LAYER 55
-#define ID_LEGEND 56
-#define ID_LI 57
-#define ID_LINK 58
-#define ID_MAP 59
-#define ID_MARQUEE 60
-#define ID_MENU 61
-#define ID_META 62
-#define ID_NOBR 63
-#define ID_NOEMBED 64
-#define ID_NOFRAMES 65
-#define ID_NOSCRIPT 66
-#define ID_NOLAYER 67
-#define ID_OBJECT 68
-#define ID_OL 69
-#define ID_OPTGROUP 70
-#define ID_OPTION 71
-#define ID_P 72
-#define ID_PARAM 73
-#define ID_PLAINTEXT 74
-#define ID_PRE 75
-#define ID_Q 76
-#define ID_S 77
-#define ID_SAMP 78
-#define ID_SCRIPT 79
-#define ID_SELECT 80
-#define ID_SMALL 81
-#define ID_SPAN 82
-#define ID_STRIKE 83
-#define ID_STRONG 84
-#define ID_STYLE 85
-#define ID_SUB 86
-#define ID_SUP 87
-#define ID_TABLE 88
-#define ID_TBODY 89
-#define ID_TD 90
-#define ID_TEXTAREA 91
-#define ID_TFOOT 92
-#define ID_TH 93
-#define ID_THEAD 94
-#define ID_TITLE 95
-#define ID_TR 96
-#define ID_TT 97
-#define ID_U 98
-#define ID_UL 99
-#define ID_VAR 100
-#define ID_WBR 101
-#define ID_XMP 102
-#define ID_TEXT 103
-#define ID_COMMENT 104
-#define ID_CLOSE_TAG 104
-#define ID_LAST_TAG 104
+#define ID_LABEL 53
+#define ID_LAYER 54
+#define ID_LEGEND 55
+#define ID_LI 56
+#define ID_LINK 57
+#define ID_MAP 58
+#define ID_MARQUEE 59
+#define ID_MENU 60
+#define ID_META 61
+#define ID_NOBR 62
+#define ID_NOEMBED 63
+#define ID_NOFRAMES 64
+#define ID_NOSCRIPT 65
+#define ID_NOLAYER 66
+#define ID_OBJECT 67
+#define ID_OL 68
+#define ID_OPTGROUP 69
+#define ID_OPTION 70
+#define ID_P 71
+#define ID_PARAM 72
+#define ID_PLAINTEXT 73
+#define ID_PRE 74
+#define ID_Q 75
+#define ID_S 76
+#define ID_SAMP 77
+#define ID_SCRIPT 78
+#define ID_SELECT 79
+#define ID_SMALL 80
+#define ID_SPAN 81
+#define ID_STRIKE 82
+#define ID_STRONG 83
+#define ID_STYLE 84
+#define ID_SUB 85
+#define ID_SUP 86
+#define ID_TABLE 87
+#define ID_TBODY 88
+#define ID_TD 89
+#define ID_TEXTAREA 90
+#define ID_TFOOT 91
+#define ID_TH 92
+#define ID_THEAD 93
+#define ID_TITLE 94
+#define ID_TR 95
+#define ID_TT 96
+#define ID_U 97
+#define ID_UL 98
+#define ID_VAR 99
+#define ID_WBR 100
+#define ID_XMP 101
+#define ID_TEXT 102
+#define ID_COMMENT 103
+#define ID_CLOSE_TAG 103
+#define ID_LAST_TAG 103
#endif
diff --git a/WebCore/khtml/misc/htmltags.in b/WebCore/khtml/misc/htmltags.in
index b61fcce..e6f5aba 100644
--- a/WebCore/khtml/misc/htmltags.in
+++ b/WebCore/khtml/misc/htmltags.in
@@ -50,7 +50,6 @@ ins
isindex
kbd
keygen
--konqblock
label
layer
legend
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 081bc66..b3ffd30 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -765,12 +765,6 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
m_bottomMarginQuirk = true;
}
- if (element() && element()->id() == ID__KONQBLOCK)
- // Deal with the case where <forms> get wrapped in a KONQBLOCK.
- // We want that form's bottom margin to actually disappear.
- // Don't let any children affect a KONQBLOCK's margins.
- m_maxBottomPosMargin = m_maxBottomNegMargin = m_maxTopPosMargin = m_maxTopNegMargin = 0;
-
setLayouted();
// kdDebug( 6040 ) << "layouted = " << layouted_ << endl;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list