[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 4d9b2acb4e2c68d5360ed79b12a1fe9f99c6e9ff
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 9 05:41:38 2002 +0000

            Reviewed by Dave.
    
    	- fixed 2981252 - JavaScript inside <!-- --> comments inside <select> is not executed
    
    	This problem is caused by the hack to turn all whitespace into
    	spaces inside <select>, so that it's collapsed in the DOM. But
    	this is especially bad for scripts inside select tags, so I
    	changed the select special case to not apply inside scripts.
    
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::addPending):
            (HTMLTokenizer::write):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 31b73e7..35b39b2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-12-08  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 2981252 - JavaScript inside <!-- --> comments inside <select> is not executed
+
+	This problem is caused by the hack to turn all whitespace into
+	spaces inside <select>, so that it's collapsed in the DOM. But
+	this is especially bad for scripts inside select tags, so I
+	changed the select special case to not apply inside scripts.
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::addPending): 
+        (HTMLTokenizer::write):
+
 2002-12-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Don and Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 31b73e7..35b39b2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-12-08  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 2981252 - JavaScript inside <!-- --> comments inside <select> is not executed
+
+	This problem is caused by the hack to turn all whitespace into
+	spaces inside <select>, so that it's collapsed in the DOM. But
+	this is especially bad for scripts inside select tags, so I
+	changed the select special case to not apply inside scripts.
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::addPending): 
+        (HTMLTokenizer::write):
+
 2002-12-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Don and Dave.
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 41624ff..c082d9b 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -1265,7 +1265,7 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
 
 void HTMLTokenizer::addPending()
 {
-    if ( select)
+    if ( select && !script )
     {
         *dest++ = ' ';
     }
@@ -1435,7 +1435,7 @@ void HTMLTokenizer::write( const QString &str, bool appendData )
 
             if ( pending ) {
                 // pre context always gets its spaces/linefeeds
-                if ( pre || (!parser->selectMode() &&
+                if ( pre || script || (!parser->selectMode() &&
                              (!parser->noSpaces() || dest > buffer ))) {
                     addPending();
                     discard = AllDiscard; // So we discard the first LF after the open tag.
@@ -1469,7 +1469,7 @@ void HTMLTokenizer::write( const QString &str, bool appendData )
         }
         else if (( cc == '\n' ) || ( cc == '\r' ))
         {
-	    if (select)
+	    if (select && !script)
             {
                 if (discard == LFDiscard)
                 {
@@ -1510,7 +1510,7 @@ void HTMLTokenizer::write( const QString &str, bool appendData )
         }
         else if (( cc == ' ' ) || ( cc == '\t' ))
         {
-	    if (select) {
+	    if (select && !script) {
                 if(discard == SpaceDiscard)
                     discard = NoneDiscard;
                  else if(discard == AllDiscard)

-- 
WebKit Debian packaging