| Index: Source/core/page/Settings.cpp
|
| diff --git a/Source/core/page/Settings.cpp b/Source/core/page/Settings.cpp
|
| index d46062dcaef1fa115bf41d9943a69d49d21d0910..a1984f73740fa0277457b1c40318153a6aa4f07d 100644
|
| --- a/Source/core/page/Settings.cpp
|
| +++ b/Source/core/page/Settings.cpp
|
| @@ -123,6 +123,7 @@ Settings::Settings(Page* page)
|
| #endif
|
| , m_useWideViewport(true)
|
| , m_loadWithOverviewMode(true)
|
| + , m_textAutosizingOverride(NoOverride)
|
| SETTINGS_INITIALIZER_LIST
|
| , m_isJavaEnabled(false)
|
| , m_loadsImagesAutomatically(false)
|
| @@ -227,6 +228,21 @@ void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
|
| m_page->setNeedsRecalcStyleInAllFrames();
|
| }
|
|
|
| +bool Settings::textAutosizingEnabled() const
|
| +{
|
| + switch (m_textAutosizingOverride) {
|
| + case NoOverride:
|
| + return m_textAutosizingEnabled;
|
| + case TextAutosizingOverrideEnabled:
|
| + return true;
|
| + case TextAutosizingOverrideDisabled:
|
| + return false;
|
| + default:
|
| + ASSERT_NOT_REACHED();
|
| + }
|
| + return false;
|
| +}
|
| +
|
| void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizingWindowSizeOverride)
|
| {
|
| if (m_textAutosizingWindowSizeOverride == textAutosizingWindowSizeOverride)
|
| @@ -236,6 +252,15 @@ void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizing
|
| m_page->setNeedsRecalcStyleInAllFrames();
|
| }
|
|
|
| +void Settings::setTextAutosizingEnabledOverride(TextAutosizingOverride textAutosizingOverride)
|
| +{
|
| + if (m_textAutosizingOverride == textAutosizingOverride)
|
| + return;
|
| +
|
| + m_textAutosizingOverride = textAutosizingOverride;
|
| + m_page->setNeedsRecalcStyleInAllFrames();
|
| +}
|
| +
|
| void Settings::setUseWideViewport(bool useWideViewport)
|
| {
|
| if (m_useWideViewport == useWideViewport)
|
|
|