diff options
Diffstat (limited to 'content/renderer/render_thread.cc')
| -rw-r--r-- | content/renderer/render_thread.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc index ba95709..5d2f33d 100644 --- a/content/renderer/render_thread.cc +++ b/content/renderer/render_thread.cc @@ -59,6 +59,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" @@ -98,6 +99,10 @@ using WebKit::WebView; namespace { static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */; +#if defined(TOUCH_UI) +static const int kPopupListBoxMinimumRowHeight = 60; +#endif + // Keep the global RenderThread in a TLS slot so it is impossible to access // incorrectly from the wrong thread. static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls( @@ -631,6 +636,7 @@ void RenderThread::EnsureWebKitInitialized() { #ifdef TOUCH_UI WebRuntimeFeatures::enableTouch(true); + WebKit::WebPopupMenu::setMinimumRowHeight(kPopupListBoxMinimumRowHeight); #else // TODO(saintlou): in the future touch should always be enabled WebRuntimeFeatures::enableTouch(false); |