76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
|
|
index 11d980e..a87fb7e 100644
|
|
--- Source/web/ChromeClientImpl.cpp
|
|
+++ Source/web/ChromeClientImpl.cpp
|
|
@@ -895,7 +895,7 @@ bool ChromeClientImpl::hasOpenedPopup() const {
|
|
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame,
|
|
HTMLSelectElement& select) {
|
|
notifyPopupOpeningObservers();
|
|
- if (WebViewImpl::useExternalPopupMenus())
|
|
+ if (m_webView->useExternalPopupMenus())
|
|
return new ExternalPopupMenu(frame, select, *m_webView);
|
|
|
|
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
|
|
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
|
|
index 6a7688b..7ca2fab 100644
|
|
--- Source/web/WebViewImpl.cpp
|
|
+++ Source/web/WebViewImpl.cpp
|
|
@@ -358,6 +358,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
|
|
m_enableFakePageScaleAnimationForTesting(false),
|
|
m_fakePageScaleAnimationPageScaleFactor(0),
|
|
m_fakePageScaleAnimationUseAnchor(false),
|
|
+ m_shouldUseExternalPopupMenus(shouldUseExternalPopupMenus),
|
|
m_compositorDeviceScaleFactorOverride(0),
|
|
m_suppressNextKeypressEvent(false),
|
|
m_imeAcceptEvents(true),
|
|
@@ -3704,8 +3705,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() {
|
|
m_devToolsEmulator->mainFrameScrollOrScaleChanged();
|
|
}
|
|
|
|
+void WebViewImpl::setUseExternalPopupMenusThisInstance(
|
|
+ bool useExternalPopupMenus) {
|
|
+ m_shouldUseExternalPopupMenus = useExternalPopupMenus;
|
|
+}
|
|
+
|
|
bool WebViewImpl::useExternalPopupMenus() {
|
|
- return shouldUseExternalPopupMenus;
|
|
+ return m_shouldUseExternalPopupMenus;
|
|
}
|
|
|
|
void WebViewImpl::setBackgroundColorOverride(WebColor color) {
|
|
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
|
|
index e4ad02f..8bfaa1c 100644
|
|
--- Source/web/WebViewImpl.h
|
|
+++ Source/web/WebViewImpl.h
|
|
@@ -371,7 +371,8 @@ class WEB_EXPORT WebViewImpl final
|
|
|
|
// 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 { return m_shouldAutoResize; }
|
|
|
|
@@ -651,6 +652,8 @@ class WEB_EXPORT WebViewImpl final
|
|
float m_fakePageScaleAnimationPageScaleFactor;
|
|
bool m_fakePageScaleAnimationUseAnchor;
|
|
|
|
+ bool m_shouldUseExternalPopupMenus;
|
|
+
|
|
float m_compositorDeviceScaleFactorOverride;
|
|
TransformationMatrix m_deviceEmulationTransform;
|
|
|
|
diff --git public/web/WebView.h public/web/WebView.h
|
|
index 061f017..9fd430e 100644
|
|
--- public/web/WebView.h
|
|
+++ public/web/WebView.h
|
|
@@ -404,6 +404,7 @@ class WebView : protected WebWidget {
|
|
|
|
// 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;
|