diff options
Diffstat (limited to 'WebCore/page/Settings.h')
| -rw-r--r-- | WebCore/page/Settings.h | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index 44b4642..6893eae 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -30,6 +30,7 @@ #include "AtomicString.h" #include "FontRenderingMode.h" #include "KURL.h" +#include "ZoomMode.h" namespace WebCore { @@ -127,6 +128,9 @@ namespace WebCore { bool blockNetworkImage() const { return m_blockNetworkImage; } #endif void setJavaScriptEnabled(bool); + // Instead of calling isJavaScriptEnabled directly, please consider calling + // ScriptController::canExecuteScripts, which takes things like the + // HTML sandbox attribute into account. bool isJavaScriptEnabled() const { return m_isJavaScriptEnabled; } void setWebSecurityEnabled(bool); @@ -141,15 +145,22 @@ namespace WebCore { void setJavaScriptCanOpenWindowsAutomatically(bool); bool javaScriptCanOpenWindowsAutomatically() const { return m_javaScriptCanOpenWindowsAutomatically; } + void setSpatialNavigationEnabled(bool); + bool isSpatialNavigationEnabled() const { return m_isSpatialNavigationEnabled; } + void setJavaEnabled(bool); bool isJavaEnabled() const { return m_isJavaEnabled; } void setImagesEnabled(bool); bool areImagesEnabled() const { return m_areImagesEnabled; } + void setMediaEnabled(bool); + bool isMediaEnabled() const { return m_isMediaEnabled; } + void setPluginsEnabled(bool); bool arePluginsEnabled() const { return m_arePluginsEnabled; } +<<<<<<< HEAD #ifdef ANDROID_PLUGINS void setPluginsOnDemand(bool onDemand) { m_pluginsOnDemand = onDemand; } bool arePluginsOnDemand() const { return m_pluginsOnDemand; } @@ -158,12 +169,22 @@ namespace WebCore { void setDatabasesEnabled(bool); bool databasesEnabled() const { return m_databasesEnabled; } +======= +>>>>>>> webkit.org at r58033 void setLocalStorageEnabled(bool); bool localStorageEnabled() const { return m_localStorageEnabled; } +#if ENABLE(DOM_STORAGE) void setLocalStorageQuota(unsigned); unsigned localStorageQuota() const { return m_localStorageQuota; } + // Allow clients concerned with memory consumption to set a quota on session storage + // since the memory used won't be released until the Page is destroyed. + // Default is noQuota. + void setSessionStorageQuota(unsigned); + unsigned sessionStorageQuota() const { return m_sessionStorageQuota; } +#endif + void setPrivateBrowsingEnabled(bool); bool privateBrowsingEnabled() const { return m_privateBrowsingEnabled; } @@ -232,8 +253,8 @@ namespace WebCore { void setDeveloperExtrasEnabled(bool); bool developerExtrasEnabled() const { return m_developerExtrasEnabled; } - void setFrameSetFlatteningEnabled(bool); - bool frameSetFlatteningEnabled() const { return m_frameSetFlatteningEnabled; } + void setFrameFlatteningEnabled(bool); + bool frameFlatteningEnabled() const { return m_frameFlatteningEnabled; } #ifdef ANDROID_META_SUPPORT void resetMetadataSettings(); @@ -300,8 +321,8 @@ namespace WebCore { void setShouldPaintCustomScrollbars(bool); bool shouldPaintCustomScrollbars() const { return m_shouldPaintCustomScrollbars; } - void setZoomsTextOnly(bool); - bool zoomsTextOnly() const { return m_zoomsTextOnly; } + void setZoomMode(ZoomMode); + ZoomMode zoomMode() const { return m_zoomMode; } void setEnforceCSSMIMETypeInStrictMode(bool); bool enforceCSSMIMETypeInStrictMode() { return m_enforceCSSMIMETypeInStrictMode; } @@ -350,11 +371,11 @@ namespace WebCore { void setWebGLEnabled(bool); bool webGLEnabled() const { return m_webGLEnabled; } - void setGeolocationEnabled(bool); - bool geolocationEnabled() const { return m_geolocationEnabled; } - void setLoadDeferringEnabled(bool); bool loadDeferringEnabled() const { return m_loadDeferringEnabled; } + + void setTiledBackingStoreEnabled(bool); + bool tiledBackingStoreEnabled() const { return m_tiledBackingStoreEnabled; } private: Page* m_page; @@ -413,15 +434,20 @@ namespace WebCore { bool m_blockNetworkImage : 1; #endif size_t m_maximumDecodedImageSize; +#if ENABLE(DOM_STORAGE) unsigned m_localStorageQuota; + unsigned m_sessionStorageQuota; +#endif unsigned m_pluginAllowedRunTime; + ZoomMode m_zoomMode; + bool m_isSpatialNavigationEnabled : 1; bool m_isJavaEnabled : 1; bool m_loadsImagesAutomatically : 1; bool m_privateBrowsingEnabled : 1; bool m_caretBrowsingEnabled : 1; bool m_areImagesEnabled : 1; + bool m_isMediaEnabled : 1; bool m_arePluginsEnabled : 1; - bool m_databasesEnabled : 1; bool m_localStorageEnabled : 1; bool m_isJavaScriptEnabled : 1; bool m_isWebSecurityEnabled : 1; @@ -447,13 +473,12 @@ namespace WebCore { bool m_authorAndUserStylesEnabled : 1; bool m_needsSiteSpecificQuirks : 1; unsigned m_fontRenderingMode : 1; - bool m_frameSetFlatteningEnabled : 1; + bool m_frameFlatteningEnabled : 1; bool m_webArchiveDebugModeEnabled : 1; bool m_localFileContentSniffingEnabled : 1; bool m_inApplicationChromeMode : 1; bool m_offlineWebApplicationCacheEnabled : 1; bool m_shouldPaintCustomScrollbars : 1; - bool m_zoomsTextOnly : 1; bool m_enforceCSSMIMETypeInStrictMode : 1; bool m_usesEncodingDetector : 1; bool m_allowScriptsToCloseWindows : 1; @@ -465,11 +490,14 @@ namespace WebCore { bool m_showRepaintCounter : 1; bool m_experimentalNotificationsEnabled : 1; bool m_webGLEnabled : 1; - bool m_geolocationEnabled : 1; bool m_loadDeferringEnabled : 1; +<<<<<<< HEAD #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif +======= + bool m_tiledBackingStoreEnabled : 1; +>>>>>>> webkit.org at r58033 #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; |