| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2012 Google Inc. All rights reserved. | 2  * Copyright (C) 2012 Google Inc. All rights reserved. | 
| 3  * Copyright (C) 2013 Apple Inc. All rights reserved. | 3  * Copyright (C) 2013 Apple Inc. All rights reserved. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions | 6  * modification, are permitted provided that the following conditions | 
| 7  * are met: | 7  * are met: | 
| 8  * | 8  * | 
| 9  * 1.  Redistributions of source code must retain the above copyright | 9  * 1.  Redistributions of source code must retain the above copyright | 
| 10  *     notice, this list of conditions and the following disclaimer. | 10  *     notice, this list of conditions and the following disclaimer. | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 50 | 50 | 
| 51 #define InternalSettingsGuardForPage() \ | 51 #define InternalSettingsGuardForPage() \ | 
| 52     if (!page()) { \ | 52     if (!page()) { \ | 
| 53         exceptionState.throwDOMException(InvalidAccessError, "The page object ca
     nnot be obtained."); \ | 53         exceptionState.throwDOMException(InvalidAccessError, "The page object ca
     nnot be obtained."); \ | 
| 54         return; \ | 54         return; \ | 
| 55     } | 55     } | 
| 56 | 56 | 
| 57 namespace WebCore { | 57 namespace WebCore { | 
| 58 | 58 | 
| 59 InternalSettings::Backup::Backup(Settings* settings) | 59 InternalSettings::Backup::Backup(Settings* settings) | 
| 60     : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable
     d()) | 60     : m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth
     orShadowDOMForAnyElementEnabled()) | 
| 61     , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth
     orShadowDOMForAnyElementEnabled()) |  | 
| 62     , m_originalCSP(RuntimeEnabledFeatures::experimentalContentSecurityPolicyFea
     turesEnabled()) | 61     , m_originalCSP(RuntimeEnabledFeatures::experimentalContentSecurityPolicyFea
     turesEnabled()) | 
| 63     , m_originalLaxMixedContentCheckingEnabled(RuntimeEnabledFeatures::laxMixedC
     ontentCheckingEnabled()) | 62     , m_originalLaxMixedContentCheckingEnabled(RuntimeEnabledFeatures::laxMixedC
     ontentCheckingEnabled()) | 
| 64     , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollba
     rsEnabled()) | 63     , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollba
     rsEnabled()) | 
| 65     , m_originalEditingBehavior(settings->editingBehaviorType()) | 64     , m_originalEditingBehavior(settings->editingBehaviorType()) | 
| 66     , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) | 65     , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) | 
| 67     , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS
     izeOverride()) | 66     , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS
     izeOverride()) | 
| 68     , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac
     tor()) | 67     , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac
     tor()) | 
| 69     , m_originalMediaTypeOverride(settings->mediaTypeOverride()) | 68     , m_originalMediaTypeOverride(settings->mediaTypeOverride()) | 
| 70     , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) | 69     , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) | 
| 71     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri
     buteAwareFormControlUIEnabled()) | 70     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri
     buteAwareFormControlUIEnabled()) | 
| 72     , m_imagesEnabled(settings->imagesEnabled()) | 71     , m_imagesEnabled(settings->imagesEnabled()) | 
| 73     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) | 72     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) | 
| 74     , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) | 73     , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) | 
| 75     , m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(Runtim
     eEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled()) | 74     , m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(Runtim
     eEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled()) | 
| 76 { | 75 { | 
| 77 } | 76 } | 
| 78 | 77 | 
| 79 void InternalSettings::Backup::restoreTo(Settings* settings) | 78 void InternalSettings::Backup::restoreTo(Settings* settings) | 
| 80 { | 79 { | 
| 81     RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl
     ed); |  | 
| 82     RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut
     horShadowDOMForAnyElementEnabled); | 80     RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut
     horShadowDOMForAnyElementEnabled); | 
| 83     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(
     m_originalCSP); | 81     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(
     m_originalCSP); | 
| 84     RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(m_originalLaxMixed
     ContentCheckingEnabled); | 82     RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(m_originalLaxMixed
     ContentCheckingEnabled); | 
