diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
| commit | 5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch) | |
| tree | 8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WebKit/chromium/src/WebSettingsImpl.cpp | |
| parent | 33b26980cb24288b5a9f2590ccf32a949281bb79 (diff) | |
| download | qtwebkit-5466563f4b5b6b86523e3f89bb7f77e5b5270c78.tar.gz | |
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314
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 |