Changeset 18671 in webkit

Timestamp:

Jan 8, 2007 11:15:43 AM (17 years ago)

Author:

darin

Message:

LayoutTests:

• added a W3C list style test that was cited in a bug

• fast/lists/w3-list-styles-expected.checksum: Added.
• fast/lists/w3-list-styles-expected.png: Added.
• fast/lists/w3-list-styles-expected.txt: Added.
• fast/lists/w3-list-styles.html: Added.

WebCore:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=3232 CSS2: Web Kit does not support all list style types

Test case showed problems in cjk-ideographic and hebrew
Test: fast/lists/w3-list-styles.html

• rendering/RenderListMarker.cpp: (WebCore::toCJKIdeographic): Fix the algorithm so it doesn't include leading zeroes. I had misread the part that says you start with the decimal form of the number. Fix an assertion that was too stringent. Fix the code to collapse consecutive zeroes so that it doesn't get confused by intervening "noChar" characters. (WebCore::RenderListMarker::paint): Reverse the text before painting if the first character's direction is right to left.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/lists/w3-list-styles-expected.checksum (added)
• LayoutTests/fast/lists/w3-list-styles-expected.png (added)
• LayoutTests/fast/lists/w3-list-styles-expected.txt (added)
• LayoutTests/fast/lists/w3-list-styles.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderListMarker.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-08  Darin Adler  <darin@apple.com>
+
+        - added a W3C list style test that was cited in a bug
+
+        * fast/lists/w3-list-styles-expected.checksum: Added.
+        * fast/lists/w3-list-styles-expected.png: Added.
+        * fast/lists/w3-list-styles-expected.txt: Added.
+        * fast/lists/w3-list-styles.html: Added.
+
 2007-01-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-08  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=3232
+          CSS2: Web Kit does not support all list style types
+
+        Test case showed problems in cjk-ideographic and hebrew
+        Test: fast/lists/w3-list-styles.html
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::toCJKIdeographic): Fix the algorithm so it doesn't include leading zeroes.
+        I had misread the part that says you start with the decimal form of the number.
+        Fix an assertion that was too stringent. Fix the code to collapse consecutive zeroes
+        so that it doesn't get confused by intervening "noChar" characters.
+        (WebCore::RenderListMarker::paint): Reverse the text before painting if the first character's
+        direction is right to left.
+
 2007-01-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderListMarker.cpp

@@ -36 +36 @@
 
 using namespace std;
+namespace Unicode = WTF::Unicode;
 
 namespace WebCore {
@@ -280 +281 @@
             group[7] = static_cast<AbstractCJKChar>(secondGroupMarker - 1 + i);
 
-        // Put in the four digits.
+        // Put in the four digits and digit markers for any non-zero digits.
         group[0] = static_cast<AbstractCJKChar>(digit0 + (groupValue % 10));
-        group[1] = static_cast<AbstractCJKChar>(digit0 + ((groupValue / 10) % 10));
-        group[3] = static_cast<AbstractCJKChar>(digit0 + ((groupValue / 100) % 10));
-        group[5] = static_cast<AbstractCJKChar>(digit0 + groupValue / 1000);
-
-        // Put in digit markers for any non-zero digits.
-        if (group[1] != digit0)
-            group[2] = secondDigitMarker;
-        if (group[3] != digit0)
-            group[4] = thirdDigitMarker;
-        if (group[5] != digit0)
-            group[6] = fourthDigitMarker;
+        if (number != 0 || groupValue > 9) {
+            int digitValue = ((groupValue / 10) % 10);
+            group[1] = static_cast<AbstractCJKChar>(digit0 + digitValue);
+            if (digitValue)
+                group[2] = secondDigitMarker;
+        }
+        if (number != 0 || groupValue > 99) {
+            int digitValue = ((groupValue / 100) % 10);
+            group[3] = static_cast<AbstractCJKChar>(digit0 + digitValue);
+            if (digitValue)
+                group[4] = thirdDigitMarker;
+        }
+        if (number != 0 || groupValue > 999) {
+            int digitValue = groupValue / 1000;
+            group[5] = static_cast<AbstractCJKChar>(digit0 + digitValue);
+            if (digitValue)
+                group[6] = fourthDigitMarker;
+        }
 
         // Remove the tens digit, but leave the marker, for any group that has
         // a value of less than 20.
         if (groupValue < 20) {
-            ASSERT(group[1] == noChar || group[1] == digit1);
+            ASSERT(group[1] == noChar || group[1] == digit0 || group[1] == digit1);
             group[1] = noChar;
         }
+
+        if (number == 0)
+            break;
     }
 
@@ -308 +319 @@
     for (int i = 0; i < bufferLength; ++i) {
         AbstractCJKChar a = buffer[i];
-        if (a != noChar && (a != digit0 || last != digit0))
-            characters[length++] = table[a - 1];
-        last = a;
+        if (a != noChar) {
+            if (a != digit0 || last != digit0)
+                characters[length++] = table[a - 1];
+            last = a;
+        }
     }
     return String(characters, length);
@@ -601 +614 @@
     if (m_text.isEmpty())
         return;
+
+    TextRun textRun(m_text.impl());
+
+    // Text is not arbitrary. We can judge whether it's RTL from the first character,
+    // and we only need to handle the direction RightToLeft for now.
+    bool textNeedsReversing = Unicode::direction(m_text[0]) == Unicode::RightToLeft;
+    Vector<UChar> reversedText;
+    if (textNeedsReversing) {
+        int length = m_text.length();
+        reversedText.resize(length);
+        for (int i = 0; i < length; ++i)
+            reversedText[length - i - 1] = m_text[i];
+        textRun = TextRun(reversedText.data(), length);
+    }
+
     const Font& font = style()->font();
-    TextRun textRun(m_text.impl());
     if (style()->direction() == LTR) {
         int width = font.width(textRun);