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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 0d0a965f356c666baef2f3fcff0ca19de6925867
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 01:23:36 2002 +0000

    top level:
    
            * Tests/WebFoundation-Misc/ifnsstringextensions-test.chk:
            * Tests/WebFoundation-Misc/ifnsstringextensions-test.m: (main):
    	Added test cases for _web_stringByCollapsingNonPrintingCharacters.
    
    WebFoundation:
    
            * Misc.subproj/WebNSStringExtras.h:
            * Misc.subproj/WebNSStringExtras.m:
            (-[NSString _web_stringByCollapsingNonPrintingCharacters]): Added.
    	Collapses any non-printing characters into single spaces, and trims them from the
    	ends too.
    
    WebCore:
    
    	- fixed 3009321 -- bookmark and history menus show black square for (tm)
    
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseSpecial): Call fixUpChar.
            (HTMLTokenizer::parseText): Call fixUpChar.
            (HTMLTokenizer::parseTag): Call fixUpChar.
    
    WebKit:
    
    	- fixed 2986567 -- suppress return characters from title in title bar, status bar, menu items
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge setTitle:]): Call _web_stringByCollapsingNonPrintingCharacters.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1738 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e1a3258..4f27e8a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-08-05  Darin Adler  <darin at apple.com>
 
+	- fixed 3009321 -- bookmark and history menus show black square for (tm)
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseSpecial): Call fixUpChar.
+        (HTMLTokenizer::parseText): Call fixUpChar.
+        (HTMLTokenizer::parseTag): Call fixUpChar.
+
+2002-08-05  Darin Adler  <darin at apple.com>
+
         - fixed 3016795 -- http://www.google.co.il/ fails to decode
 
         * kwq/make-charset-table.pl: Added a hack that makes us treat for
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e1a3258..4f27e8a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-08-05  Darin Adler  <darin at apple.com>
 
+	- fixed 3009321 -- bookmark and history menus show black square for (tm)
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseSpecial): Call fixUpChar.
+        (HTMLTokenizer::parseText): Call fixUpChar.
+        (HTMLTokenizer::parseTag): Call fixUpChar.
+
+2002-08-05  Darin Adler  <darin at apple.com>
+
         - fixed 3016795 -- http://www.google.co.il/ fails to decode
 
         * kwq/make-charset-table.pl: Added a hack that makes us treat for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e1a3258..4f27e8a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-08-05  Darin Adler  <darin at apple.com>
 
+	- fixed 3009321 -- bookmark and history menus show black square for (tm)
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseSpecial): Call fixUpChar.
+        (HTMLTokenizer::parseText): Call fixUpChar.
+        (HTMLTokenizer::parseTag): Call fixUpChar.
+
+2002-08-05  Darin Adler  <darin at apple.com>
+
         - fixed 3016795 -- http://www.google.co.il/ fails to decode
 
         * kwq/make-charset-table.pl: Added a hack that makes us treat for
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index d8fce38..a340945 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -97,8 +97,7 @@ static const char titleEnd [] = "</title";
 // handle this in the text codec.
 
 // To cover non-entity text, I think this function would need to be called
-// in more places. There seem to be many places that set *dest without
-// calling fixUpChar.
+// in more places. There seem to be many places that don't call fixUpChar.
 
 inline void fixUpChar(QChar& c) {
     switch (c.unicode()) {
@@ -431,7 +430,9 @@ void HTMLTokenizer::parseSpecial(DOMStringIt &src)
             scriptCodeSize = scriptCodeDest-scriptCode;
         }
         else {
-            scriptCode[ scriptCodeSize++ ] = *src;
+            scriptCode[scriptCodeSize] = *src;
+            fixUpChar(scriptCode[scriptCodeSize]);
+            ++scriptCodeSize;
             ++src;
         }
     }
@@ -638,7 +639,9 @@ void HTMLTokenizer::parseText(DOMStringIt &src)
             ++src;
         }
         else {
-            *dest++ = *src;
+            *dest = *src;
+            fixUpChar(*dest);
+            ++dest;
             ++src;
         }
     }
@@ -1080,7 +1083,9 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                         break;
                     }
                 }
-                *dest++ = *src;
+                *dest = *src;
+                fixUpChar(*dest);
+                ++dest;
                 ++src;
             }
             break;
@@ -1114,7 +1119,9 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                     }
                 }
 
-                *dest++ = *src;
+                *dest = *src;
+                fixUpChar(*dest);
+                ++dest;
                 ++src;
             }
             break;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3cb7976..1e56c97 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-05  Darin Adler  <darin at apple.com>
+
+	- fixed 2986567 -- suppress return characters from title in title bar, status bar, menu items
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge setTitle:]): Call _web_stringByCollapsingNonPrintingCharacters.
+
 2002-08-05  Richard Williamson (Home)  <rjw at apple.com>
 
         Added exported symbols file.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3cb7976..1e56c97 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-08-05  Darin Adler  <darin at apple.com>
+
+	- fixed 2986567 -- suppress return characters from title in title bar, status bar, menu items
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge setTitle:]): Call _web_stringByCollapsingNonPrintingCharacters.
+
 2002-08-05  Richard Williamson (Home)  <rjw at apple.com>
 
         Added exported symbols file.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 2d8594a..0d97d61 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -18,6 +18,7 @@
 #import <WebKit/WebSubresourceClient.h>
 #import <WebKit/WebViewPrivate.h>
 
+#import <WebFoundation/WebNSStringExtras.h>
 #import <WebFoundation/WebResourceHandle.h>
 
 @interface NSApplication (DeclarationStolenFromAppKit)
@@ -149,7 +150,7 @@
 
 - (void)setTitle:(NSString *)title
 {
-    [[self dataSource] _setTitle:title];
+    [[self dataSource] _setTitle:[title _web_stringByCollapsingNonPrintingCharacters]];
 }
 
 - (void)setStatusText:(NSString *)status

-- 
WebKit Debian packaging