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

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

Issue 325663003: Remove scoped styles (retry) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix layout test (and expectation) Created 6 years, 6 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 if (!page()) { \ 53 if (!page()) { \
54 exceptionState.throwDOMException(InvalidAccessError, "The page object ca nnot be obtained."); \ 54 exceptionState.throwDOMException(InvalidAccessError, "The page object ca nnot be obtained."); \
55 return; \ 55 return; \
56 } 56 }
57 57
58 namespace WebCore { 58 namespace WebCore {
59 59
60 InternalSettings::Backup::Backup(Settings* settings) 60 InternalSettings::Backup::Backup(Settings* settings)
61 : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d()) 61 : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d())
62 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled()) 62 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled())
63 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
64 , m_originalCSP(RuntimeEnabledFeatures::experimentalContentSecurityPolicyFea turesEnabled()) 63 , m_originalCSP(RuntimeEnabledFeatures::experimentalContentSecurityPolicyFea turesEnabled())
65 , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollba rsEnabled()) 64 , m_originalOverlayScrollbarsEnabled(RuntimeEnabledFeatures::overlayScrollba rsEnabled())
66 , m_originalEditingBehavior(settings->editingBehaviorType()) 65 , m_originalEditingBehavior(settings->editingBehaviorType())
67 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) 66 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
68 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride()) 67 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride())
69 , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac tor()) 68 , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac tor())
70 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) 69 , m_originalMediaTypeOverride(settings->mediaTypeOverride())
71 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) 70 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
72 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled()) 71 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled())
73 , m_imagesEnabled(settings->imagesEnabled()) 72 , m_imagesEnabled(settings->imagesEnabled())
74 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) 73 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
75 , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) 74 , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled())
76 , m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(Runtim eEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled()) 75 , m_originalPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled(Runtim eEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled())
77 { 76 {
78 } 77 }
79 78
80 void InternalSettings::Backup::restoreTo(Settings* settings) 79 void InternalSettings::Backup::restoreTo(Settings* settings)
81 { 80 {
82 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed); 81 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed);
83 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled); 82 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled);
84 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
85 RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled( m_originalCSP); 83 RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled( m_originalCSP);
86 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb arsEnabled); 84 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb arsEnabled);
87 settings->setEditingBehaviorType(m_originalEditingBehavior); 85 settings->setEditingBehaviorType(m_originalEditingBehavior);
88 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); 86 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
89 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride); 87 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride);
90 settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa ctor); 88 settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa ctor);
91 settings->setMediaTypeOverride(m_originalMediaTypeOverride); 89 settings->setMediaTypeOverride(m_originalMediaTypeOverride);
92 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); 90 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
93 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled); 91 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled);
94 settings->setImagesEnabled(m_imagesEnabled); 92 settings->setImagesEnabled(m_imagesEnabled);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 { 167 {
170 InternalSettingsGuardForSettings(); 168 InternalSettingsGuardForSettings();
171 settings()->setMockScrollbarsEnabled(enabled); 169 settings()->setMockScrollbarsEnabled(enabled);
172 } 170 }
173 171
174 void InternalSettings::setAuthorShadowDOMForAnyElementEnabled(bool isEnabled) 172 void InternalSettings::setAuthorShadowDOMForAnyElementEnabled(bool isEnabled)
175 { 173 {
176 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(isEnabled); 174 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(isEnabled);
177 } 175 }
178 176
179 void InternalSettings::setStyleScopedEnabled(bool enabled)
180 {
181 RuntimeEnabledFeatures::setStyleScopedEnabled(enabled);
182 }
183
184 void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(bool enabled) 177 void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(bool enabled)
185 { 178 {
186 RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled( enabled); 179 RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled( enabled);
187 } 180 }
188 181
189 void InternalSettings::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnab led(bool enabled) 182 void InternalSettings::setPseudoClassesInMatchingCriteriaInAuthorShadowTreesEnab led(bool enabled)
190 { 183 {
191 RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTree sEnabled(enabled); 184 RuntimeEnabledFeatures::setPseudoClassesInMatchingCriteriaInAuthorShadowTree sEnabled(enabled);
192 } 185 }
193 186
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 void InternalSettings::trace(Visitor* visitor) 338 void InternalSettings::trace(Visitor* visitor)
346 { 339 {
347 visitor->trace(m_page); 340 visitor->trace(m_page);
348 InternalSettingsGenerated::trace(visitor); 341 InternalSettingsGenerated::trace(visitor);
349 #if ENABLE(OILPAN) 342 #if ENABLE(OILPAN)
350 HeapSupplement<Page>::trace(visitor); 343 HeapSupplement<Page>::trace(visitor);
351 #endif 344 #endif
352 } 345 }
353 346
354 } 347 }
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