Changeset 91896 in webkit

Timestamp:

Jul 27, 2011, 8:55:58 PM (14 years ago)

Author:

fsamuel@chromium.org

Message:

Source/WebCore: Popups on Chromium now check the minimum row height set through the Chromium WebKit API when
computing the height of a row in a popup listbox.
​https://bugs.webkit.org/show_bug.cgi?id=64897

Reviewed by Darin Fisher.

No new tests.

• platform/chromium/PopupMenuChromium.cpp:

(WebCore::PopupListBox::getRowHeight):

• platform/chromium/PopupMenuChromium.h:

(WebCore::PopupMenuChromium::minimumRowHeight):
(WebCore::PopupMenuChromium::setMinimumRowHeight):

Source/WebKit/chromium: Added a Chromium WebKit API method to set the minimum row height of a popup listbox.
​https://bugs.webkit.org/show_bug.cgi?id=64897

Reviewed by Darin Fisher.

• public/WebPopupMenu.h:
• src/WebPopupMenuImpl.cpp:

(WebKit::WebPopupMenu::setMinimumRowHeight):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (3 diffs)
• WebCore/platform/chromium/PopupMenuChromium.h (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebPopupMenu.h (modified) (1 diff)
• WebKit/chromium/src/WebPopupMenuImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-27  Fady Samuel  <fsamuel@chromium.org>
+
+        Popups on Chromium now check the minimum row height set through the Chromium WebKit API when
+        computing the height of a row in a popup listbox.
+        https://bugs.webkit.org/show_bug.cgi?id=64897
+
+        Reviewed by Darin Fisher.
+
+        No new tests.
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::getRowHeight):
+        * platform/chromium/PopupMenuChromium.h:
+        (WebCore::PopupMenuChromium::minimumRowHeight):
+        (WebCore::PopupMenuChromium::setMinimumRowHeight):
+
 2011-07-27  MORITA Hajime  <morrita@google.com>
 

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

@@ -67 +67 @@
 
 namespace WebCore {
+
+int PopupMenuChromium::s_minimumRowHeight = 0;
 
 typedef unsigned long long TimeStamp;
@@ -1177 +1179 @@
 {
     if (index < 0)
-        return 0;
+        return PopupMenuChromium::minimumRowHeight();
 
     if (m_popupClient->itemStyle(index).isDisplayNone())
-        return 0;
+        return PopupMenuChromium::minimumRowHeight();
 
     // Separator row height is the same size as itself.
     if (m_popupClient->itemIsSeparator(index))
-        return separatorHeight;
+        return max(separatorHeight, PopupMenuChromium::minimumRowHeight());
 
     String icon = m_popupClient->itemIcon(index);
@@ -1193 +1195 @@
 
     int linePaddingHeight = m_popupClient->menuStyle().menuType() == PopupMenuStyle::AutofillPopup ? kLinePaddingHeight : 0;
-    return max(fontHeight, iconHeight) + linePaddingHeight * 2;
+    int calculatedRowHeight = max(fontHeight, iconHeight) + linePaddingHeight * 2;
+    return max(calculatedRowHeight, PopupMenuChromium::minimumRowHeight());
 }
 

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

@@ -176 +176 @@
     friend class WTF::RefCounted<PopupContainer>;
 
-    PopupContainer(PopupMenuClient*, PopupType popupType, const PopupContainerSettings&);
+    PopupContainer(PopupMenuClient*, PopupType, const PopupContainerSettings&);
     ~PopupContainer();
 
@@ -208 +208 @@
     virtual void disconnectClient();
 
+    static int minimumRowHeight() { return s_minimumRowHeight; }
+    static void setMinimumRowHeight(int minimumRowHeight) { s_minimumRowHeight = minimumRowHeight; }
+
 private:
     PopupMenuClient* client() const { return m_popupClient; }
@@ -213 +216 @@
     PopupMenuClient* m_popupClient;
     PopupMenuPrivate p;
+
+    static int s_minimumRowHeight;
 };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-07-27  Fady Samuel  <fsamuel@chromium.org>
+
+        Added a Chromium WebKit API method to set the minimum row height of a popup listbox.
+        https://bugs.webkit.org/show_bug.cgi?id=64897
+
+        Reviewed by Darin Fisher.
+
+        * public/WebPopupMenu.h:
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenu::setMinimumRowHeight):
+
 2011-07-27  Peng Huang  <penghuang@chromium.org>
 

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

@@ -42 +42 @@
 public:
     WEBKIT_API static WebPopupMenu* create(WebWidgetClient*);
+
+    // Sets the minimum height of a popup listbox row.
+    WEBKIT_API static void setMinimumRowHeight(int);
 };
 

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

@@ -252 +252 @@
 }
 
+void WebPopupMenu::setMinimumRowHeight(int minimumRowHeight)
+{
+    PopupMenuChromium::setMinimumRowHeight(minimumRowHeight);
+}
+
 bool WebPopupMenuImpl::setComposition(
     const WebString& text, const WebVector<WebCompositionUnderline>& underlines,