[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3070b11c025da2fd84302b64e82075704264c19b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 01:24:15 2010 +0000

    2010-09-30  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Daniel Bates.
    
            [GTK] Crash on testatk.c unittest because of a call to ASSERT_NOT_REACHED
            https://bugs.webkit.org/show_bug.cgi?id=46886
    
            Removed call to ASSERT_NOT_REACHED() from listMarkerSuffix().
    
            So far, this assertion made sense because it was not possible that
            a call to listMarkerSuffix() happened when the style of the list
            item was one of the following: Asterisks, Circle, Discm Footnotes,
            NoneListStyle or Square (it's easy to figure this out by checking
            the functions where listMarkerSuffix() was called).
    
            However, since revision 68415 (about bug 45381), there's a new
            place where listMarkerSuffix() is being called (the suffix()
            public method), regardless of the style of the item being or not
            one of those pointed out, so the aforementioned assertion in
            listMarkerSuffix() would no longer be correct, as now it's ok to
            reach those cases in the switch statement.
    
            * rendering/RenderListMarker.cpp:
            (WebCore::listMarkerSuffix): Removed call to ASSERT_NOT_REACHED().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68858 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07f0ca1..b89189c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-09-30  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Daniel Bates.
+
+        [GTK] Crash on testatk.c unittest because of a call to ASSERT_NOT_REACHED
+        https://bugs.webkit.org/show_bug.cgi?id=46886
+
+        Removed call to ASSERT_NOT_REACHED() from listMarkerSuffix().
+
+        So far, this assertion made sense because it was not possible that
+        a call to listMarkerSuffix() happened when the style of the list
+        item was one of the following: Asterisks, Circle, Discm Footnotes,
+        NoneListStyle or Square (it's easy to figure this out by checking
+        the functions where listMarkerSuffix() was called).
+
+        However, since revision 68415 (about bug 45381), there's a new
+        place where listMarkerSuffix() is being called (the suffix()
+        public method), regardless of the style of the item being or not
+        one of those pointed out, so the aforementioned assertion in
+        listMarkerSuffix() would no longer be correct, as now it's ok to
+        reach those cases in the switch statement.
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::listMarkerSuffix): Removed call to ASSERT_NOT_REACHED().
+
 2010-09-30  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/rendering/RenderListMarker.cpp b/WebCore/rendering/RenderListMarker.cpp
index 6d055c6..b82d41b 100644
--- a/WebCore/rendering/RenderListMarker.cpp
+++ b/WebCore/rendering/RenderListMarker.cpp
@@ -504,7 +504,6 @@ static UChar listMarkerSuffix(EListStyleType type, int value)
     case Footnotes:
     case NoneListStyle:
     case Square:
-        ASSERT_NOT_REACHED();
         return ' ';
     case Afar:
     case Amharic:

-- 
WebKit Debian packaging