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 |