| OLD | NEW |
| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 // FIXME: Remove and uncomment once chromium side changes land. | 158 // FIXME: Remove and uncomment once chromium side changes land. |
| 159 return true; | 159 return true; |
| 160 // return m_viewportMetaEnabled; | 160 // return m_viewportMetaEnabled; |
| 161 } | 161 } |
| 162 | 162 |
| 163 // FIXME: This is a temporary flag and should be removed once accelerated | 163 // FIXME: This is a temporary flag and should be removed once accelerated |
| 164 // overflow scroll is ready (crbug.com/254111). | 164 // overflow scroll is ready (crbug.com/254111). |
| 165 void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compos
itorDrivenAcceleratedScrollingEnabled = enabled; } | 165 void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compos
itorDrivenAcceleratedScrollingEnabled = enabled; } |
| 166 bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compos
itorDrivenAcceleratedScrollingEnabled; } | 166 bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compos
itorDrivenAcceleratedScrollingEnabled; } |
| 167 | 167 |
| 168 // FIXME: This is a temporary flag and should be removed when squashing is r
eady. |
| 169 // (crbug.com/261605) |
| 170 void setLayerSquashingEnabled(bool enabled) { m_layerSquashingEnabled = enab
led; } |
| 171 bool isLayerSquashingEnabled() const { return m_layerSquashingEnabled; } |
| 172 |
| 168 private: | 173 private: |
| 169 explicit Settings(Page*); | 174 explicit Settings(Page*); |
| 170 | 175 |
| 171 Page* m_page; | 176 Page* m_page; |
| 172 | 177 |
| 173 String m_mediaTypeOverride; | 178 String m_mediaTypeOverride; |
| 174 ScriptFontFamilyMap m_standardFontFamilyMap; | 179 ScriptFontFamilyMap m_standardFontFamilyMap; |
| 175 ScriptFontFamilyMap m_serifFontFamilyMap; | 180 ScriptFontFamilyMap m_serifFontFamilyMap; |
| 176 ScriptFontFamilyMap m_fixedFontFamilyMap; | 181 ScriptFontFamilyMap m_fixedFontFamilyMap; |
| 177 ScriptFontFamilyMap m_sansSerifFontFamilyMap; | 182 ScriptFontFamilyMap m_sansSerifFontFamilyMap; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 196 | 201 |
| 197 bool m_touchEventEmulationEnabled : 1; | 202 bool m_touchEventEmulationEnabled : 1; |
| 198 bool m_openGLMultisamplingEnabled : 1; | 203 bool m_openGLMultisamplingEnabled : 1; |
| 199 bool m_viewportEnabled : 1; | 204 bool m_viewportEnabled : 1; |
| 200 bool m_viewportMetaEnabled : 1; | 205 bool m_viewportMetaEnabled : 1; |
| 201 | 206 |
| 202 // FIXME: This is a temporary flag and should be removed once accelerated | 207 // FIXME: This is a temporary flag and should be removed once accelerated |
| 203 // overflow scroll is ready (crbug.com/254111). | 208 // overflow scroll is ready (crbug.com/254111). |
| 204 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; | 209 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; |
| 205 | 210 |
| 211 // FIXME: This is a temporary flag and should be removed when squashing is r
eady. |
| 212 bool m_layerSquashingEnabled : 1; |
| 213 |
| 206 Timer<Settings> m_setImageLoadingSettingsTimer; | 214 Timer<Settings> m_setImageLoadingSettingsTimer; |
| 207 void imageLoadingSettingsTimerFired(Timer<Settings>*); | 215 void imageLoadingSettingsTimerFired(Timer<Settings>*); |
| 208 void recalculateTextAutosizingMultipliers(); | 216 void recalculateTextAutosizingMultipliers(); |
| 209 }; | 217 }; |
| 210 | 218 |
| 211 } // namespace WebCore | 219 } // namespace WebCore |
| 212 | 220 |
| 213 #endif // Settings_h | 221 #endif // Settings_h |
| OLD | NEW |