Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: Source/WebCore/page/Settings.cpp

Issue 13723004: Remove the ENABLE_TEXT_AUTOSIZING compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/page/Settings.h ('k') | Source/WebCore/page/animation/CSSPropertyAnimation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/Settings.cpp
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index d5611d94985f29fe9788ad29d39b25d7186b8b33..6e7ff8a00ad232e2defc6a32ada898cc0c4cbced 100644
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -152,7 +152,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)
@@ -160,7 +159,6 @@ Settings::Settings(Page* page)
#else
, m_textAutosizingEnabled(false)
#endif
-#endif
SETTINGS_INITIALIZER_LIST
, m_isJavaEnabled(false)
, m_isJavaEnabledForLocalFiles(true)
@@ -290,7 +288,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)
@@ -320,8 +317,6 @@ void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
m_page->setNeedsRecalcStyleInAllFrames();
}
-#endif
-
void Settings::setResolutionOverride(const IntSize& densityPerInchOverride)
{
if (m_resolutionDensityPerInchOverride == densityPerInchOverride)
« no previous file with comments | « Source/WebCore/page/Settings.h ('k') | Source/WebCore/page/animation/CSSPropertyAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698