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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:08:54 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit a8449dafd1f476a29e97ceb6abf8e5b1a5f1f7c1
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 22:12:53 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3472023 - REGRESSION: assertion on layout tests
    
            * kwq/KWQTextCodec.mm:
            (KWQTextDecoder::convertUTF16): Remove assert that length is not
    	0, since we can get zero length now when flushing.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 335bd1b..1e935e1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-11-03  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3472023 - REGRESSION: assertion on layout tests
+	
+        * kwq/KWQTextCodec.mm:
+        (KWQTextDecoder::convertUTF16): Remove assert that length is not
+	0, since we can get zero length now when flushing.
+
 2003-11-03  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index bd5442a..1b32330 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -238,9 +238,8 @@ KWQTextDecoder::~KWQTextDecoder()
 
 QString KWQTextDecoder::convertUTF16(const unsigned char *s, int length)
 {
-    ASSERT(length > 0);
     ASSERT(_numBufferedBytes == 0 || _numBufferedBytes == 1);
-    
+
     const unsigned char *p = s;
     unsigned len = length;
     

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list