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/frame/Settings.cpp

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing 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/frame/Settings.h ('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) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if (m_delegate) 92 if (m_delegate)
93 m_delegate->settingsChanged(changeType); 93 m_delegate->settingsChanged(changeType);
94 } 94 }
95 95
96 void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled) 96 void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
97 { 97 {
98 if (m_textAutosizingEnabled == textAutosizingEnabled) 98 if (m_textAutosizingEnabled == textAutosizingEnabled)
99 return; 99 return;
100 100
101 m_textAutosizingEnabled = textAutosizingEnabled; 101 m_textAutosizingEnabled = textAutosizingEnabled;
102 invalidate(SettingsDelegate::StyleChange); 102 invalidate(SettingsDelegate::TextAutosizingChange);
103 } 103 }
104 104
105 // FIXME: Move to Settings.in once make_settings can understand IntSize. 105 // FIXME: Move to Settings.in once make_settings can understand IntSize.
106 void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizing WindowSizeOverride) 106 void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizing WindowSizeOverride)
107 { 107 {
108 if (m_textAutosizingWindowSizeOverride == textAutosizingWindowSizeOverride) 108 if (m_textAutosizingWindowSizeOverride == textAutosizingWindowSizeOverride)
109 return; 109 return;
110 110
111 m_textAutosizingWindowSizeOverride = textAutosizingWindowSizeOverride; 111 m_textAutosizingWindowSizeOverride = textAutosizingWindowSizeOverride;
112 invalidate(SettingsDelegate::StyleChange); 112 invalidate(SettingsDelegate::TextAutosizingChange);
113 } 113 }
114 114
115 void Settings::setMockScrollbarsEnabled(bool flag) 115 void Settings::setMockScrollbarsEnabled(bool flag)
116 { 116 {
117 ScrollbarTheme::setMockScrollbarsEnabled(flag); 117 ScrollbarTheme::setMockScrollbarsEnabled(flag);
118 } 118 }
119 119
120 bool Settings::mockScrollbarsEnabled() 120 bool Settings::mockScrollbarsEnabled()
121 { 121 {
122 return ScrollbarTheme::mockScrollbarsEnabled(); 122 return ScrollbarTheme::mockScrollbarsEnabled();
123 } 123 }
124 124
125 void Settings::setOpenGLMultisamplingEnabled(bool flag) 125 void Settings::setOpenGLMultisamplingEnabled(bool flag)
126 { 126 {
127 if (m_openGLMultisamplingEnabled == flag) 127 if (m_openGLMultisamplingEnabled == flag)
128 return; 128 return;
129 129
130 m_openGLMultisamplingEnabled = flag; 130 m_openGLMultisamplingEnabled = flag;
131 invalidate(SettingsDelegate::MultisamplingChange); 131 invalidate(SettingsDelegate::MultisamplingChange);
132 } 132 }
133 133
134 } // namespace WebCore 134 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Settings.h ('k') | Source/core/frame/SettingsDelegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698