diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebCore/page/Settings.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebCore/page/Settings.cpp')
| -rw-r--r-- | Source/WebCore/page/Settings.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index ec50f88c8..1e6a75ce9 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -115,8 +115,9 @@ Settings::Settings(Page* page) , m_minimumLogicalFontSize(0) , m_defaultFontSize(0) , m_defaultFixedFontSize(0) + , m_defaultDeviceScaleFactor(1) , m_validationMessageTimerMagnification(50) - , m_minimumAccelerated2dCanvasSize(128 * 128) + , m_minimumAccelerated2dCanvasSize(257 * 256) , m_layoutFallbackWidth(980) , m_deviceDPI(240) , m_maximumDecodedImageSize(numeric_limits<size_t>::max()) @@ -363,6 +364,11 @@ void Settings::setDefaultFixedFontSize(int defaultFontSize) m_page->setNeedsRecalcStyleInAllFrames(); } +void Settings::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor) +{ + m_defaultDeviceScaleFactor = defaultDeviceScaleFactor; +} + void Settings::setLoadsImagesAutomatically(bool loadsImagesAutomatically) { m_loadsImagesAutomatically = loadsImagesAutomatically; |