Upstream version 9.38.198.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 23532b7..c8c8dd5 100644 (file)
--- a/src/third_party/WebKit/Source/core/testing/InternalSettings.cpp
+++ b/src/third_party/WebKit/Source/core/testing/InternalSettings.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "core/testing/InternalSettings.h"
 
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorController.h"
@@ -54,12 +54,12 @@
         return; \
     }
 
-namespace WebCore {
+namespace blink {
 
 InternalSettings::Backup::Backup(Settings* settings)
-    : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
-    , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::authorShadowDOMForAnyElementEnabled())
+    : m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::authorShadowDOMForAnyElementEnabled())
     , m_originalCSP(RuntimeEnabledFeatures::experimentalContentSecurityPolicyFeaturesEnabled())
+    , m_originalLaxMixedContentCheckingEnabled(RuntimeEnabledFeatures::laxMixedContentCheckingEnabled())
     , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollbarsEnabled())
     , m_originalEditingBehavior(settings->editingBehaviorType())
     , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
@@ -67,6 +67,7 @@ InternalSettings::Backup::Backup(Settings* settings)
     , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFactor())
     , m_originalMediaTypeOverride(settings->mediaTypeOverride())
     , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
+    , m_originalMockGestureTapHighlightsEnabled(settings->mockGestureTapHighlightsEnabled())
     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
     , m_imagesEnabled(settings->imagesEnabled())
     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
@@ -77,9 +78,9 @@ InternalSettings::Backup::Backup(Settings* settings)
 
 void InternalSettings::Backup::restoreTo(Settings* settings)
 {
-    RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
     RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAuthorShadowDOMForAnyElementEnabled);
     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(m_originalCSP);
+    RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(m_originalLaxMixedContentCheckingEnabled);
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollbarsEnabled);
     settings->setEditingBehaviorType(m_originalEditingBehavior);
     settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
@@ -87,6 +88,7 @@ void InternalSettings::Backup::restoreTo(Settings* settings)
     settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFactor);
     settings->setMediaTypeOverride(m_originalMediaTypeOverride);
     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
+    settings->setMockGestureTapHighlightsEnabled(m_originalMockGestureTapHighlightsEnabled);
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
     settings->setImagesEnabled(m_imagesEnabled);
     settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL);
@@ -111,7 +113,7 @@ public:
     explicit InternalSettingsWrapper(Page& page)
         : m_internalSettings(InternalSettings::create(page)) { }
     virtual ~InternalSettingsWrapper() { m_internalSettings->hostDestroyed(); }
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     virtual bool isRefCountedWrapper() const OVERRIDE { return true; }
 #endif
     InternalSettings* internalSettings() const { return m_internalSettings.get(); }
@@ -142,6 +144,7 @@ InternalSettings::InternalSettings(Page& page)
     , m_page(&page)
     , m_backup(&page.settings())
 {
+    ScriptWrappable::init(this);
 }
 
 void InternalSettings::resetToConsistentState()
@@ -168,6 +171,12 @@ void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionState& ex
     settings()->setMockScrollbarsEnabled(enabled);
 }
 
+void InternalSettings::setMockGestureTapHighlightsEnabled(bool enabled, ExceptionState& exceptionState)
+{
+    InternalSettingsGuardForSettings();
+    settings()->setMockGestureTapHighlightsEnabled(enabled);
+}
+
 void InternalSettings::setAuthorShadowDOMForAnyElementEnabled(bool isEnabled)
 {
     RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(isEnabled);
@@ -178,6 +187,11 @@ void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(bool
     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(enabled);
 }
 
+void InternalSettings::setLaxMixedContentCheckingEnabled(bool enabled)
+{
+    RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(enabled);
+}
+
 void InternalSettings::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(bool enabled)
 {
     RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(enabled);
@@ -208,8 +222,8 @@ void InternalSettings::setStandardFontFamily(const AtomicString& family, const S
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setStandard(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updateStandard(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setSerifFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -218,8 +232,8 @@ void InternalSettings::setSerifFontFamily(const AtomicString& family, const Stri
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setSerif(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updateSerif(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setSansSerifFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -228,8 +242,8 @@ void InternalSettings::setSansSerifFontFamily(const AtomicString& family, const
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setSansSerif(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updateSansSerif(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setFixedFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -238,8 +252,8 @@ void InternalSettings::setFixedFontFamily(const AtomicString& family, const Stri
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setFixed(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updateFixed(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setCursiveFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -248,8 +262,8 @@ void InternalSettings::setCursiveFontFamily(const AtomicString& family, const St
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setCursive(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updateCursive(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setFantasyFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -258,8 +272,8 @@ void InternalSettings::setFantasyFontFamily(const AtomicString& family, const St
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setFantasy(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updateFantasy(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setPictographFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -268,8 +282,8 @@ void InternalSettings::setPictographFontFamily(const AtomicString& family, const
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->genericFontFamilySettings().setPictograph(family, code);
-    settings()->notifyGenericFontFamilyChange();
+    if (settings()->genericFontFamilySettings().updatePictograph(family, code))
+        settings()->notifyGenericFontFamilyChange();
 }
 
 void InternalSettings::setTextAutosizingEnabled(bool enabled, ExceptionState& exceptionState)
@@ -297,11 +311,6 @@ void InternalSettings::setAccessibilityFontScaleFactor(float fontScaleFactor, Ex
     settings()->setAccessibilityFontScaleFactor(fontScaleFactor);
 }
 
-void InternalSettings::setCSSExclusionsEnabled(bool enabled)
-{
-    RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled);
-}
-
 void InternalSettings::setEditingBehavior(const String& editingBehavior, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();