Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / testing / InternalSettings.cpp

diff --git a/src/third_party/WebKit/Source/core/testing/InternalSettings.cpp b/src/third_party/WebKit/Source/core/testing/InternalSettings.cpp
index 98e71d1..4ccfa6d 100644 (file)
--- a/src/third_party/WebKit/Source/core/testing/InternalSettings.cpp
+++ b/src/third_party/WebKit/Source/core/testing/InternalSettings.cpp
@@ -74,6 +74,7 @@ InternalSettings::Backup::Backup(Settings* settings)
     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
     , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled())
     , m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(RuntimeEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled())
+    , m_originalImageColorProfilesEnabled(RuntimeEnabledFeatures::imageColorProfilesEnabled())
 {
 }
 
@@ -96,6 +97,7 @@ void InternalSettings::Backup::restoreTo(Settings* settings)
     settings->setLayerSquashingEnabled(m_originalLayerSquashingEnabled);
     settings->genericFontFamilySettings().reset();
     RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled);
+    RuntimeEnabledFeatures::setImageColorProfilesEnabled(m_originalImageColorProfilesEnabled);
 }
 
 #if ENABLE(OILPAN)
@@ -115,7 +117,7 @@ public:
         : m_internalSettings(InternalSettings::create(page)) { }
     virtual ~InternalSettingsWrapper() { m_internalSettings->hostDestroyed(); }
 #if ENABLE(ASSERT)
-    virtual bool isRefCountedWrapper() const OVERRIDE { return true; }
+    virtual bool isRefCountedWrapper() const override { return true; }
 #endif
     InternalSettings* internalSettings() const { return m_internalSettings.get(); }
 
@@ -197,6 +199,11 @@ void InternalSettings::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnab
     RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(enabled);
 }
 
+void InternalSettings::setImageColorProfilesEnabled(bool enabled)
+{
+    RuntimeEnabledFeatures::setImageColorProfilesEnabled(enabled);
+}
+
 void InternalSettings::setOverlayScrollbarsEnabled(bool enabled)
 {
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled);