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

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
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/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 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 String m_mediaTypeOverride; 255 String m_mediaTypeOverride;
258 KURL m_userStyleSheetLocation; 256 KURL m_userStyleSheetLocation;
259 ScriptFontFamilyMap m_standardFontFamilyMap; 257 ScriptFontFamilyMap m_standardFontFamilyMap;
260 ScriptFontFamilyMap m_serifFontFamilyMap; 258 ScriptFontFamilyMap m_serifFontFamilyMap;
261 ScriptFontFamilyMap m_fixedFontFamilyMap; 259 ScriptFontFamilyMap m_fixedFontFamilyMap;
262 ScriptFontFamilyMap m_sansSerifFontFamilyMap; 260 ScriptFontFamilyMap m_sansSerifFontFamilyMap;
263 ScriptFontFamilyMap m_cursiveFontFamilyMap; 261 ScriptFontFamilyMap m_cursiveFontFamilyMap;
264 ScriptFontFamilyMap m_fantasyFontFamilyMap; 262 ScriptFontFamilyMap m_fantasyFontFamilyMap;
265 ScriptFontFamilyMap m_pictographFontFamilyMap; 263 ScriptFontFamilyMap m_pictographFontFamilyMap;
266 SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy; 264 SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy;
267 #if ENABLE(TEXT_AUTOSIZING)
268 float m_textAutosizingFontScaleFactor; 265 float m_textAutosizingFontScaleFactor;
269 IntSize m_textAutosizingWindowSizeOverride; 266 IntSize m_textAutosizingWindowSizeOverride;
270 bool m_textAutosizingEnabled : 1; 267 bool m_textAutosizingEnabled : 1;
271 #endif
272 IntSize m_resolutionDensityPerInchOverride; 268 IntSize m_resolutionDensityPerInchOverride;
273 269
274 SETTINGS_MEMBER_VARIABLES 270 SETTINGS_MEMBER_VARIABLES
275 271
276 bool m_isJavaEnabled : 1; 272 bool m_isJavaEnabled : 1;
277 bool m_isJavaEnabledForLocalFiles : 1; 273 bool m_isJavaEnabledForLocalFiles : 1;
278 bool m_loadsImagesAutomatically : 1; 274 bool m_loadsImagesAutomatically : 1;
279 bool m_privateBrowsingEnabled : 1; 275 bool m_privateBrowsingEnabled : 1;
280 bool m_areImagesEnabled : 1; 276 bool m_areImagesEnabled : 1;
281 bool m_arePluginsEnabled : 1; 277 bool m_arePluginsEnabled : 1;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 #if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX)) 317 #if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
322 static bool gShouldUseHighResolutionTimers; 318 static bool gShouldUseHighResolutionTimers;
323 #endif 319 #endif
324 320
325 static double gHiddenPageDOMTimerAlignmentInterval; 321 static double gHiddenPageDOMTimerAlignmentInterval;
326 }; 322 };
327 323
328 } // namespace WebCore 324 } // namespace WebCore
329 325
330 #endif // Settings_h 326 #endif // Settings_h
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/page/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698