diff options
Diffstat (limited to 'Source/WebCore/page/Settings.cpp')
| -rw-r--r-- | Source/WebCore/page/Settings.cpp | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index f0b489a..eb8c903 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -45,12 +45,6 @@ using namespace std; namespace WebCore { -static void setNeedsRecalcStyleInAllFrames(Page* page) -{ - for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) - frame->document()->styleSelectorChanged(DeferRecalcStyle); -} - static void setLoadsImagesAutomaticallyInAllFrames(Page* page) { for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) @@ -94,6 +88,7 @@ Settings::Settings(Page* page) , m_minimumLogicalFontSize(0) , m_defaultFontSize(0) , m_defaultFixedFontSize(0) + , m_validationMessageTimerMagnification(50) , m_maximumDecodedImageSize(numeric_limits<size_t>::max()) #if ENABLE(DOM_STORAGE) , m_sessionStorageQuota(StorageMap::noQuota) @@ -146,6 +141,7 @@ Settings::Settings(Page* page) , m_enforceCSSMIMETypeInNoQuirksMode(true) , m_usesEncodingDetector(false) , m_allowScriptsToCloseWindows(false) + , m_canvasUsesAcceleratedDrawing(false) , m_acceleratedDrawingEnabled(false) // FIXME: This should really be disabled by default as it makes platforms that don't support the feature download files // they can't use by. Leaving enabled for now to not change existing behavior. @@ -177,6 +173,7 @@ Settings::Settings(Page* page) , m_usePreHTML5ParserQuirks(false) , m_hyperlinkAuditingEnabled(false) , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) +<<<<<<< HEAD #ifdef ANDROID_LAYOUT , m_useWideViewport(false) #endif @@ -192,6 +189,10 @@ Settings::Settings(Page* page) #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif +======= + , m_useQuickLookResourceCachingQuirks(false) + , m_forceCompositingMode(false) +>>>>>>> webkit.org at r82507 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. @@ -208,7 +209,7 @@ void Settings::setStandardFontFamily(const AtomicString& standardFontFamily) return; m_standardFontFamily = standardFontFamily; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setFixedFontFamily(const AtomicString& fixedFontFamily) @@ -217,7 +218,7 @@ void Settings::setFixedFontFamily(const AtomicString& fixedFontFamily) return; m_fixedFontFamily = fixedFontFamily; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setSerifFontFamily(const AtomicString& serifFontFamily) @@ -226,7 +227,7 @@ void Settings::setSerifFontFamily(const AtomicString& serifFontFamily) return; m_serifFontFamily = serifFontFamily; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setSansSerifFontFamily(const AtomicString& sansSerifFontFamily) @@ -235,7 +236,7 @@ void Settings::setSansSerifFontFamily(const AtomicString& sansSerifFontFamily) return; m_sansSerifFontFamily = sansSerifFontFamily; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setCursiveFontFamily(const AtomicString& cursiveFontFamily) @@ -244,7 +245,7 @@ void Settings::setCursiveFontFamily(const AtomicString& cursiveFontFamily) return; m_cursiveFontFamily = cursiveFontFamily; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setFantasyFontFamily(const AtomicString& fantasyFontFamily) @@ -253,7 +254,7 @@ void Settings::setFantasyFontFamily(const AtomicString& fantasyFontFamily) return; m_fantasyFontFamily = fantasyFontFamily; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setMinimumFontSize(int minimumFontSize) @@ -262,7 +263,7 @@ void Settings::setMinimumFontSize(int minimumFontSize) return; m_minimumFontSize = minimumFontSize; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setMinimumLogicalFontSize(int minimumLogicalFontSize) @@ -271,7 +272,7 @@ void Settings::setMinimumLogicalFontSize(int minimumLogicalFontSize) return; m_minimumLogicalFontSize = minimumLogicalFontSize; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setDefaultFontSize(int defaultFontSize) @@ -280,7 +281,7 @@ void Settings::setDefaultFontSize(int defaultFontSize) return; m_defaultFontSize = defaultFontSize; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setDefaultFixedFontSize(int defaultFontSize) @@ -289,7 +290,7 @@ void Settings::setDefaultFixedFontSize(int defaultFontSize) return; m_defaultFixedFontSize = defaultFontSize; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } #ifdef ANDROID_BLOCK_NETWORK_IMAGE @@ -414,7 +415,7 @@ void Settings::setTextAreasAreResizable(bool textAreasAreResizable) return; m_textAreasAreResizable = textAreasAreResizable; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setEditableLinkBehavior(EditableLinkBehavior editableLinkBehavior) @@ -708,7 +709,7 @@ void Settings::setAuthorAndUserStylesEnabled(bool authorAndUserStylesEnabled) return; m_authorAndUserStylesEnabled = authorAndUserStylesEnabled; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setFontRenderingMode(FontRenderingMode mode) @@ -716,7 +717,7 @@ void Settings::setFontRenderingMode(FontRenderingMode mode) if (fontRenderingMode() == mode) return; m_fontRenderingMode = mode; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } FontRenderingMode Settings::fontRenderingMode() const @@ -818,7 +819,12 @@ void Settings::setAcceleratedCompositingEnabled(bool enabled) return; m_acceleratedCompositingEnabled = enabled; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); +} + +void Settings::setCanvasUsesAcceleratedDrawing(bool enabled) +{ + m_canvasUsesAcceleratedDrawing = enabled; } void Settings::setAcceleratedDrawingEnabled(bool enabled) @@ -857,7 +863,7 @@ void Settings::setShowDebugBorders(bool enabled) return; m_showDebugBorders = enabled; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setShowRepaintCounter(bool enabled) @@ -866,7 +872,7 @@ void Settings::setShowRepaintCounter(bool enabled) return; m_showRepaintCounter = enabled; - setNeedsRecalcStyleInAllFrames(m_page); + m_page->setNeedsRecalcStyleInAllFrames(); } void Settings::setExperimentalNotificationsEnabled(bool enabled) |