Changeset 25386 in webkit

Timestamp:

Sep 6, 2007 5:20:24 AM (17 years ago)

Author:

bdash

Message:

2007-09-06 Mitz Pettel <​mitz@webkit.org>

Reviewed by Adam Roben.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14685 <rdar://problem/5349755> text-align affects <select> button but not its drop-down menu

• platform/PlatformString.h: (WebCore::String::defaultWritingDirection):
• platform/StringImpl.cpp: (WebCore::StringImpl::defaultWritingDirection): Moved textDirectionForParagraph() from RenderMenuList.cpp here.
• platform/StringImpl.h:
• platform/win/PopupMenuWin.cpp: (WebCore::PopupMenu::itemWritingDirectionIsNatural): Changed to return 'true'. (WebCore::PopupMenu::paint): Changed to use natural directionality for menu items.
• rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::adjustInnerStyle): Use defaultWritingDirection.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PlatformString.h (modified) (1 diff)
• platform/StringImpl.cpp (modified) (1 diff)
• platform/StringImpl.h (modified) (1 diff)
• platform/win/PopupMenuWin.cpp (modified) (2 diffs)
• rendering/RenderMenuList.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-06  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14685
+          <rdar://problem/5349755> text-align affects <select> button but not its drop-down menu
+
+        * platform/PlatformString.h:
+        (WebCore::String::defaultWritingDirection):
+        * platform/StringImpl.cpp:
+        (WebCore::StringImpl::defaultWritingDirection): Moved textDirectionForParagraph()
+        from RenderMenuList.cpp here.
+        * platform/StringImpl.h:
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::itemWritingDirectionIsNatural): Changed to return 'true'.
+        (WebCore::PopupMenu::paint): Changed to use natural directionality for menu
+        items.
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::adjustInnerStyle): Use defaultWritingDirection.
+
 2007-09-06  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/platform/PlatformString.h

@@ -186 +186 @@
     CString latin1() const;
     CString utf8() const;
+
+    // Determines the writing direction using the Unicode Bidi Algorithm rules P2 and P3.
+    WTF::Unicode::Direction defaultWritingDirection() const { return m_impl ? m_impl->defaultWritingDirection() : WTF::Unicode::LeftToRight; }
     
     String(const DeprecatedString&);

trunk/WebCore/platform/StringImpl.cpp

@@ -1220 +1220 @@
 }
 
+WTF::Unicode::Direction StringImpl::defaultWritingDirection() const
+{
+    for (unsigned i = 0; i < m_length; ++i) {
+        WTF::Unicode::Direction charDirection = WTF::Unicode::direction(m_data[i]);
+        if (charDirection == WTF::Unicode::LeftToRight)
+            return WTF::Unicode::LeftToRight;
+        if (charDirection == WTF::Unicode::RightToLeft || charDirection == WTF::Unicode::RightToLeftArabic)
+            return WTF::Unicode::RightToLeft;
+    }
+    return WTF::Unicode::LeftToRight;
+}
+
 StringImpl::StringImpl(const Identifier& str)
 {

trunk/WebCore/platform/StringImpl.h

@@ -138 +138 @@
     Vector<char> ascii() const;
 
+    WTF::Unicode::Direction defaultWritingDirection() const;
+
 #if PLATFORM(CF)
     StringImpl(CFStringRef);

trunk/WebCore/platform/win/PopupMenuWin.cpp

@@ -414 +414 @@
 bool PopupMenu::itemWritingDirectionIsNatural() 
 { 
-    return false; 
+    return true; 
 }
 
@@ -492 +492 @@
         unsigned length = itemText.length();
         const UChar* string = itemText.characters();
-        TextStyle textStyle(0, 0, 0, clientStyle->direction() == RTL, clientStyle->unicodeBidi() == Override);
+        TextStyle textStyle(0, 0, 0, itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft);
         TextRun textRun(string, length);
 

trunk/WebCore/rendering/RenderMenuList.cpp

@@ -77 +77 @@
 }
 
-// Determines the writing direction using the Unicode Bidi Algorithm rules P2 and P3.
-static TextDirection textDirectionForParagraph(StringImpl* paragraph)
-{
-    int length = paragraph->length();
-    for (int i = 0; i < length; ++i) {
-        WTF::Unicode::Direction charDirection = WTF::Unicode::direction((*paragraph)[i]);
-        if (charDirection == WTF::Unicode::LeftToRight)
-            return LTR;
-        if (charDirection == WTF::Unicode::RightToLeft || charDirection == WTF::Unicode::RightToLeftArabic)
-            return RTL;
-    }
-    return LTR;
-}
-
 void RenderMenuList::adjustInnerStyle()
 {
@@ -104 +90 @@
         // so we must adjust our own style to match.
         m_innerBlock->style()->setTextAlign(LEFT);
-        TextDirection direction = m_buttonText ? textDirectionForParagraph(m_buttonText->text()) : LTR;
+        TextDirection direction = (m_buttonText && m_buttonText->text()->defaultWritingDirection() == WTF::Unicode::RightToLeft) ? RTL : LTR;
         m_innerBlock->style()->setDirection(direction);
     }