| 85     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb
     arsEnabled); | 83     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb
     arsEnabled); | 
| 86     settings->setEditingBehaviorType(m_originalEditingBehavior); | 84     settings->setEditingBehaviorType(m_originalEditingBehavior); | 
| 87     settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); | 85     settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); | 
| 88     settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow
     SizeOverride); | 86     settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow
     SizeOverride); | 
| 89     settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa
     ctor); | 87     settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa
     ctor); | 
| 90     settings->setMediaTypeOverride(m_originalMediaTypeOverride); | 88     settings->setMediaTypeOverride(m_originalMediaTypeOverride); | 
| 91     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); | 89     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); | 
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 297     InternalSettingsGuardForSettings(); | 295     InternalSettingsGuardForSettings(); | 
| 298     settings()->setMediaTypeOverride(mediaType); | 296     settings()->setMediaTypeOverride(mediaType); | 
| 299 } | 297 } | 
| 300 | 298 | 
| 301 void InternalSettings::setAccessibilityFontScaleFactor(float fontScaleFactor, Ex
     ceptionState& exceptionState) | 299 void InternalSettings::setAccessibilityFontScaleFactor(float fontScaleFactor, Ex
     ceptionState& exceptionState) | 
| 302 { | 300 { | 
| 303     InternalSettingsGuardForSettings(); | 301     InternalSettingsGuardForSettings(); | 
| 304     settings()->setAccessibilityFontScaleFactor(fontScaleFactor); | 302     settings()->setAccessibilityFontScaleFactor(fontScaleFactor); | 
| 305 } | 303 } | 
| 306 | 304 | 
| 307 void InternalSettings::setCSSExclusionsEnabled(bool enabled) |  | 
| 308 { |  | 
| 309     RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled); |  | 
| 310 } |  | 
| 311 |  | 
| 312 void InternalSettings::setEditingBehavior(const String& editingBehavior, Excepti
     onState& exceptionState) | 305 void InternalSettings::setEditingBehavior(const String& editingBehavior, Excepti
     onState& exceptionState) | 
| 313 { | 306 { | 
| 314     InternalSettingsGuardForSettings(); | 307     InternalSettingsGuardForSettings(); | 
| 315     if (equalIgnoringCase(editingBehavior, "win")) | 308     if (equalIgnoringCase(editingBehavior, "win")) | 
| 316         settings()->setEditingBehaviorType(EditingWindowsBehavior); | 309         settings()->setEditingBehaviorType(EditingWindowsBehavior); | 
| 317     else if (equalIgnoringCase(editingBehavior, "mac")) | 310     else if (equalIgnoringCase(editingBehavior, "mac")) | 
| 318         settings()->setEditingBehaviorType(EditingMacBehavior); | 311         settings()->setEditingBehaviorType(EditingMacBehavior); | 
| 319     else if (equalIgnoringCase(editingBehavior, "unix")) | 312     else if (equalIgnoringCase(editingBehavior, "unix")) | 
| 320         settings()->setEditingBehaviorType(EditingUnixBehavior); | 313         settings()->setEditingBehaviorType(EditingUnixBehavior); | 
| 321     else if (equalIgnoringCase(editingBehavior, "android")) | 314     else if (equalIgnoringCase(editingBehavior, "android")) | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 344 void InternalSettings::trace(Visitor* visitor) | 337 void InternalSettings::trace(Visitor* visitor) | 
| 345 { | 338 { | 
| 346     visitor->trace(m_page); | 339     visitor->trace(m_page); | 
| 347     InternalSettingsGenerated::trace(visitor); | 340     InternalSettingsGenerated::trace(visitor); | 
| 348 #if ENABLE(OILPAN) | 341 #if ENABLE(OILPAN) | 
| 349     HeapSupplement<Page>::trace(visitor); | 342     HeapSupplement<Page>::trace(visitor); | 
| 350 #endif | 343 #endif | 
| 351 } | 344 } | 
| 352 | 345 | 
| 353 } | 346 } | 
| OLD | NEW | 
|---|