Changeset 78193 in webkit

Timestamp:

Feb 10, 2011 4:07:10 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-10 Avi Drissman <​avi@google.com>

Reviewed by Darin Fisher.

<option> should implement the dir attribute. Mac Chromium version, followup to r76983, r77654.
​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: (WebCore::PopupListBox::updateFromElement):
• platform/chromium/PopupMenuChromium.h:

2011-02-10 Avi Drissman <​avi@google.com>

Reviewed by Darin Fisher.

<option> should implement the dir attribute. Mac Chromium version, followup to r76983, r77654.
​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.

• public/WebMenuItemInfo.h:
• public/WebPopupMenuInfo.h:
• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::getPopupMenuInfo):
• src/ExternalPopupMenu.cpp: (WebKit::ExternalPopupMenu::getPopupMenuInfo):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebMenuItemInfo.h (modified) (2 diffs)
• WebKit/chromium/public/WebPopupMenuInfo.h (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/ExternalPopupMenu.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-10  Avi Drissman  <avi@google.com>
+
+        Reviewed by Darin Fisher.
+
+        <option> should implement the dir attribute. Mac Chromium version, followup to r76983, r77654.
+        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:
+        (WebCore::PopupListBox::updateFromElement):
+        * platform/chromium/PopupMenuChromium.h:
+
 2011-02-10  Hans Wennborg  <hans@chromium.org>
 

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

@@ -1235 +1235 @@
         m_items.append(new PopupItem(m_popupClient->itemText(i), type));
         m_items[i]->enabled = isSelectableItem(i);
+        PopupMenuStyle style = m_popupClient->itemStyle(i);
+        m_items[i]->textDirection = style.textDirection();
+        m_items[i]->hasTextDirectionOverride = style.hasTextDirectionOverride();
     }
 

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

@@ -66 +66 @@
     Type type;
     int yOffset; // y offset of this item, relative to the top of the popup.
+    TextDirection textDirection;
+    bool hasTextDirectionOverride;
     bool enabled;
 };

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-02-10  Avi Drissman  <avi@google.com>
+
+        Reviewed by Darin Fisher.
+
+        <option> should implement the dir attribute. Mac Chromium version, followup to r76983, r77654.
+        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.
+
+        * public/WebMenuItemInfo.h:
+        * public/WebPopupMenuInfo.h:
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::getPopupMenuInfo):
+        * src/ExternalPopupMenu.cpp:
+        (WebKit::ExternalPopupMenu::getPopupMenuInfo):
+
 2011-02-09  David Holloway  <dhollowa@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebMenuItemInfo.h

@@ -34 +34 @@
 #include "WebCommon.h"
 #include "WebString.h"
+#include "WebTextDirection.h"
 #include "WebVector.h"
 
@@ -57 +58 @@
     Type type;
     unsigned action;
+    WebTextDirection textDirection;
+    bool hasTextDirectionOverride;
     bool enabled;
     bool checked;

trunk/Source/WebKit/chromium/public/WebPopupMenuInfo.h

@@ -39 +39 @@
 // Describes the contents of a popup menu.
 struct WebPopupMenuInfo {
-    // FIXME: migrate clients to WebMenuItemInfo and remove this temporary Item typedef.
-    typedef WebMenuItemInfo Item;
     int itemHeight;
     int itemFontSize;

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

@@ -745 +745 @@
     const Vector<PopupItem*>& inputItems = popupContainer->popupData();
 
-    WebVector<WebPopupMenuInfo::Item> outputItems(inputItems.size());
+    WebVector<WebMenuItemInfo> outputItems(inputItems.size());
 
     for (size_t i = 0; i < inputItems.size(); ++i) {
         const PopupItem& inputItem = *inputItems[i];
-        WebPopupMenuInfo::Item& outputItem = outputItems[i];
+        WebMenuItemInfo& outputItem = outputItems[i];
 
         outputItem.label = inputItem.label;
         outputItem.enabled = inputItem.enabled;
+        if (inputItem.textDirection == WebCore::RTL)
+            outputItem.textDirection = WebTextDirectionRightToLeft;
+        else
+            outputItem.textDirection = WebTextDirectionLeftToRight;
+        outputItem.hasTextDirectionOverride = inputItem.hasTextDirectionOverride;
 
         switch (inputItem.type) {
         case PopupItem::TypeOption:
-            outputItem.type = WebPopupMenuInfo::Item::Option;
+            outputItem.type = WebMenuItemInfo::Option;
             break;
         case PopupItem::TypeGroup:
-            outputItem.type = WebPopupMenuInfo::Item::Group;
+            outputItem.type = WebMenuItemInfo::Group;
             break;
         case PopupItem::TypeSeparator:
-            outputItem.type = WebPopupMenuInfo::Item::Separator;
+            outputItem.type = WebMenuItemInfo::Separator;
             break;
         default:

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

@@ -129 +129 @@
 {
     int itemCount = m_popupMenuClient->listSize();
-    WebVector<WebPopupMenuInfo::Item> items(
+    WebVector<WebMenuItemInfo> items(
         static_cast<size_t>(itemCount));
     for (int i = 0; i < itemCount; ++i) {
-        WebPopupMenuInfo::Item& popupItem = items[i];
+        WebMenuItemInfo& popupItem = items[i];
         popupItem.label = m_popupMenuClient->itemText(i);
         if (m_popupMenuClient->itemIsSeparator(i))
@@ -141 +141 @@
             popupItem.type = WebMenuItemInfo::Option;
         popupItem.enabled = m_popupMenuClient->itemIsEnabled(i);
+        PopupMenuStyle style = m_popupMenuClient->itemStyle(i);
+        if (style.textDirection() == WebCore::RTL)
+            popupItem.textDirection = WebTextDirectionRightToLeft;
+        else
+            popupItem.textDirection = WebTextDirectionLeftToRight;
+        popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride();
     }