diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp index e728623..e0f051e 100644 --- Source/web/ChromeClientImpl.cpp +++ Source/web/ChromeClientImpl.cpp @@ -825,7 +825,7 @@ bool ChromeClientImpl::hasOpenedPopup() const PassRefPtrWillBeRawPtr ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select) { notifyPopupOpeningObservers(); - if (WebViewImpl::useExternalPopupMenus()) + if (m_webView->useExternalPopupMenus()) return adoptRefWillBeNoop(new ExternalPopupMenu(frame, select, *m_webView)); ASSERT(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp index 416f9d8..43934e3 100644 --- Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp @@ -476,6 +476,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client) , m_enableFakePageScaleAnimationForTesting(false) , m_fakePageScaleAnimationPageScaleFactor(0) , m_fakePageScaleAnimationUseAnchor(false) + , m_shouldUseExternalPopupMenus(shouldUseExternalPopupMenus) , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) @@ -4138,9 +4139,14 @@ void WebViewImpl::pageScaleFactorChanged() m_client->pageScaleFactorChanged(); } +void WebViewImpl::setUseExternalPopupMenusThisInstance(bool useExternalPopupMenus) +{ + m_shouldUseExternalPopupMenus = useExternalPopupMenus; +} + bool WebViewImpl::useExternalPopupMenus() { - return shouldUseExternalPopupMenus; + return m_shouldUseExternalPopupMenus; } void WebViewImpl::startDragging(LocalFrame* frame, diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h index cc4c325..b709524 100644 --- Source/web/WebViewImpl.h +++ Source/web/WebViewImpl.h @@ -395,7 +395,8 @@ public: // Returns true if popup menus should be rendered by the browser, false if // they should be rendered by WebKit (which is the default). - static bool useExternalPopupMenus(); + void setUseExternalPopupMenusThisInstance(bool); + bool useExternalPopupMenus(); bool shouldAutoResize() const { @@ -692,6 +693,8 @@ private: float m_fakePageScaleAnimationPageScaleFactor; bool m_fakePageScaleAnimationUseAnchor; + bool m_shouldUseExternalPopupMenus; + bool m_doingDragAndDrop; bool m_ignoreInputEvents; diff --git public/web/WebView.h public/web/WebView.h index 18b2e9d..8b0b784 100644 --- public/web/WebView.h +++ public/web/WebView.h @@ -408,6 +408,7 @@ public: // Sets whether select popup menus should be rendered by the browser. BLINK_EXPORT static void setUseExternalPopupMenus(bool); + virtual void setUseExternalPopupMenusThisInstance(bool) = 0; // Hides any popup (suggestions, selects...) that might be showing. virtual void hidePopups() = 0;