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

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

Issue 157853002: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/core/dom/TreeScopeStyleSheetCollection.cpp ('k') | Source/core/frame/SettingsDelegate.h » ('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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 EditableLinkLiveWhenNotFocused, 46 EditableLinkLiveWhenNotFocused,
47 EditableLinkNeverLive 47 EditableLinkNeverLive
48 }; 48 };
49 49
50 class Settings { 50 class Settings {
51 WTF_MAKE_NONCOPYABLE(Settings); WTF_MAKE_FAST_ALLOCATED; 51 WTF_MAKE_NONCOPYABLE(Settings); WTF_MAKE_FAST_ALLOCATED;
52 public: 52 public:
53 static PassOwnPtr<Settings> create(); 53 static PassOwnPtr<Settings> create();
54 54
55 GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFon tFamilySettings; } 55 GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFon tFamilySettings; }
56 void notifyGenericFontFamilyChange() { invalidate(SettingsDelegate::FontFami lyChange); }
57 56
58 void setTextAutosizingEnabled(bool); 57 void setTextAutosizingEnabled(bool);
59 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; } 58 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; }
60 59
61 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true. 60 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true.
62 void setTextAutosizingWindowSizeOverride(const IntSize&); 61 void setTextAutosizingWindowSizeOverride(const IntSize&);
63 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; } 62 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; }
64 63
65 SETTINGS_GETTERS_AND_SETTERS 64 SETTINGS_GETTERS_AND_SETTERS
66 65
(...skipping 19 matching lines...) Expand all
86 bool m_openGLMultisamplingEnabled : 1; 85 bool m_openGLMultisamplingEnabled : 1;
87 IntSize m_textAutosizingWindowSizeOverride; 86 IntSize m_textAutosizingWindowSizeOverride;
88 bool m_textAutosizingEnabled : 1; 87 bool m_textAutosizingEnabled : 1;
89 88
90 SETTINGS_MEMBER_VARIABLES 89 SETTINGS_MEMBER_VARIABLES
91 }; 90 };
92 91
93 } // namespace WebCore 92 } // namespace WebCore
94 93
95 #endif // Settings_h 94 #endif // Settings_h
OLDNEW
« no previous file with comments | « Source/core/dom/TreeScopeStyleSheetCollection.cpp ('k') | Source/core/frame/SettingsDelegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698