Merge 130513 - [chromium] Only inflate the height of rows in a popup menu when a touch device is de…

Source/WebCore/platform/chromium/PopupListBox.cpp

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 596 matching lines @@
         clearSelection();
 }
 
 void PopupListBox::setOriginalIndex(int index)
 {
     m_originalIndex = m_selectedIndex = index;
 }
 
 int PopupListBox::getRowHeight(int index)
 {
+    int minimumHeight = PopupMenuChromium::minimumRowHeight();
+    if (m_settings.deviceSupportsTouch)
+        minimumHeight = max(minimumHeight, PopupMenuChromium::optionRowHeightForTouch());
+
     if (index < 0 || m_popupClient->itemStyle(index).isDisplayNone())
-        return PopupMenuChromium::minimumRowHeight();
+        return minimumHeight;
 
     // Separator row height is the same size as itself.
     if (m_popupClient->itemIsSeparator(index))
-        return max(separatorHeight, (PopupMenuChromium::minimumRowHeight()));
+        return max(separatorHeight, minimumHeight);
 
     String icon = m_popupClient->itemIcon(index);
     RefPtr<Image> image(Image::loadPlatformResource(icon.utf8().data()));
 
     int fontHeight = getRowFont(index).fontMetrics().height();
     int iconHeight = (image && !image->isNull()) ? image->rect().height() : 0;
 
     int linePaddingHeight = m_popupClient->menuStyle().menuType() == PopupMenuStyle::AutofillPopup ? kLinePaddingHeight : 0;
     int calculatedRowHeight = max(fontHeight, iconHeight) + linePaddingHeight * 2;
-    return max(calculatedRowHeight, PopupMenuChromium::minimumRowHeight());
+    return max(calculatedRowHeight, minimumHeight);
 }
 
 IntRect PopupListBox::getRowBounds(int index)
 {
     if (index < 0)
         return IntRect(0, 0, visibleWidth(), getRowHeight(index));
 
     return IntRect(0, m_items[index]->yOffset, visibleWidth(), getRowHeight(index));
 }
 
@@ skipping 261 matching lines @@
 {
     return numItems() && IntRect(0, 0, width(), height()).contains(point);
 }
 
 int PopupListBox::popupContentHeight() const
 {
     return height();
 }
 
 } // namespace WebCore