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

Unified Diff: Source/WebCore/rendering/style/RenderStyle.h

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/rendering/TextAutosizer.cpp ('k') | Source/WebCore/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/style/RenderStyle.h
diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
index a632b104d2fec3af2da6edb922d2334ae5a640ee..3abce1c180ed7e557379e2dbf9d60b0c3d81cebb 100644
--- a/Source/WebCore/rendering/style/RenderStyle.h
+++ b/Source/WebCore/rendering/style/RenderStyle.h
@@ -557,9 +557,7 @@ public:
float computedFontSize() const;
int fontSize() const;
-#if ENABLE(TEXT_AUTOSIZING)
float textAutosizingMultiplier() const { return visual->m_textAutosizingMultiplier; }
-#endif
Length textIndent() const { return rareInheritedData->indent; }
#if ENABLE(CSS3_TEXT)
@@ -1100,13 +1098,11 @@ public:
// Only used for blending font sizes when animating, for MathML anonymous blocks, and for text autosizing.
void setFontSize(float);
-#if ENABLE(TEXT_AUTOSIZING)
void setTextAutosizingMultiplier(float v)
{
SET_VAR(visual, m_textAutosizingMultiplier, v);
setFontSize(fontDescription().specifiedSize());
}
-#endif
void setColor(const Color&);
void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
« no previous file with comments | « Source/WebCore/rendering/TextAutosizer.cpp ('k') | Source/WebCore/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698