| OLD | NEW | 
|---|
| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 128     , m_loadsImagesAutomatically(false) | 128     , m_loadsImagesAutomatically(false) | 
| 129     , m_areImagesEnabled(true) | 129     , m_areImagesEnabled(true) | 
| 130     , m_arePluginsEnabled(false) | 130     , m_arePluginsEnabled(false) | 
| 131     , m_isScriptEnabled(false) | 131     , m_isScriptEnabled(false) | 
| 132     , m_dnsPrefetchingEnabled(false) | 132     , m_dnsPrefetchingEnabled(false) | 
| 133     , m_touchEventEmulationEnabled(false) | 133     , m_touchEventEmulationEnabled(false) | 
| 134     , m_openGLMultisamplingEnabled(false) | 134     , m_openGLMultisamplingEnabled(false) | 
| 135     , m_viewportEnabled(false) | 135     , m_viewportEnabled(false) | 
| 136     , m_viewportMetaEnabled(false) | 136     , m_viewportMetaEnabled(false) | 
| 137     , m_compositorDrivenAcceleratedScrollingEnabled(false) | 137     , m_compositorDrivenAcceleratedScrollingEnabled(false) | 
|  | 138     , m_layerSquashingEnabled(false) | 
| 138     , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF
     ired) | 139     , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF
     ired) | 
| 139 { | 140 { | 
| 140     m_page = page; // Page is not yet fully initialized wen constructing Setting
     s, so keeping m_page null over initializeDefaultFontFamilies() call. | 141     m_page = page; // Page is not yet fully initialized wen constructing Setting
     s, so keeping m_page null over initializeDefaultFontFamilies() call. | 
| 141 } | 142 } | 
| 142 | 143 | 
| 143 PassOwnPtr<Settings> Settings::create(Page* page) | 144 PassOwnPtr<Settings> Settings::create(Page* page) | 
| 144 { | 145 { | 
| 145     return adoptPtr(new Settings(page)); | 146     return adoptPtr(new Settings(page)); | 
| 146 } | 147 } | 
| 147 | 148 | 
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 401     if (m_page->mainFrame()) | 402     if (m_page->mainFrame()) | 
| 402         m_page->mainFrame()->document()->updateViewportDescription(); | 403         m_page->mainFrame()->document()->updateViewportDescription(); | 
| 403 } | 404 } | 
| 404 | 405 | 
| 405 void Settings::setViewportMetaEnabled(bool enabled) | 406 void Settings::setViewportMetaEnabled(bool enabled) | 
| 406 { | 407 { | 
| 407     m_viewportMetaEnabled = enabled; | 408     m_viewportMetaEnabled = enabled; | 
| 408 } | 409 } | 
| 409 | 410 | 
| 410 } // namespace WebCore | 411 } // namespace WebCore | 
| OLD | NEW | 
|---|