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

Side by Side Diff: Source/core/page/Settings.h

Issue 49913005: Add Settings::deviceScaleAdjustment. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/page/Settings.cpp » ('j') | Source/core/page/Settings.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 void setPictographFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMM ON); 85 void setPictographFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMM ON);
86 const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const ; 86 const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const ;
87 87
88 void setTextAutosizingEnabled(bool); 88 void setTextAutosizingEnabled(bool);
89 bool textAutosizingEnabled() const; 89 bool textAutosizingEnabled() const;
90 90
91 void setTextAutosizingFontScaleFactor(float); 91 void setTextAutosizingFontScaleFactor(float);
92 float textAutosizingFontScaleFactor() const { return m_textAutosizingFontSca leFactor; } 92 float textAutosizingFontScaleFactor() const { return m_textAutosizingFontSca leFactor; }
93 93
94 void setDeviceScaleAdjustment(float);
pdr. 2013/10/29 02:04:44 Can you add a comment here describing what this is
skobes 2013/10/29 17:43:32 Done.
95 float deviceScaleAdjustment() const { return m_deviceScaleAdjustment; }
96
94 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true. 97 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true.
95 void setTextAutosizingWindowSizeOverride(const IntSize&); 98 void setTextAutosizingWindowSizeOverride(const IntSize&);
96 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; } 99 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; }
97 100
98 void setUseWideViewport(bool); 101 void setUseWideViewport(bool);
99 bool useWideViewport() const { return m_useWideViewport; } 102 bool useWideViewport() const { return m_useWideViewport; }
100 103
101 void setLoadWithOverviewMode(bool); 104 void setLoadWithOverviewMode(bool);
102 bool loadWithOverviewMode() const { return m_loadWithOverviewMode; } 105 bool loadWithOverviewMode() const { return m_loadWithOverviewMode; }
103 106
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 String m_mediaTypeOverride; 164 String m_mediaTypeOverride;
162 KURL m_userStyleSheetLocation; 165 KURL m_userStyleSheetLocation;
163 ScriptFontFamilyMap m_standardFontFamilyMap; 166 ScriptFontFamilyMap m_standardFontFamilyMap;
164 ScriptFontFamilyMap m_serifFontFamilyMap; 167 ScriptFontFamilyMap m_serifFontFamilyMap;
165 ScriptFontFamilyMap m_fixedFontFamilyMap; 168 ScriptFontFamilyMap m_fixedFontFamilyMap;
166 ScriptFontFamilyMap m_sansSerifFontFamilyMap; 169 ScriptFontFamilyMap m_sansSerifFontFamilyMap;
167 ScriptFontFamilyMap m_cursiveFontFamilyMap; 170 ScriptFontFamilyMap m_cursiveFontFamilyMap;
168 ScriptFontFamilyMap m_fantasyFontFamilyMap; 171 ScriptFontFamilyMap m_fantasyFontFamilyMap;
169 ScriptFontFamilyMap m_pictographFontFamilyMap; 172 ScriptFontFamilyMap m_pictographFontFamilyMap;
170 float m_textAutosizingFontScaleFactor; 173 float m_textAutosizingFontScaleFactor;
174 float m_deviceScaleAdjustment;
171 IntSize m_textAutosizingWindowSizeOverride; 175 IntSize m_textAutosizingWindowSizeOverride;
172 bool m_textAutosizingEnabled : 1; 176 bool m_textAutosizingEnabled : 1;
173 bool m_useWideViewport : 1; 177 bool m_useWideViewport : 1;
174 bool m_loadWithOverviewMode : 1; 178 bool m_loadWithOverviewMode : 1;
175 179
176 SETTINGS_MEMBER_VARIABLES 180 SETTINGS_MEMBER_VARIABLES
177 181
178 bool m_isJavaEnabled : 1; 182 bool m_isJavaEnabled : 1;
179 bool m_loadsImagesAutomatically : 1; 183 bool m_loadsImagesAutomatically : 1;
180 bool m_areImagesEnabled : 1; 184 bool m_areImagesEnabled : 1;
181 bool m_arePluginsEnabled : 1; 185 bool m_arePluginsEnabled : 1;
182 bool m_isScriptEnabled : 1; 186 bool m_isScriptEnabled : 1;
183 bool m_dnsPrefetchingEnabled : 1; 187 bool m_dnsPrefetchingEnabled : 1;
184 188
185 bool m_touchEventEmulationEnabled : 1; 189 bool m_touchEventEmulationEnabled : 1;
186 bool m_openGLMultisamplingEnabled : 1; 190 bool m_openGLMultisamplingEnabled : 1;
187 bool m_viewportEnabled : 1; 191 bool m_viewportEnabled : 1;
188 192
189 // FIXME: This is a temporary flag and should be removed once accelerated 193 // FIXME: This is a temporary flag and should be removed once accelerated
190 // overflow scroll is ready (crbug.com/254111). 194 // overflow scroll is ready (crbug.com/254111).
191 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; 195 bool m_compositorDrivenAcceleratedScrollingEnabled : 1;
192 196
193 Timer<Settings> m_setImageLoadingSettingsTimer; 197 Timer<Settings> m_setImageLoadingSettingsTimer;
194 void imageLoadingSettingsTimerFired(Timer<Settings>*); 198 void imageLoadingSettingsTimerFired(Timer<Settings>*);
199 void recalculateAutosizingMultipliers();
195 }; 200 };
196 201
197 } // namespace WebCore 202 } // namespace WebCore
198 203
199 #endif // Settings_h 204 #endif // Settings_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/Settings.cpp » ('j') | Source/core/page/Settings.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698