mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
7e1fbaca6a
- The CefBrowserSettings.user_style_sheet_location option is no longer supported in Blink. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1516 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
Index: public/web/WebView.h
|
|
===================================================================
|
|
--- public/web/WebView.h (revision 161696)
|
|
+++ public/web/WebView.h (working copy)
|
|
@@ -441,6 +441,7 @@
|
|
|
|
// Sets whether select popup menus should be rendered by the browser.
|
|
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
|
|
+ virtual void setUseExternalPopupMenusThisInstance(bool) = 0;
|
|
|
|
|
|
// Visited link state --------------------------------------------------
|
|
Index: Source/web/ChromeClientImpl.cpp
|
|
===================================================================
|
|
--- Source/web/ChromeClientImpl.cpp (revision 161696)
|
|
+++ Source/web/ChromeClientImpl.cpp (working copy)
|
|
@@ -871,7 +871,7 @@
|
|
|
|
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
|
|
{
|
|
- if (WebViewImpl::useExternalPopupMenus())
|
|
+ if (m_webView->useExternalPopupMenus())
|
|
return adoptRef(new ExternalPopupMenu(frame, client, m_webView->client()));
|
|
|
|
return adoptRef(new PopupMenuChromium(frame, client));
|
|
Index: Source/web/WebViewImpl.cpp
|
|
===================================================================
|
|
--- Source/web/WebViewImpl.cpp (revision 161696)
|
|
+++ Source/web/WebViewImpl.cpp (working copy)
|
|
@@ -390,6 +390,7 @@
|
|
, m_fakePageScaleAnimationPageScaleFactor(0)
|
|
, m_fakePageScaleAnimationUseAnchor(false)
|
|
, m_contextMenuAllowed(false)
|
|
+ , m_shouldUseExternalPopupMenus(shouldUseExternalPopupMenus)
|
|
, m_doingDragAndDrop(false)
|
|
, m_ignoreInputEvents(false)
|
|
, m_compositorDeviceScaleFactorOverride(0)
|
|
@@ -3693,9 +3694,14 @@
|
|
updateLayerTreeViewport();
|
|
}
|
|
|
|
+void WebViewImpl::setUseExternalPopupMenusThisInstance(bool useExternalPopupMenus)
|
|
+{
|
|
+ m_shouldUseExternalPopupMenus = useExternalPopupMenus;
|
|
+}
|
|
+
|
|
bool WebViewImpl::useExternalPopupMenus()
|
|
{
|
|
- return shouldUseExternalPopupMenus;
|
|
+ return m_shouldUseExternalPopupMenus;
|
|
}
|
|
|
|
void WebViewImpl::startDragging(Frame* frame,
|
|
Index: Source/web/WebViewImpl.h
|
|
===================================================================
|
|
--- Source/web/WebViewImpl.h (revision 161696)
|
|
+++ Source/web/WebViewImpl.h (working copy)
|
|
@@ -414,7 +414,8 @@
|
|
|
|
// 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 contextMenuAllowed() const
|
|
{
|
|
@@ -710,6 +711,8 @@
|
|
|
|
bool m_contextMenuAllowed;
|
|
|
|
+ bool m_shouldUseExternalPopupMenus;
|
|
+
|
|
bool m_doingDragAndDrop;
|
|
|
|
bool m_ignoreInputEvents;
|