| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac
tor()) | 68 , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac
tor()) |
| 69 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) | 69 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) |
| 70 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) | 70 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) |
| 71 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri
buteAwareFormControlUIEnabled()) | 71 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri
buteAwareFormControlUIEnabled()) |
| 72 , m_imagesEnabled(settings->areImagesEnabled()) | 72 , m_imagesEnabled(settings->areImagesEnabled()) |
| 73 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles()) | 73 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles()) |
| 74 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions()) | 74 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions()) |
| 75 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions()) | 75 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions()) |
| 76 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) | 76 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) |
| 77 , m_originalCompositorDrivenAcceleratedScrollEnabled(settings->isCompositorD
rivenAcceleratedScrollingEnabled()) | 77 , m_originalCompositorDrivenAcceleratedScrollEnabled(settings->isCompositorD
rivenAcceleratedScrollingEnabled()) |
| 78 , m_originalLayerSquashingEnabled(settings->isLayerSquashingEnabled()) |
| 78 , m_originalPasswordGenerationDecorationEnabled(settings->passwordGeneration
DecorationEnabled()) | 79 , m_originalPasswordGenerationDecorationEnabled(settings->passwordGeneration
DecorationEnabled()) |
| 79 { | 80 { |
| 80 } | 81 } |
| 81 | 82 |
| 82 void InternalSettings::Backup::restoreTo(Settings* settings) | 83 void InternalSettings::Backup::restoreTo(Settings* settings) |
| 83 { | 84 { |
| 84 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl
ed); | 85 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl
ed); |
| 85 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut
horShadowDOMForAnyElementEnabled); | 86 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut
horShadowDOMForAnyElementEnabled); |
| 86 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna
bled); | 87 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna
bled); |
| 87 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped); | 88 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped); |
| 88 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb
arsEnabled); | 89 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb
arsEnabled); |
| 89 settings->setEditingBehaviorType(m_originalEditingBehavior); | 90 settings->setEditingBehaviorType(m_originalEditingBehavior); |
| 90 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); | 91 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); |
| 91 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow
SizeOverride); | 92 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow
SizeOverride); |
| 92 settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa
ctor); | 93 settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa
ctor); |
| 93 settings->setMediaTypeOverride(m_originalMediaTypeOverride); | 94 settings->setMediaTypeOverride(m_originalMediaTypeOverride); |
| 94 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); | 95 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); |
| 95 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr
ibuteAwareFormControlUIEnabled); | 96 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr
ibuteAwareFormControlUIEnabled); |
| 96 settings->setImagesEnabled(m_imagesEnabled); | 97 settings->setImagesEnabled(m_imagesEnabled); |
| 97 settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles); | 98 settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles); |
| 98 settings->setShouldDisplayCaptions(m_shouldDisplayCaptions); | 99 settings->setShouldDisplayCaptions(m_shouldDisplayCaptions); |
| 99 settings->setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions); | 100 settings->setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions); |
| 100 settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL); | 101 settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL); |
| 101 settings->setCompositorDrivenAcceleratedScrollingEnabled(m_originalComposito
rDrivenAcceleratedScrollEnabled); | 102 settings->setCompositorDrivenAcceleratedScrollingEnabled(m_originalComposito
rDrivenAcceleratedScrollEnabled); |
| 103 settings->setLayerSquashingEnabled(m_originalLayerSquashingEnabled); |
| 102 settings->setPasswordGenerationDecorationEnabled(m_originalPasswordGeneratio
nDecorationEnabled); | 104 settings->setPasswordGenerationDecorationEnabled(m_originalPasswordGeneratio
nDecorationEnabled); |
| 103 settings->resetFontFamilies(); | 105 settings->resetFontFamilies(); |
| 104 } | 106 } |
| 105 | 107 |
| 106 // We can't use RefCountedSupplement because that would try to make InternalSett
ings RefCounted | 108 // We can't use RefCountedSupplement because that would try to make InternalSett
ings RefCounted |
| 107 // and InternalSettings is already RefCounted via its base class, InternalSettin
gsGenerated. | 109 // and InternalSettings is already RefCounted via its base class, InternalSettin
gsGenerated. |
| 108 // Instead, we manually make InternalSettings supplement Page. | 110 // Instead, we manually make InternalSettings supplement Page. |
| 109 class InternalSettingsWrapper : public Supplement<Page> { | 111 class InternalSettingsWrapper : public Supplement<Page> { |
| 110 public: | 112 public: |
| 111 explicit InternalSettingsWrapper(Page* page) | 113 explicit InternalSettingsWrapper(Page* page) |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 } | 201 } |
| 200 | 202 |
| 201 // FIXME: This is a temporary flag and should be removed once accelerated | 203 // FIXME: This is a temporary flag and should be removed once accelerated |
| 202 // overflow scroll is ready (crbug.com/254111). | 204 // overflow scroll is ready (crbug.com/254111). |
| 203 void InternalSettings::setCompositorDrivenAcceleratedScrollingEnabled(bool enabl
ed, ExceptionState& exceptionState) | 205 void InternalSettings::setCompositorDrivenAcceleratedScrollingEnabled(bool enabl
ed, ExceptionState& exceptionState) |
| 204 { | 206 { |
| 205 InternalSettingsGuardForSettings(); | 207 InternalSettingsGuardForSettings(); |
| 206 settings()->setCompositorDrivenAcceleratedScrollingEnabled(enabled); | 208 settings()->setCompositorDrivenAcceleratedScrollingEnabled(enabled); |
| 207 } | 209 } |
| 208 | 210 |
| 211 // FIXME: This is a temporary flag and should be removed once squashing is |
| 212 // ready (crbug.com/261605). |
| 213 void InternalSettings::setLayerSquashingEnabled(bool enabled, ExceptionState& ex
ceptionState) |
| 214 { |
| 215 InternalSettingsGuardForSettings(); |
| 216 settings()->setLayerSquashingEnabled(enabled); |
| 217 } |
| 218 |
| 209 typedef void (Settings::*SetFontFamilyFunction)(const AtomicString&, UScriptCode
); | 219 typedef void (Settings::*SetFontFamilyFunction)(const AtomicString&, UScriptCode
); |
| 210 static void setFontFamily(Settings* settings, const String& family, const String
& script, SetFontFamilyFunction setter) | 220 static void setFontFamily(Settings* settings, const String& family, const String
& script, SetFontFamilyFunction setter) |
| 211 { | 221 { |
| 212 UScriptCode code = scriptNameToCode(script); | 222 UScriptCode code = scriptNameToCode(script); |
| 213 if (code != USCRIPT_INVALID_CODE) | 223 if (code != USCRIPT_INVALID_CODE) |
| 214 (settings->*setter)(family, code); | 224 (settings->*setter)(family, code); |
| 215 } | 225 } |
| 216 | 226 |
| 217 void InternalSettings::setStandardFontFamily(const String& family, const String&
script, ExceptionState& exceptionState) | 227 void InternalSettings::setStandardFontFamily(const String& family, const String&
script, ExceptionState& exceptionState) |
| 218 { | 228 { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 settings()->setDefaultVideoPosterURL(url); | 327 settings()->setDefaultVideoPosterURL(url); |
| 318 } | 328 } |
| 319 | 329 |
| 320 void InternalSettings::setPasswordGenerationDecorationEnabled(bool enabled, Exce
ptionState& exceptionState) | 330 void InternalSettings::setPasswordGenerationDecorationEnabled(bool enabled, Exce
ptionState& exceptionState) |
| 321 { | 331 { |
| 322 InternalSettingsGuardForSettings(); | 332 InternalSettingsGuardForSettings(); |
| 323 settings()->setPasswordGenerationDecorationEnabled(enabled); | 333 settings()->setPasswordGenerationDecorationEnabled(enabled); |
| 324 } | 334 } |
| 325 | 335 |
| 326 } | 336 } |
| OLD | NEW |