Chromium Code Reviews| Index: Source/core/page/Settings.h |
| diff --git a/Source/core/page/Settings.h b/Source/core/page/Settings.h |
| index e391fec1f50b36ef9bdff211727b4dbdfa834d8d..ef4db691d651fa092bed372b3c6a257594cd13ff 100644 |
| --- a/Source/core/page/Settings.h |
| +++ b/Source/core/page/Settings.h |
| @@ -48,6 +48,12 @@ enum EditableLinkBehavior { |
| EditableLinkNeverLive |
| }; |
| +enum TextAutosizingOverride { |
| + NoOverride, |
| + Enabled, |
| + Disabled |
| +}; |
| + |
| // UScriptCode uses -1 and 0 for UScriptInvalidCode and UScriptCommon. |
| // We need to use -2 and -3 for empty value and deleted value. |
| struct UScriptCodeHashTraits : WTF::GenericHashTraits<int> { |
| @@ -86,7 +92,7 @@ public: |
| const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const; |
| void setTextAutosizingEnabled(bool); |
| - bool textAutosizingEnabled() const { return m_textAutosizingEnabled; } |
| + bool textAutosizingEnabled() const; |
| void setTextAutosizingFontScaleFactor(float); |
| float textAutosizingFontScaleFactor() const { return m_textAutosizingFontScaleFactor; } |
| @@ -95,6 +101,8 @@ public: |
| void setTextAutosizingWindowSizeOverride(const IntSize&); |
| const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutosizingWindowSizeOverride; } |
| + void setTextAutosizingEnabledOverride(TextAutosizingOverride); |
| + |
| void setUseWideViewport(bool); |
| bool useWideViewport() const { return m_useWideViewport; } |
| @@ -172,6 +180,7 @@ private: |
| bool m_textAutosizingEnabled : 1; |
| bool m_useWideViewport : 1; |
| bool m_loadWithOverviewMode : 1; |
| + unsigned m_textAutosizingOverride : 2; // TextAutosizingOverride |
|
skobes
2013/10/16 19:38:09
Why is the type unsigned int instead of TextAutosi
pdr.
2013/10/18 01:28:44
This is a c++ issue where enum types can't be in b
|
| SETTINGS_MEMBER_VARIABLES |