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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 05eac3c76c80f7cf4ac25dadea0045135cdfd59a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 9 16:36:08 2002 +0000

            Reviewed by Darin.
    
    	- fixed 3103036 - REGRESSION: scripts dropped from DOM tree;
    	javascript text rendered to screen
    
    	The problem here is that we don't allow SCRIPT inside MAP, so the
    	script tag gets thrown away in the DOM and the text is added
    	directly to the MAP. I can't see a good reason not to allow SCRIPT
    	here, so I think the best thing to do is relax the DTD.
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild): Relax the DTD to allow SCRIPT inside MAP.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 92dd818..46fb45f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-12-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3103036 - REGRESSION: scripts dropped from DOM tree;
+	javascript text rendered to screen
+
+	The problem here is that we don't allow SCRIPT inside MAP, so the
+	script tag gets thrown away in the DOM and the text is added
+	directly to the MAP. I can't see a good reason not to allow SCRIPT
+	here, so I think the best thing to do is relax the DTD.
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild): Relax the DTD to allow SCRIPT inside MAP.
+
 2002-12-08  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3007276, styles do not cascade properly through
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 92dd818..46fb45f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-12-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3103036 - REGRESSION: scripts dropped from DOM tree;
+	javascript text rendered to screen
+
+	The problem here is that we don't allow SCRIPT inside MAP, so the
+	script tag gets thrown away in the DOM and the text is added
+	directly to the MAP. I can't see a good reason not to allow SCRIPT
+	here, so I think the best thing to do is relax the DTD.
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild): Relax the DTD to allow SCRIPT inside MAP.
+
 2002-12-08  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3007276, styles do not cascade properly through
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 6f00298..29b1bae 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -649,9 +649,11 @@ bool DOM::checkChild(ushort tagID, ushort childID)
         // DIV: _1 *
         return check_array(childID, tag_list_1);
     case ID_MAP:
-        // MAP: ( _3 + | AREA + )
-        if( check_array(childID, tag_list_3) ) return true;
-        return (childID == ID_AREA);
+	// We accept SCRIPT in client-side image maps as an extension to the DTD.
+        // MAP: ( _3 + | AREA + | SCRIPT + )
+        return check_array(childID, tag_list_3) ||
+	    childID == ID_AREA ||
+	    childID == ID_SCRIPT;
     case ID_OBJECT:
     case ID_EMBED:
     case ID_APPLET:

-- 
WebKit Debian packaging