Changeset 77654 in webkit

Timestamp:

Feb 4, 2011 12:30:20 PM (13 years ago)

Author:

xji@chromium.org

Message:

2011-02-04 Xiaomei Ji <​xji@chromium.org>

Reviewed by David Levin.

Implement "<option> should implement the dir attribute" for chromium port after r76983.
​https://bugs.webkit.org/show_bug.cgi?id=50969

• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::selectItemAlignmentFollowsMenuWritingDirection): Override as true.
• src/WebViewImpl.cpp: Remove directionality hint from autofill drop-down setting.

2011-02-04 Xiaomei Ji <​xji@chromium.org>

Reviewed by David Levin.

Implement "<option> should implement the dir attribute" for chromium port after r76983.
​https://bugs.webkit.org/show_bug.cgi?id=50969

Use manual test Source/WebCore/manual-tests/pop-up-alignment-and-direction.html
added in r76983.

• platform/chromium/PopupMenuChromium.cpp: Remove directionality hint from <select> drop-down setting. (WebCore::PopupListBox::paintRow): Use <option>'s directionality to paint items in drop-down and pass-in bidi override flag when creating text run.
• platform/chromium/PopupMenuChromium.h: Remove directionalityHint from PopupContainerSettings.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (3 diffs)
• WebCore/platform/chromium/PopupMenuChromium.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-04  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by David Levin.
+
+        Implement "<option> should implement the dir attribute" for chromium port after r76983.
+        https://bugs.webkit.org/show_bug.cgi?id=50969
+
+        Use manual test Source/WebCore/manual-tests/pop-up-alignment-and-direction.html
+        added in r76983.
+
+        * platform/chromium/PopupMenuChromium.cpp: Remove directionality hint from
+        <select> drop-down setting.
+        (WebCore::PopupListBox::paintRow): Use <option>'s directionality to paint
+        items in drop-down and pass-in bidi override flag when creating text run.
+        * platform/chromium/PopupMenuChromium.h: Remove directionalityHint from
+        PopupContainerSettings.
+
 2011-02-04  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -79 +79 @@
 // This is the delegate used if none is provided.
 static const PopupContainerSettings dropDownSettings = {
-    true,   // setTextOnIndexChange
-    true,   // acceptOnAbandon
-    false,  // loopSelectionNavigation
-    false,  // restrictWidthOfListBox
-    // display item text in its first strong directional character's directionality.
-    PopupContainerSettings::FirstStrongDirectionalCharacterDirection,
+    true, // setTextOnIndexChange
+    true, // acceptOnAbandon
+    false, // loopSelectionNavigation
+    false // restrictWidthOfListBox
 };
 
@@ -969 +967 @@
 
     // Prepare the directionality to draw text.
-    bool rtl = false;
-    if (m_settings.itemTextDirectionalityHint == PopupContainerSettings::DOMElementDirection)
-        rtl = style.textDirection() == RTL;
-    else if (m_settings.itemTextDirectionalityHint ==
-             PopupContainerSettings::FirstStrongDirectionalCharacterDirection)
-        rtl = itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft;
-    TextRun textRun(itemText.characters(), itemText.length(), false, 0, 0, TextRun::AllowTrailingExpansion, rtl);
+    bool rtl = style.textDirection() == RTL;
+    TextRun textRun(itemText.characters(), itemText.length(), false, 0, 0, TextRun::AllowTrailingExpansion, rtl, style.hasTextDirectionOverride());
     // If the text is right-to-left, make it right-aligned by adjusting its
     // beginning position.
@@ -1003 +996 @@
     if (itemLabel.isEmpty())
         return;
-    TextRun labelTextRun(itemLabel.characters(), itemLabel.length(), false, 0, 0, TextRun::AllowTrailingExpansion, rtl);
+    TextRun labelTextRun(itemLabel.characters(), itemLabel.length(), false, 0, 0, TextRun::AllowTrailingExpansion, rtl, style.hasTextDirectionOverride());
     if (rightAligned)
         textX = max(0, m_popupClient->clientPaddingLeft() - m_popupClient->clientInsetLeft());

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.h

@@ -98 +98 @@
     // Autocomplete popups are restricted, combo-boxes (select tags) aren't.
     bool restrictWidthOfListBox;
-
-    // A hint on the display directionality of the item text in popup menu.
-    //
-    // We could either display the items in the drop-down using its DOM element's
-    // directionality, or we could display the items in the drop-down using heuristics:
-    // such as in its first strong directionality character's direction.
-    // Please refer to the discussion (especially comment #7 and #10) in
-    // https://bugs.webkit.org/show_bug.cgi?id=27889 for details.
-    enum DirectionalityHint {
-        // Use the DOM element's directionality to display the item text in popup menu.
-        DOMElementDirection,
-        // Use the item text's first strong-directional character's directionality
-        // to display the item text in popup menu.
-        FirstStrongDirectionalCharacterDirection,
-    };
-    DirectionalityHint itemTextDirectionalityHint;
 };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-02-04  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by David Levin.
+
+        Implement "<option> should implement the dir attribute" for chromium port after r76983.
+        https://bugs.webkit.org/show_bug.cgi?id=50969
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::selectItemAlignmentFollowsMenuWritingDirection): Override as true.
+        * src/WebViewImpl.cpp: Remove directionality hint from autofill drop-down setting.
+
 2011-02-01  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -863 +863 @@
 bool ChromeClientImpl::selectItemAlignmentFollowsMenuWritingDirection()
 {
-    return false;
+    return true;
 }
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -202 +202 @@
     false, // setTextOnIndexChange
     false, // acceptOnAbandon
-    true,  // loopSelectionNavigation
-    false, // restrictWidthOfListBox (For security reasons show the entire entry
-           // so the user doesn't enter information he did not intend to.)
-    // For suggestions, we use the direction of the input field as the direction
-    // of the popup items. The main reason is to keep the display of items in
-    // drop-down the same as the items in the input field.
-    PopupContainerSettings::DOMElementDirection,
+    true, // loopSelectionNavigation
+    false // restrictWidthOfListBox (For security reasons show the entire entry
+          // so the user doesn't enter information he did not intend to.)
 };