diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/chromium/src/WebSettingsImpl.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/chromium/src/WebSettingsImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebSettingsImpl.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.cpp b/Source/WebKit/chromium/src/WebSettingsImpl.cpp index 4cc3ef727..988c5e66b 100644 --- a/Source/WebKit/chromium/src/WebSettingsImpl.cpp +++ b/Source/WebKit/chromium/src/WebSettingsImpl.cpp @@ -33,8 +33,8 @@ #include "FontRenderingMode.h" #include "Settings.h" -#include "platform/WebString.h" -#include "platform/WebURL.h" +#include <public/WebString.h> +#include <public/WebURL.h> #include <wtf/UnusedParam.h> #if defined(OS_WIN) @@ -54,6 +54,7 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings) , m_viewportEnabled(false) , m_applyDefaultDeviceScaleFactorInCompositor(false) , m_gestureTapHighlightEnabled(true) + , m_autoZoomFocusedNodeToLegibleScale(false) , m_defaultTileSize(WebSize(256, 256)) , m_maxUntiledLayerSize(WebSize(512, 512)) { @@ -140,6 +141,16 @@ void WebSettingsImpl::setApplyDefaultDeviceScaleFactorInCompositor(bool applyDef m_applyDefaultDeviceScaleFactorInCompositor = applyDefaultDeviceScaleFactorInCompositor; } +void WebSettingsImpl::setApplyPageScaleFactorInCompositor(bool applyPageScaleFactorInCompositor) +{ + m_settings->setApplyPageScaleFactorInCompositor(applyPageScaleFactorInCompositor); +} + +void WebSettingsImpl::setAutoZoomFocusedNodeToLegibleScale(bool autoZoomFocusedNodeToLegibleScale) +{ + m_autoZoomFocusedNodeToLegibleScale = autoZoomFocusedNodeToLegibleScale; +} + void WebSettingsImpl::setTextAutosizingEnabled(bool enabled) { #if ENABLE(TEXT_AUTOSIZING) @@ -653,4 +664,9 @@ void WebSettingsImpl::setGestureTapHighlightEnabled(bool enableHighlight) m_gestureTapHighlightEnabled = enableHighlight; } +bool WebSettingsImpl::applyPageScaleFactorInCompositor() const +{ + return m_settings->applyPageScaleFactorInCompositor(); +} + } // namespace WebKit |