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

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

Issue 319283002: [FastTextAutosizer] Inherit the text autosizing multiplier (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove non-critical changes Created 6 years, 6 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
Index: Source/core/rendering/style/RenderStyle.h
diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
index 5910bd9b19fb3a4fe9deabefccefd2475d2651bc..2b143d0b98d7ecbb63757c73a95911075ebcf6e8 100644
--- a/Source/core/rendering/style/RenderStyle.h
+++ b/Source/core/rendering/style/RenderStyle.h
@@ -47,6 +47,7 @@
#include "core/rendering/style/StyleFlexibleBoxData.h"
#include "core/rendering/style/StyleGridData.h"
#include "core/rendering/style/StyleGridItemData.h"
+#include "core/rendering/style/StyleInheritedData.h"
#include "core/rendering/style/StyleMarqueeData.h"
#include "core/rendering/style/StyleMultiColData.h"
#include "core/rendering/style/StyleRareInheritedData.h"
@@ -573,7 +574,7 @@ public:
int fontSize() const;
FontWeight fontWeight() const;
- float textAutosizingMultiplier() const { return visual->m_textAutosizingMultiplier; }
+ float textAutosizingMultiplier() const { return inherited->textAutosizingMultiplier; }
const Length& textIndent() const { return rareInheritedData->indent; }
TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(rareInheritedData->m_textIndentLine); }
@@ -1102,7 +1103,7 @@ public:
void setTextAutosizingMultiplier(float v)
{
- SET_VAR(visual, m_textAutosizingMultiplier, v);
+ SET_VAR(inherited, textAutosizingMultiplier, v);
setFontSize(fontDescription().specifiedSize());
}

Powered by Google App Engine
This is Rietveld 408576698