Chromium Code Reviews| Index: Source/core/page/Settings.cpp |
| diff --git a/Source/core/page/Settings.cpp b/Source/core/page/Settings.cpp |
| index 317c8e34b48d46add7fc4d735e2f90153510ef88..22bb6745780f21923391fd4b97e71507a8ba4517 100644 |
| --- a/Source/core/page/Settings.cpp |
| +++ b/Source/core/page/Settings.cpp |
| @@ -122,6 +122,7 @@ Settings::Settings(Page* page) |
| #endif |
| , m_useWideViewport(true) |
| , m_loadWithOverviewMode(true) |
| + , m_textAutosizingOverride(NoOverride) |
| SETTINGS_INITIALIZER_LIST |
| , m_isJavaEnabled(false) |
| , m_loadsImagesAutomatically(false) |
| @@ -224,6 +225,21 @@ void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled) |
| m_page->setNeedsRecalcStyleInAllFrames(); |
| } |
| +bool Settings::textAutosizingEnabled() const |
| +{ |
| + switch (m_textAutosizingOverride) { |
| + case NoOverride: |
| + return m_textAutosizingEnabled; |
| + case Enabled: |
| + return true; |
| + case Disabled: |
| + return false; |
| + default: |
| + ASSERT_NOT_REACHED(); |
| + } |
| + return false; |
| +} |
| + |
| void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizingWindowSizeOverride) |
| { |
| if (m_textAutosizingWindowSizeOverride == textAutosizingWindowSizeOverride) |
| @@ -233,6 +249,15 @@ void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizing |
| m_page->setNeedsRecalcStyleInAllFrames(); |
| } |
| +void Settings::setTextAutosizingEnabledOverride(TextAutosizingOverride textAutosizingOverride) |
|
pfeldman
2013/10/16 05:34:14
Instead of introducing a new setting clients might
pdr.
2013/10/18 01:28:44
Great catch, done.
|
| +{ |
| + if (m_textAutosizingOverride == textAutosizingOverride) |
| + return; |
| + |
| + m_textAutosizingOverride = textAutosizingOverride; |
| + m_page->setNeedsRecalcStyleInAllFrames(); |
| +} |
| + |
| void Settings::setUseWideViewport(bool useWideViewport) |
| { |
| if (m_useWideViewport == useWideViewport) |