diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-04-03 12:18:16 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:13:42 +0200 |
| commit | 4cc2665926faa1ec627da1985def3c62b93e1973 (patch) | |
| tree | ce6b657e6c8b1a6af69e8dba5289c28fb6c6767f | |
| parent | c0273ea019f2f0c8096f6202770ff47e1da8b8bc (diff) | |
<chromium> fixup select elements.
We use RenderWidgetHostViewQt, not RWHVMac, even on Mac.
Since some platform decisions seem to have transpired all the way to
the content layer, we should simply use the web ui for select elements
on mac for the time being.
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Change-Id: Ib430f8686862cf0958ccdbfefb8bfa36af590e97
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/content/browser/web_contents/web_contents_impl.cc | 4 | ||||
| -rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/browser/web_contents/web_contents_impl.cc b/chromium/content/browser/web_contents/web_contents_impl.cc index 6b6cf00819e..ee5b901ddc8 100644 --- a/chromium/content/browser/web_contents/web_contents_impl.cc +++ b/chromium/content/browser/web_contents/web_contents_impl.cc @@ -1464,7 +1464,7 @@ void WebContentsImpl::CreateNewWidget(int render_process_id, // Save the created widget associated with the route so we can show it later. pending_widget_views_[route_id] = widget_view; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(TOOLKIT_QT) // A RenderWidgetHostViewMac has lifetime scoped to the view. We'll retain it // to allow it to survive the trip without being hosted. base::mac::NSObjectRetain(widget_view->GetNativeView()); @@ -1529,7 +1529,7 @@ void WebContentsImpl::ShowCreatedWidget(int route_id, // used to implement Pepper Flash fullscreen. render_widget_host_impl->set_allow_privileged_mouse_lock(is_fullscreen); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(TOOLKIT_QT) // A RenderWidgetHostViewMac has lifetime scoped to the view. Now that it's // properly embedded (or purposefully ignored) we can release the retain we // took in CreateNewWidget(). diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index e910b8bf80d..609b965f468 100644 --- a/chromium/content/renderer/render_thread_impl.cc +++ b/chromium/content/renderer/render_thread_impl.cc @@ -314,7 +314,7 @@ void RenderThreadImpl::Init() { v8::V8::SetCreateHistogramFunction(CreateHistogram); v8::V8::SetAddHistogramSampleFunction(AddHistogramSample); -#if defined(OS_MACOSX) || defined(OS_ANDROID) +#if (defined(OS_MACOSX) || defined(OS_ANDROID)) && !defined(TOOLKIT_QT) // On Mac and Android, the select popups are rendered by the browser. blink::WebView::setUseExternalPopupMenus(true); #endif |