Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: Source/core/testing/InternalSettings.cpp

Issue 131103003: CSP: Add a mechanism to disable CSP 1.1 for layout tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/testing/InternalSettings.h ('k') | Source/core/testing/InternalSettings.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d())
61 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled()) 61 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled())
62 , m_originalExperimentalWebSocketEnabled(settings->experimentalWebSocketEnab led()) 62 , m_originalExperimentalWebSocketEnabled(settings->experimentalWebSocketEnab led())
63 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled()) 63 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
64 , m_originalCSP(RuntimeEnabledFeatures::experimentalContentSecurityPolicyFea turesEnabled())
64 , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollba rsEnabled()) 65 , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollba rsEnabled())
65 , m_originalEditingBehavior(settings->editingBehaviorType()) 66 , m_originalEditingBehavior(settings->editingBehaviorType())
66 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) 67 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
67 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride()) 68 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride())
68 , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac tor()) 69 , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac tor())
69 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) 70 , m_originalMediaTypeOverride(settings->mediaTypeOverride())
70 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) 71 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
71 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled()) 72 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled())
72 , m_imagesEnabled(settings->imagesEnabled()) 73 , m_imagesEnabled(settings->imagesEnabled())
73 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles()) 74 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles())
74 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions()) 75 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions())
75 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions()) 76 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions())
76 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) 77 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
77 , m_originalCompositorDrivenAcceleratedScrollEnabled(settings->compositorDri venAcceleratedScrollingEnabled()) 78 , m_originalCompositorDrivenAcceleratedScrollEnabled(settings->compositorDri venAcceleratedScrollingEnabled())
78 , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) 79 , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled())
79 , m_originalPasswordGenerationDecorationEnabled(settings->passwordGeneration DecorationEnabled()) 80 , m_originalPasswordGenerationDecorationEnabled(settings->passwordGeneration DecorationEnabled())
80 { 81 {
81 } 82 }
82 83
83 void InternalSettings::Backup::restoreTo(Settings* settings) 84 void InternalSettings::Backup::restoreTo(Settings* settings)
84 { 85 {
85 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed); 86 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed);
86 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled); 87 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled);
87 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna bled); 88 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna bled);
88 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped); 89 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
90 RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled( m_originalCSP);
89 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb arsEnabled); 91 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb arsEnabled);
90 settings->setEditingBehaviorType(m_originalEditingBehavior); 92 settings->setEditingBehaviorType(m_originalEditingBehavior);
91 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); 93 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
92 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride); 94 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride);
93 settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa ctor); 95 settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa ctor);
94 settings->setMediaTypeOverride(m_originalMediaTypeOverride); 96 settings->setMediaTypeOverride(m_originalMediaTypeOverride);
95 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); 97 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
96 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled); 98 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled);
97 settings->setImagesEnabled(m_imagesEnabled); 99 settings->setImagesEnabled(m_imagesEnabled);
98 settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles); 100 settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 void InternalSettings::setExperimentalWebSocketEnabled(bool isEnabled) 178 void InternalSettings::setExperimentalWebSocketEnabled(bool isEnabled)
177 { 179 {
178 settings()->setExperimentalWebSocketEnabled(isEnabled); 180 settings()->setExperimentalWebSocketEnabled(isEnabled);
179 } 181 }
180 182
181 void InternalSettings::setStyleScopedEnabled(bool enabled) 183 void InternalSettings::setStyleScopedEnabled(bool enabled)
182 { 184 {
183 RuntimeEnabledFeatures::setStyleScopedEnabled(enabled); 185 RuntimeEnabledFeatures::setStyleScopedEnabled(enabled);
184 } 186 }
185 187
188 void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(bool enabled)
189 {
190 RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled( enabled);
191 }
192
186 void InternalSettings::setOverlayScrollbarsEnabled(bool enabled) 193 void InternalSettings::setOverlayScrollbarsEnabled(bool enabled)
187 { 194 {
188 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled); 195 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled);
189 } 196 }
190 197
191 void InternalSettings::setTouchEventEmulationEnabled(bool enabled, ExceptionStat e& exceptionState) 198 void InternalSettings::setTouchEventEmulationEnabled(bool enabled, ExceptionStat e& exceptionState)
192 { 199 {
193 InternalSettingsGuardForSettings(); 200 InternalSettingsGuardForSettings();
194 settings()->setTouchEventEmulationEnabled(enabled); 201 settings()->setTouchEventEmulationEnabled(enabled);
195 } 202 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 settings()->setDefaultVideoPosterURL(url); 354 settings()->setDefaultVideoPosterURL(url);
348 } 355 }
349 356
350 void InternalSettings::setPasswordGenerationDecorationEnabled(bool enabled, Exce ptionState& exceptionState) 357 void InternalSettings::setPasswordGenerationDecorationEnabled(bool enabled, Exce ptionState& exceptionState)
351 { 358 {
352 InternalSettingsGuardForSettings(); 359 InternalSettingsGuardForSettings();
353 settings()->setPasswordGenerationDecorationEnabled(enabled); 360 settings()->setPasswordGenerationDecorationEnabled(enabled);
354 } 361 }
355 362
356 } 363 }
OLDNEW
« no previous file with comments | « Source/core/testing/InternalSettings.h ('k') | Source/core/testing/InternalSettings.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698