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

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, 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 unified diff | Download patch
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_textAutosizingFon tScaleFactor; } 100 float textAutosizingFontScaleFactor() const { return m_textAutosizingFon tScaleFactor; }
101 101
102 // Only set by Layout Tests, and only used if textAutosizingEnabled() re turns true. 102 // Only set by Layout Tests, and only used if textAutosizingEnabled() re turns true.
103 void setTextAutosizingWindowSizeOverride(const IntSize&); 103 void setTextAutosizingWindowSizeOverride(const IntSize&);
104 const IntSize& textAutosizingWindowSizeOverride() const { return m_textA utosizingWindowSizeOverride; } 104 const IntSize& textAutosizingWindowSizeOverride() const { return m_textA utosizingWindowSizeOverride; }
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_resolutionDensityPe rInchOverride; }
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_loadsImagesAutomaticall y; } 113 bool loadsImagesAutomatically() const { return m_loadsImagesAutomaticall y; }
118 114
119 // Clients that execute script should call ScriptController::canExecuteS cripts() 115 // Clients that execute script should call ScriptController::canExecuteS cripts()
120 // instead of this function. ScriptController::canExecuteScripts() check s the 116 // instead of this function. ScriptController::canExecuteScripts() check s the
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 ScriptFontFamilyMap m_standardFontFamilyMap; 191 ScriptFontFamilyMap m_standardFontFamilyMap;
196 ScriptFontFamilyMap m_serifFontFamilyMap; 192 ScriptFontFamilyMap m_serifFontFamilyMap;
197 ScriptFontFamilyMap m_fixedFontFamilyMap; 193 ScriptFontFamilyMap m_fixedFontFamilyMap;
198 ScriptFontFamilyMap m_sansSerifFontFamilyMap; 194 ScriptFontFamilyMap m_sansSerifFontFamilyMap;
199 ScriptFontFamilyMap m_cursiveFontFamilyMap; 195 ScriptFontFamilyMap m_cursiveFontFamilyMap;
200 ScriptFontFamilyMap m_fantasyFontFamilyMap; 196 ScriptFontFamilyMap m_fantasyFontFamilyMap;
201 ScriptFontFamilyMap m_pictographFontFamilyMap; 197 ScriptFontFamilyMap m_pictographFontFamilyMap;
202 float m_textAutosizingFontScaleFactor; 198 float m_textAutosizingFontScaleFactor;
203 IntSize m_textAutosizingWindowSizeOverride; 199 IntSize m_textAutosizingWindowSizeOverride;
204 bool m_textAutosizingEnabled : 1; 200 bool m_textAutosizingEnabled : 1;
205 IntSize m_resolutionDensityPerInchOverride;
206 201
207 SETTINGS_MEMBER_VARIABLES 202 SETTINGS_MEMBER_VARIABLES
208 203
209 bool m_isJavaEnabled : 1; 204 bool m_isJavaEnabled : 1;
210 bool m_loadsImagesAutomatically : 1; 205 bool m_loadsImagesAutomatically : 1;
211 bool m_areImagesEnabled : 1; 206 bool m_areImagesEnabled : 1;
212 bool m_arePluginsEnabled : 1; 207 bool m_arePluginsEnabled : 1;
213 bool m_isScriptEnabled : 1; 208 bool m_isScriptEnabled : 1;
214 bool m_usesPageCache : 1; 209 bool m_usesPageCache : 1;
215 unsigned m_fontRenderingMode : 1; 210 unsigned m_fontRenderingMode : 1;
(...skipping 20 matching lines...) Expand all
236 #if USE(SAFARI_THEME) 231 #if USE(SAFARI_THEME)
237 static bool gShouldPaintNativeControls; 232 static bool gShouldPaintNativeControls;
238 #endif 233 #endif
239 234
240 static double gHiddenPageDOMTimerAlignmentInterval; 235 static double gHiddenPageDOMTimerAlignmentInterval;
241 }; 236 };
242 237
243 } // namespace WebCore 238 } // namespace WebCore
244 239
245 #endif // Settings_h 240 #endif // Settings_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698