| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 bool m_touchEventEmulationEnabled : 1; | 186 bool m_touchEventEmulationEnabled : 1; |
| 187 bool m_openGLMultisamplingEnabled : 1; | 187 bool m_openGLMultisamplingEnabled : 1; |
| 188 bool m_viewportEnabled : 1; | 188 bool m_viewportEnabled : 1; |
| 189 | 189 |
| 190 // FIXME: This is a temporary flag and should be removed once accelerated | 190 // FIXME: This is a temporary flag and should be removed once accelerated |
| 191 // overflow scroll is ready (crbug.com/254111). | 191 // overflow scroll is ready (crbug.com/254111). |
| 192 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; | 192 bool m_compositorDrivenAcceleratedScrollingEnabled : 1; |
| 193 | 193 |
| 194 Timer<Settings> m_setImageLoadingSettingsTimer; | 194 Timer<Settings> m_setImageLoadingSettingsTimer; |
| 195 void imageLoadingSettingsTimerFired(Timer<Settings>*); | 195 void imageLoadingSettingsTimerFired(Timer<Settings>*); |
| 196 | |
| 197 static bool gMockScrollbarsEnabled; | |
| 198 }; | 196 }; |
| 199 | 197 |
| 200 } // namespace WebCore | 198 } // namespace WebCore |
| 201 | 199 |
| 202 #endif // Settings_h | 200 #endif // Settings_h |
| OLD | NEW |