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

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

Issue 14408004: Fix incorrect evaluation of resolution media queries (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 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 unified diff | Download patch
« no previous file with comments | « Source/core/page/Screen.cpp ('k') | Source/core/page/Settings.cpp » ('j') | no next file with comments »
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; } 97 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; }
98 98
99 void setTextAutosizingFontScaleFactor(float); 99 void setTextAutosizingFontScaleFactor(float);
100 float textAutosizingFontScaleFactor() const { return m_textAutosizingFontSca leFactor; } 100 float textAutosizingFontScaleFactor() const { return m_textAutosizingFontSca leFactor; }
101 101
102 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true. 102 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true.
103 void setTextAutosizingWindowSizeOverride(const IntSize&); 103 void setTextAutosizingWindowSizeOverride(const IntSize&);
104 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; } 104 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; }
105 105
106 // Only set by Layout Tests. 106 // Only set by Layout Tests.
107 void setResolutionOverride(const IntSize&);
108 const IntSize& resolutionOverride() const { return m_resolutionDensityPerInc hOverride; }
109
110 // Only set by Layout Tests.
111 void setMediaTypeOverride(const String&); 107 void setMediaTypeOverride(const String&);
112 const String& mediaTypeOverride() const { return m_mediaTypeOverride; } 108 const String& mediaTypeOverride() const { return m_mediaTypeOverride; }
113 109
114 // Unlike areImagesEnabled, this only suppresses the network load of 110 // Unlike areImagesEnabled, this only suppresses the network load of
115 // the image URL. A cached image will still be rendered if requested. 111 // the image URL. A cached image will still be rendered if requested.
116 void setLoadsImagesAutomatically(bool); 112 void setLoadsImagesAutomatically(bool);
117 bool loadsImagesAutomatically() const { return m_loadsImagesAutomatically; } 113 bool loadsImagesAutomatically() const { return m_loadsImagesAutomatically; }
118 114
119 // Clients that execute script should call ScriptController::canExecuteScrip ts() 115 // Clients that execute script should call ScriptController::canExecuteScrip ts()
120 // instead of this function. ScriptController::canExecuteScripts() checks th e 116 // instead of this function. ScriptController::canExecuteScripts() checks th e
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 ScriptFontFamilyMap m_standardFontFamilyMap; 168 ScriptFontFamilyMap m_standardFontFamilyMap;
173 ScriptFontFamilyMap m_serifFontFamilyMap; 169 ScriptFontFamilyMap m_serifFontFamilyMap;
174 ScriptFontFamilyMap m_fixedFontFamilyMap; 170 ScriptFontFamilyMap m_fixedFontFamilyMap;
175 ScriptFontFamilyMap m_sansSerifFontFamilyMap; 171 ScriptFontFamilyMap m_sansSerifFontFamilyMap;
176 ScriptFontFamilyMap m_cursiveFontFamilyMap; 172 ScriptFontFamilyMap m_cursiveFontFamilyMap;
177 ScriptFontFamilyMap m_fantasyFontFamilyMap; 173 ScriptFontFamilyMap m_fantasyFontFamilyMap;
178 ScriptFontFamilyMap m_pictographFontFamilyMap; 174 ScriptFontFamilyMap m_pictographFontFamilyMap;
179 float m_textAutosizingFontScaleFactor; 175 float m_textAutosizingFontScaleFactor;
180 IntSize m_textAutosizingWindowSizeOverride; 176 IntSize m_textAutosizingWindowSizeOverride;
181 bool m_textAutosizingEnabled : 1; 177 bool m_textAutosizingEnabled : 1;
182 IntSize m_resolutionDensityPerInchOverride;
183 178
184 SETTINGS_MEMBER_VARIABLES 179 SETTINGS_MEMBER_VARIABLES
185 180
186 bool m_isJavaEnabled : 1; 181 bool m_isJavaEnabled : 1;
187 bool m_loadsImagesAutomatically : 1; 182 bool m_loadsImagesAutomatically : 1;
188 bool m_areImagesEnabled : 1; 183 bool m_areImagesEnabled : 1;
189 bool m_arePluginsEnabled : 1; 184 bool m_arePluginsEnabled : 1;
190 bool m_isScriptEnabled : 1; 185 bool m_isScriptEnabled : 1;
191 unsigned m_fontRenderingMode : 1; 186 unsigned m_fontRenderingMode : 1;
192 bool m_isCSSCustomFilterEnabled : 1; 187 bool m_isCSSCustomFilterEnabled : 1;
193 bool m_cssStickyPositionEnabled : 1; 188 bool m_cssStickyPositionEnabled : 1;
194 bool m_cssVariablesEnabled : 1; 189 bool m_cssVariablesEnabled : 1;
195 bool m_dnsPrefetchingEnabled : 1; 190 bool m_dnsPrefetchingEnabled : 1;
196 191
197 bool m_touchEventEmulationEnabled : 1; 192 bool m_touchEventEmulationEnabled : 1;
198 193
199 Timer<Settings> m_setImageLoadingSettingsTimer; 194 Timer<Settings> m_setImageLoadingSettingsTimer;
200 void imageLoadingSettingsTimerFired(Timer<Settings>*); 195 void imageLoadingSettingsTimerFired(Timer<Settings>*);
201 196
202 static bool gMockScrollbarsEnabled; 197 static bool gMockScrollbarsEnabled;
203 static bool gUsesOverlayScrollbars; 198 static bool gUsesOverlayScrollbars;
204 }; 199 };
205 200
206 } // namespace WebCore 201 } // namespace WebCore
207 202
208 #endif // Settings_h 203 #endif // Settings_h
OLDNEW
« no previous file with comments | « Source/core/page/Screen.cpp ('k') | Source/core/page/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698