| Index: Source/WebCore/page/Settings.cpp
|
| diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
|
| index 0520cfada6d91ed287dddeafb11a8f5a3c05992b..0ffdf9c12e50a9e7d82cd24971308a93857228e3 100644
|
| --- a/Source/WebCore/page/Settings.cpp
|
| +++ b/Source/WebCore/page/Settings.cpp
|
| @@ -161,7 +161,6 @@ Settings::Settings(Page* page)
|
| : m_page(0)
|
| , m_mediaTypeOverride("screen")
|
| , m_storageBlockingPolicy(SecurityOrigin::AllowAllStorage)
|
| -#if ENABLE(TEXT_AUTOSIZING)
|
| , m_textAutosizingFontScaleFactor(1)
|
| #if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
|
| , m_textAutosizingWindowSizeOverride(320, 480)
|
| @@ -169,7 +168,6 @@ Settings::Settings(Page* page)
|
| #else
|
| , m_textAutosizingEnabled(false)
|
| #endif
|
| -#endif
|
| SETTINGS_INITIALIZER_LIST
|
| , m_isJavaEnabled(false)
|
| , m_isJavaEnabledForLocalFiles(true)
|
| @@ -306,7 +304,6 @@ void Settings::setPictographFontFamily(const AtomicString& family, UScriptCode s
|
| setGenericFontFamilyMap(m_pictographFontFamilyMap, family, script, m_page);
|
| }
|
|
|
| -#if ENABLE(TEXT_AUTOSIZING)
|
| void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
|
| {
|
| if (m_textAutosizingEnabled == textAutosizingEnabled)
|
| @@ -336,8 +333,6 @@ void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
|
| m_page->setNeedsRecalcStyleInAllFrames();
|
| }
|
|
|
| -#endif
|
| -
|
| void Settings::setResolutionOverride(const IntSize& densityPerInchOverride)
|
| {
|
| if (m_resolutionDensityPerInchOverride == densityPerInchOverride)
|
|
|