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

Source/WebCore/platform/chromium/PopupMenuChromium.cpp

 /*
  * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 22 matching lines @@
 #include "PopupMenuChromium.h"
 
 #include "Frame.h"
 #include "FrameView.h"
 #include "Page.h"
 #include "PopupContainer.h"
 #include "Settings.h"
 
 namespace WebCore {
 
-int PopupMenuChromium::s_minimumRowHeight = 28;
+int PopupMenuChromium::s_minimumRowHeight = 0;
+int PopupMenuChromium::s_optionRowHeightForTouch = 28;
 
 // The settings used for the drop down menu.
 // This is the delegate used if none is provided.
 static const PopupContainerSettings dropDownSettings = {
     true, // setTextOnIndexChange
     true, // acceptOnAbandon
     false, // loopSelectionNavigation
     false // restrictWidthOfListBox
 };
 
@@ skipping 33 matching lines @@
     p.popup->listBox()->updateFromElement();
 }
 
 
 void PopupMenuChromium::disconnectClient()
 {
     m_popupClient = 0;
 }
 
 } // namespace WebCore