From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/page/Settings.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/page/Settings.h') diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h index 3b06834..aee749e 100644 --- a/Source/WebCore/page/Settings.h +++ b/Source/WebCore/page/Settings.h @@ -231,8 +231,12 @@ namespace WebCore { void setDOMPasteAllowed(bool); bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; } - static void setMinDOMTimerInterval(double); // Interval specified in seconds. + static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds. + static double defaultMinDOMTimerInterval(); + void setMinDOMTimerInterval(double); // Per-page; initialized to default value. + double minDOMTimerInterval(); + void setUsesPageCache(bool); bool usesPageCache() const { return m_usesPageCache; } @@ -347,6 +351,9 @@ namespace WebCore { void setXSSAuditorEnabled(bool); bool xssAuditorEnabled() const { return m_xssAuditorEnabled; } + void setAcceleratedDrawingEnabled(bool); + bool acceleratedDrawingEnabled() const { return m_acceleratedDrawingEnabled; } + void setAcceleratedCompositingEnabled(bool); bool acceleratedCompositingEnabled() const { return m_acceleratedCompositingEnabled; } @@ -541,6 +548,7 @@ namespace WebCore { bool m_enforceCSSMIMETypeInNoQuirksMode : 1; bool m_usesEncodingDetector : 1; bool m_allowScriptsToCloseWindows : 1; + bool m_acceleratedDrawingEnabled : 1; bool m_downloadableBinaryFontsEnabled : 1; bool m_xssAuditorEnabled : 1; bool m_acceleratedCompositingEnabled : 1; -- cgit v1.1