diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/page/Settings.cpp | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/page/Settings.cpp')
| -rw-r--r-- | WebCore/page/Settings.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 210c97e..147e9e1 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -27,8 +27,9 @@ #include "Settings.h" #include "BackForwardList.h" -#include "Database.h" #include "CachedResourceLoader.h" +#include "DOMTimer.h" +#include "Database.h" #include "Frame.h" #include "FrameTree.h" #include "FrameView.h" @@ -87,7 +88,6 @@ Settings::Settings(Page* page) , m_sessionStorageQuota(StorageMap::noQuota) #endif , m_pluginAllowedRunTime(numeric_limits<unsigned>::max()) - , m_zoomMode(ZoomPage) , m_isSpatialNavigationEnabled(false) , m_isJavaEnabled(false) , m_loadsImagesAutomatically(false) @@ -158,12 +158,16 @@ Settings::Settings(Page* page) #endif , m_memoryInfoEnabled(false) , m_interactiveFormValidation(false) +<<<<<<< HEAD #if ENABLE(WEB_AUTOFILL) , m_autoFillEnabled(false) #endif #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif +======= + , m_usePreHTML5ParserQuirks(false) +>>>>>>> webkit.org at r67908 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. @@ -434,6 +438,11 @@ void Settings::setDOMPasteAllowed(bool DOMPasteAllowed) m_isDOMPasteAllowed = DOMPasteAllowed; } +void Settings::setMinDOMTimerInterval(double interval) +{ + DOMTimer::setMinTimerInterval(interval); +} + void Settings::setUsesPageCache(bool usesPageCache) { if (m_usesPageCache == usesPageCache) @@ -713,15 +722,6 @@ void Settings::setShouldPaintCustomScrollbars(bool shouldPaintCustomScrollbars) m_shouldPaintCustomScrollbars = shouldPaintCustomScrollbars; } -void Settings::setZoomMode(ZoomMode mode) -{ - if (mode == m_zoomMode) - return; - - m_zoomMode = mode; - setNeedsRecalcStyleInAllFrames(m_page); -} - void Settings::setEnforceCSSMIMETypeInNoQuirksMode(bool enforceCSSMIMETypeInNoQuirksMode) { m_enforceCSSMIMETypeInNoQuirksMode = enforceCSSMIMETypeInNoQuirksMode; |