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

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

Issue 13723004: Remove the ENABLE_TEXT_AUTOSIZING compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 void setCursiveFontFamily(const AtomicString&, UScriptCode = USCRIPT_COM MON); 88 void setCursiveFontFamily(const AtomicString&, UScriptCode = USCRIPT_COM MON);
89 const AtomicString& cursiveFontFamily(UScriptCode = USCRIPT_COMMON) cons t; 89 const AtomicString& cursiveFontFamily(UScriptCode = USCRIPT_COMMON) cons t;
90 90
91 void setFantasyFontFamily(const AtomicString&, UScriptCode = USCRIPT_COM MON); 91 void setFantasyFontFamily(const AtomicString&, UScriptCode = USCRIPT_COM MON);
92 const AtomicString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) cons t; 92 const AtomicString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) cons t;
93 93
94 void setPictographFontFamily(const AtomicString&, UScriptCode = USCRIPT_ COMMON); 94 void setPictographFontFamily(const AtomicString&, UScriptCode = USCRIPT_ COMMON);
95 const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) c onst; 95 const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) c onst;
96 96
97 #if ENABLE(TEXT_AUTOSIZING)
98 void setTextAutosizingEnabled(bool); 97 void setTextAutosizingEnabled(bool);
99 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; } 98 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; }
100 99
101 void setTextAutosizingFontScaleFactor(float); 100 void setTextAutosizingFontScaleFactor(float);
102 float textAutosizingFontScaleFactor() const { return m_textAutosizingFon tScaleFactor; } 101 float textAutosizingFontScaleFactor() const { return m_textAutosizingFon tScaleFactor; }
103 102
104 // Only set by Layout Tests, and only used if textAutosizingEnabled() re turns true. 103 // Only set by Layout Tests, and only used if textAutosizingEnabled() re turns true.
105 void setTextAutosizingWindowSizeOverride(const IntSize&); 104 void setTextAutosizingWindowSizeOverride(const IntSize&);
106 const IntSize& textAutosizingWindowSizeOverride() const { return m_textA utosizingWindowSizeOverride; } 105 const IntSize& textAutosizingWindowSizeOverride() const { return m_textA utosizingWindowSizeOverride; }
107 #endif
108 106
109 // Only set by Layout Tests. 107 // Only set by Layout Tests.
110 void setResolutionOverride(const IntSize&); 108 void setResolutionOverride(const IntSize&);
111 const IntSize& resolutionOverride() const { return m_resolutionDensityPe rInchOverride; } 109 const IntSize& resolutionOverride() const { return m_resolutionDensityPe rInchOverride; }
112 110
113 // Only set by Layout Tests. 111 // Only set by Layout Tests.
114 void setMediaTypeOverride(const String&); 112 void setMediaTypeOverride(const String&);
115 const String& mediaTypeOverride() const { return m_mediaTypeOverride; } 113 const String& mediaTypeOverride() const { return m_mediaTypeOverride; }
116 114
117 // Unlike areImagesEnabled, this only suppresses the network load of 115 // Unlike areImagesEnabled, this only suppresses the network load of
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 String m_mediaTypeOverride; 280 String m_mediaTypeOverride;
283 KURL m_userStyleSheetLocation; 281 KURL m_userStyleSheetLocation;
284 ScriptFontFamilyMap m_standardFontFamilyMap; 282 ScriptFontFamilyMap m_standardFontFamilyMap;
285 ScriptFontFamilyMap m_serifFontFamilyMap; 283 ScriptFontFamilyMap m_serifFontFamilyMap;
286 ScriptFontFamilyMap m_fixedFontFamilyMap; 284 ScriptFontFamilyMap m_fixedFontFamilyMap;
287 ScriptFontFamilyMap m_sansSerifFontFamilyMap; 285 ScriptFontFamilyMap m_sansSerifFontFamilyMap;
288 ScriptFontFamilyMap m_cursiveFontFamilyMap; 286 ScriptFontFamilyMap m_cursiveFontFamilyMap;
289 ScriptFontFamilyMap m_fantasyFontFamilyMap; 287 ScriptFontFamilyMap m_fantasyFontFamilyMap;
290 ScriptFontFamilyMap m_pictographFontFamilyMap; 288 ScriptFontFamilyMap m_pictographFontFamilyMap;
291 SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy; 289 SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy;
292 #if ENABLE(TEXT_AUTOSIZING)
293 float m_textAutosizingFontScaleFactor; 290 float m_textAutosizingFontScaleFactor;
294 IntSize m_textAutosizingWindowSizeOverride; 291 IntSize m_textAutosizingWindowSizeOverride;
295 bool m_textAutosizingEnabled : 1; 292 bool m_textAutosizingEnabled : 1;
296 #endif
297 IntSize m_resolutionDensityPerInchOverride; 293 IntSize m_resolutionDensityPerInchOverride;
298 294
299 SETTINGS_MEMBER_VARIABLES 295 SETTINGS_MEMBER_VARIABLES
300 296
301 bool m_isJavaEnabled : 1; 297 bool m_isJavaEnabled : 1;
302 bool m_isJavaEnabledForLocalFiles : 1; 298 bool m_isJavaEnabledForLocalFiles : 1;
303 bool m_loadsImagesAutomatically : 1; 299 bool m_loadsImagesAutomatically : 1;
304 bool m_privateBrowsingEnabled : 1; 300 bool m_privateBrowsingEnabled : 1;
305 bool m_areImagesEnabled : 1; 301 bool m_areImagesEnabled : 1;
306 bool m_arePluginsEnabled : 1; 302 bool m_arePluginsEnabled : 1;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 #if USE(JSC) 356 #if USE(JSC)
361 static bool gShouldRespectPriorityInCSSAttributeSetters; 357 static bool gShouldRespectPriorityInCSSAttributeSetters;
362 #endif 358 #endif
363 359
364 static double gHiddenPageDOMTimerAlignmentInterval; 360 static double gHiddenPageDOMTimerAlignmentInterval;
365 }; 361 };
366 362
367 } // namespace WebCore 363 } // namespace WebCore
368 364
369 #endif // Settings_h 365 #endif // Settings_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698