Merge 139356

Source/WebKit/chromium/src/WebSettingsImpl.cpp

Index: Source/WebKit/chromium/src/WebSettingsImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebSettingsImpl.cpp	(revision 139470)
+++ Source/WebKit/chromium/src/WebSettingsImpl.cpp	(working copy)
@@ -54,7 +54,6 @@
     , m_renderVSyncEnabled(true)
     , m_lowLatencyRenderingEnabled(false)
     , m_viewportEnabled(false)
-    , m_applyDeviceScaleFactorInCompositor(false)
     , m_gestureTapHighlightEnabled(true)
     , m_autoZoomFocusedNodeToLegibleScale(false)
     , m_deferredImageDecodingEnabled(false)
@@ -142,7 +141,7 @@
 
 void WebSettingsImpl::setApplyDeviceScaleFactorInCompositor(bool applyDeviceScaleFactorInCompositor)
 {
-    m_applyDeviceScaleFactorInCompositor = applyDeviceScaleFactorInCompositor;
+    m_settings->setApplyDeviceScaleFactorInCompositor(applyDeviceScaleFactorInCompositor);
 }
 
 void WebSettingsImpl::setApplyPageScaleFactorInCompositor(bool applyPageScaleFactorInCompositor)
@@ -714,6 +713,11 @@
     m_gestureTapHighlightEnabled = enableHighlight;
 }
 
+bool WebSettingsImpl::applyDeviceScaleFactorInCompositor() const
+{
+    return m_settings->applyDeviceScaleFactorInCompositor();
+}
+
 bool WebSettingsImpl::applyPageScaleFactorInCompositor() const
 {
     return m_settings->applyPageScaleFactorInCompositor();