Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: Source/WebKit/chromium/src/WebSettingsImpl.cpp

Issue 13818030: Added primary input devices setting to blink to allow media queries for hover/pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review fixes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/src/WebSettingsImpl.h ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebSettingsImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.cpp b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
index fce46e68b3ea53f42f66aec19d13cb5de3583fbe..f794d65e635adb01d1e8782220ef9c9ac3f72ad3 100644
--- a/Source/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -127,6 +127,7 @@ void WebSettingsImpl::setMinimumLogicalFontSize(int size)
m_settings->setMinimumLogicalFontSize(size);
}
+// FIXME: Remove this http://crbug.com/136119
void WebSettingsImpl::setDeviceSupportsTouch(bool deviceSupportsTouch)
{
m_settings->setDeviceSupportsTouch(deviceSupportsTouch);
@@ -142,6 +143,11 @@ bool WebSettingsImpl::deviceSupportsTouch()
return m_settings->deviceSupportsTouch();
}
+int WebSettingsImpl::primaryPointerDevices()
+{
+ return m_settings->primaryPointerDevices();
+}
+
void WebSettingsImpl::setAutoZoomFocusedNodeToLegibleScale(bool autoZoomFocusedNodeToLegibleScale)
{
m_autoZoomFocusedNodeToLegibleScale = autoZoomFocusedNodeToLegibleScale;
@@ -207,6 +213,11 @@ void WebSettingsImpl::setPluginsEnabled(bool enabled)
m_settings->setPluginsEnabled(enabled);
}
+void WebSettingsImpl::setPrimaryPointerDevices(int devices)
+{
+ m_settings->setPrimaryPointerDevices(devices);
+}
+
void WebSettingsImpl::setDOMPasteAllowed(bool enabled)
{
m_settings->setDOMPasteAllowed(enabled);
@@ -710,4 +721,9 @@ void WebSettingsImpl::setSmartInsertDeleteEnabled(bool enabled)
m_settings->setSmartInsertDeleteEnabled(enabled);
}
+COMPILE_ASSERT(static_cast<int>(WebSettings::PointerDeviceMouse) == static_cast<int>(WebCore::PointerDeviceMouse), mismatched_enums);
+COMPILE_ASSERT(static_cast<int>(WebSettings::PointerDeviceTouch) == static_cast<int>(WebCore::PointerDeviceTouch), mismatched_enums);
+COMPILE_ASSERT(static_cast<int>(WebSettings::PointerDeviceNone) == static_cast<int>(WebCore::PointerDeviceNone), mismatched_enums);
+COMPILE_ASSERT(static_cast<int>(WebSettings::PointerDeviceUnknown) == static_cast<int>(WebCore::PointerDeviceUnknown), mismatched_enums);
+
} // namespace WebKit
« no previous file with comments | « Source/WebKit/chromium/src/WebSettingsImpl.h ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698