Commit 6a6fa8f0 authored by noel@chromium.org's avatar noel@chromium.org

Run-time control enableImageColorProfiles during layout tests

Run-time flag enableImageColorProfiles defaults to off. Add a window
InternalSettings method to enable the flag during layout tests.

BUG=369787

Review URL: https://codereview.chromium.org/643713006

git-svn-id: svn://svn.chromium.org/blink/trunk@184851 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 04a3c837
...@@ -74,6 +74,7 @@ InternalSettings::Backup::Backup(Settings* settings) ...@@ -74,6 +74,7 @@ InternalSettings::Backup::Backup(Settings* settings)
, m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
, m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled())
, m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(RuntimeEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled()) , m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(RuntimeEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled())
, m_originalImageColorProfilesEnabled(RuntimeEnabledFeatures::imageColorProfilesEnabled())
{ {
} }
...@@ -96,6 +97,7 @@ void InternalSettings::Backup::restoreTo(Settings* settings) ...@@ -96,6 +97,7 @@ void InternalSettings::Backup::restoreTo(Settings* settings)
settings->setLayerSquashingEnabled(m_originalLayerSquashingEnabled); settings->setLayerSquashingEnabled(m_originalLayerSquashingEnabled);
settings->genericFontFamilySettings().reset(); settings->genericFontFamilySettings().reset();
RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled); RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled);
RuntimeEnabledFeatures::setImageColorProfilesEnabled(m_originalImageColorProfilesEnabled);
} }
#if ENABLE(OILPAN) #if ENABLE(OILPAN)
...@@ -197,6 +199,11 @@ void InternalSettings::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnab ...@@ -197,6 +199,11 @@ void InternalSettings::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnab
RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(enabled); RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(enabled);
} }
void InternalSettings::setImageColorProfilesEnabled(bool enabled)
{
RuntimeEnabledFeatures::setImageColorProfilesEnabled(enabled);
}
void InternalSettings::setOverlayScrollbarsEnabled(bool enabled) void InternalSettings::setOverlayScrollbarsEnabled(bool enabled)
{ {
RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled); RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled);
......
...@@ -72,6 +72,7 @@ public: ...@@ -72,6 +72,7 @@ public:
String m_defaultVideoPosterURL; String m_defaultVideoPosterURL;
bool m_originalLayerSquashingEnabled; bool m_originalLayerSquashingEnabled;
bool m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled; bool m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled;
bool m_originalImageColorProfilesEnabled;
}; };
static PassRefPtrWillBeRawPtr<InternalSettings> create(Page& page) static PassRefPtrWillBeRawPtr<InternalSettings> create(Page& page)
...@@ -117,8 +118,9 @@ public: ...@@ -117,8 +118,9 @@ public:
void setLangAttributeAwareFormControlUIEnabled(bool); void setLangAttributeAwareFormControlUIEnabled(bool);
void setOverlayScrollbarsEnabled(bool); void setOverlayScrollbarsEnabled(bool);
void setExperimentalContentSecurityPolicyFeaturesEnabled(bool); void setExperimentalContentSecurityPolicyFeaturesEnabled(bool);
void setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(bool);
void setLaxMixedContentCheckingEnabled(bool); void setLaxMixedContentCheckingEnabled(bool);
void setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(bool);
void setImageColorProfilesEnabled(bool);
virtual void trace(Visitor*) override; virtual void trace(Visitor*) override;
......
...@@ -63,4 +63,5 @@ ...@@ -63,4 +63,5 @@
void setExperimentalContentSecurityPolicyFeaturesEnabled(boolean enabled); void setExperimentalContentSecurityPolicyFeaturesEnabled(boolean enabled);
void setLaxMixedContentCheckingEnabled(boolean enabled); void setLaxMixedContentCheckingEnabled(boolean enabled);
void setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(boolean enabled); void setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(boolean enabled);
void setImageColorProfilesEnabled(boolean enabled);
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment