[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:06:36 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ab36c324be9a46ef845df2992270eca4c4965889
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 22 08:48:06 2002 +0000
Fix for the weather.com, slate and espn malformations that
could occur. Also reverting an earlier change for handling
font tags like other inlines. Both FONT and A need to be
given special treatment until I can implement a strategy that
will allow them to be handled just like the other inlines.
* khtml/html/dtd.cpp:
(DOM::checkChild):
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::isInline):
* khtml/html/html_elementimpl.h:
* khtml/xml/dom_nodeimpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 34b925c..8bae0fb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-11-22 David Hyatt <hyatt at apple.com>
+
+ Fix for the weather.com, slate and espn malformations that
+ could occur. Also reverting an earlier change for handling
+ font tags like other inlines. Both FONT and A need to be
+ given special treatment until I can implement a strategy that
+ will allow them to be handled just like the other inlines.
+
+ * khtml/html/dtd.cpp:
+ (DOM::checkChild):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isInline):
+ * khtml/html/html_elementimpl.h:
+ * khtml/xml/dom_nodeimpl.h:
+
2002-11-21 Darin Adler <darin at apple.com>
* khtml/ecma/kjs_dom.cpp: (DOMNode::eventHandlerScope): List -> ScopeChain.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 34b925c..8bae0fb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-11-22 David Hyatt <hyatt at apple.com>
+
+ Fix for the weather.com, slate and espn malformations that
+ could occur. Also reverting an earlier change for handling
+ font tags like other inlines. Both FONT and A need to be
+ given special treatment until I can implement a strategy that
+ will allow them to be handled just like the other inlines.
+
+ * khtml/html/dtd.cpp:
+ (DOM::checkChild):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isInline):
+ * khtml/html/html_elementimpl.h:
+ * khtml/xml/dom_nodeimpl.h:
+
2002-11-21 Darin Adler <darin at apple.com>
* khtml/ecma/kjs_dom.cpp: (DOMNode::eventHandlerScope): List -> ScopeChain.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 34b925c..8bae0fb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-11-22 David Hyatt <hyatt at apple.com>
+
+ Fix for the weather.com, slate and espn malformations that
+ could occur. Also reverting an earlier change for handling
+ font tags like other inlines. Both FONT and A need to be
+ given special treatment until I can implement a strategy that
+ will allow them to be handled just like the other inlines.
+
+ * khtml/html/dtd.cpp:
+ (DOM::checkChild):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::isInline):
+ * khtml/html/html_elementimpl.h:
+ * khtml/xml/dom_nodeimpl.h:
+
2002-11-21 Darin Adler <darin at apple.com>
* khtml/ecma/kjs_dom.cpp: (DOMNode::eventHandlerScope): List -> ScopeChain.
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 53e95e5..6478870 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -570,7 +570,6 @@ bool DOM::checkChild(ushort tagID, ushort childID)
switch(tagID)
{
- case ID_FONT:
case ID_TT:
case ID_I:
case ID_B:
@@ -631,6 +630,9 @@ 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_FONT:
+ // special handling for FONT: (_0 | 3)
+ return check_array(childID, tag_list_3) || check_array(childID, tag_list_0);
case ID__KONQBLOCK:
if ( childID == ID__KONQBLOCK ) return false;
// Fall through!
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 4587fa4..9699175 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -60,6 +60,47 @@ HTMLElementImpl::~HTMLElementImpl()
{
}
+bool HTMLElementImpl::isInline() const
+{
+ if (renderer())
+ return ElementImpl::isInline();
+
+ switch(id()) {
+ case ID_A:
+ case ID_FONT:
+ case ID_TT:
+ case ID_U:
+ case ID_B:
+ case ID_I:
+ case ID_S:
+ case ID_STRIKE:
+ case ID_BIG:
+ case ID_SMALL:
+
+ // %phrase
+ case ID_EM:
+ case ID_STRONG:
+ case ID_DFN:
+ case ID_CODE:
+ case ID_SAMP:
+ case ID_KBD:
+ case ID_VAR:
+ case ID_CITE:
+ case ID_ABBR:
+ case ID_ACRONYM:
+
+ // %special
+ case ID_SUB:
+ case ID_SUP:
+ case ID_SPAN:
+ case ID_NOBR:
+ case ID_WBR:
+ return true;
+ default:
+ return ElementImpl::isInline();
+ }
+}
+
void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
{
DOMString indexstring;
diff --git a/WebCore/khtml/html/html_elementimpl.h b/WebCore/khtml/html/html_elementimpl.h
index 1bc7859..19cd98f 100644
--- a/WebCore/khtml/html/html_elementimpl.h
+++ b/WebCore/khtml/html/html_elementimpl.h
@@ -39,6 +39,8 @@ public:
virtual bool isHTMLElement() const { return true; }
+ virtual bool isInline() const;
+
virtual Id id() const = 0;
virtual void parseAttribute(AttributeImpl *token);
diff --git a/WebCore/khtml/xml/dom_nodeimpl.h b/WebCore/khtml/xml/dom_nodeimpl.h
index 4cf8e54..ed43b32 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.h
+++ b/WebCore/khtml/xml/dom_nodeimpl.h
@@ -202,7 +202,7 @@ public:
*/
virtual bool isSelectable() const { return false; };
- bool isInline() const;
+ virtual bool isInline() const;
virtual QString toHTML() const;
QString recursive_toHTML(bool start = false) const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list