Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)

1 files changed, 21 insertions, 0 deletions

diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index 20c56438e..7de3719d5 100644
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -140,6 +140,7 @@ Settings::Settings(Page* page)
     , m_sessionStorageQuota(StorageMap::noQuota)
     , m_editingBehaviorType(editingBehaviorTypeForPlatform())
     , m_maximumHTMLParserDOMTreeDepth(defaultMaximumHTMLParserDOMTreeDepth)
+    , m_fontBoostingEnabled(true)
     , m_isSpatialNavigationEnabled(false)
     , m_isJavaEnabled(false)
     , m_isJavaEnabledForLocalFiles(true)
@@ -174,6 +175,7 @@ Settings::Settings(Page* page)
     , m_showsToolTipOverTruncatedText(false)
     , m_forceFTPDirectoryListings(false)
     , m_developerExtrasEnabled(false)
+    , m_javaScriptExperimentsEnabled(false)
     , m_authorAndUserStylesEnabled(true)
     , m_needsSiteSpecificQuirks(false)
     , m_fontRenderingMode(0)
@@ -189,8 +191,11 @@ Settings::Settings(Page* page)
     , m_acceleratedDrawingEnabled(false)
     , m_acceleratedFiltersEnabled(false)
     , m_isCSSCustomFilterEnabled(false)
+#if ENABLE(CSS_REGIONS)
     , m_cssRegionsEnabled(false)
+#endif
     , m_regionBasedColumnsEnabled(false)
+    , m_cssGridLayoutEnabled(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.
     , m_downloadableBinaryFontsEnabled(true)
@@ -265,6 +270,8 @@ Settings::Settings(Page* page)
     , m_shouldRespectImageOrientation(false)
     , m_wantsBalancedSetDefersLoadingBehavior(false)
     , m_requestAnimationFrameEnabled(true)
+    , m_needsDidFinishLoadOrderQuirk(false)
+    , m_fixedPositionCreatesStackingContext(false)
     , m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
     , m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds)
 {
@@ -398,6 +405,15 @@ void Settings::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor)
     m_defaultDeviceScaleFactor = defaultDeviceScaleFactor;
 }
 
+void Settings::setFontBoostingEnabled(bool fontBoostingEnabled)
+{
+    if (m_fontBoostingEnabled == fontBoostingEnabled)
+        return;
+
+    m_fontBoostingEnabled = fontBoostingEnabled;
+    m_page->setNeedsRecalcStyleInAllFrames();
+}
+
 void Settings::setLoadsImagesAutomatically(bool loadsImagesAutomatically)
 {
     m_loadsImagesAutomatically = loadsImagesAutomatically;
@@ -664,6 +680,11 @@ void Settings::setDeveloperExtrasEnabled(bool developerExtrasEnabled)
     m_developerExtrasEnabled = developerExtrasEnabled;
 }
 
+void Settings::setJavaScriptExperimentsEnabled(bool javaScriptExperimentsEnabled)
+{
+    m_javaScriptExperimentsEnabled = javaScriptExperimentsEnabled;
+}
+
 void Settings::setAuthorAndUserStylesEnabled(bool authorAndUserStylesEnabled)
 {
     if (m_authorAndUserStylesEnabled == authorAndUserStylesEnabled)