[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit cd2cf222c8ba28865ea2800d82e05f045de9c430
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 9 06:58:56 2003 +0000

    	Fix for 3503652, news.com misrenders badly (footer is out of position).  My fix to 3495748 caused this
    	regression.  I made the tag priority of <nobr> too high.  It needed to be the same as <div>, and I
    	accidentally made it higher.  I intended for it to be the same as <div>.
    
    	I also had to make a fix (now that <nobr> has a higher priority) to ensure <nobr> can't be nested inside
    	other <nobr>.
    
    	Both fixes were required to make news.com render correctly again.
    
            Reviewed by darin
    
            * khtml/html/dtd.cpp:
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::getElement):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5724 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d8d645b..14f88c9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-12-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3503652, news.com misrenders badly (footer is out of position).  My fix to 3495748 caused this
+	regression.  I made the tag priority of <nobr> too high.  It needed to be the same as <div>, and I
+	accidentally made it higher.  I intended for it to be the same as <div>.
+
+	I also had to make a fix (now that <nobr> has a higher priority) to ensure <nobr> can't be nested inside
+	other <nobr>.  
+
+	Both fixes were required to make news.com render correctly again.
+	
+        Reviewed by darin
+
+        * khtml/html/dtd.cpp:
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::getElement):
+
 2003-12-08  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3234676>: Support for KEYGEN tag (ie 509 email certificates from www.thawte.com)
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 7d550f4..f9527d8 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -107,7 +107,7 @@ const unsigned short DOM::tagPriority[] = {
     3, // ID_MARQUEE
     5, // ID_MENU
     0, // ID_META
-    5, // ID_NOBR
+    4, // ID_NOBR
    10,// ID_NOEMBED
    10,// ID_NOFRAMES
     3, // ID_NOSCRIPT
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 24c6e64..642b52d 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1054,6 +1054,8 @@ NodeImpl *KHTMLParser::getElement(Token* t)
     case ID_SPAN:
     case ID_NOBR:
     case ID_WBR:
+        if (t->id == ID_NOBR || t->id == ID_WBR)
+            popBlock(t->id); // Don't allow nested <nobr> or <wbr>
         n = new HTMLGenericElementImpl(document, t->id);
         break;
 

-- 
WebKit Debian packaging