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

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

Issue 14706011: Revert 150468 "Switching CSS Variables over to RuntimeEnabledFea..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 7 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
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #define InternalSettingsGuardForPage() \ 60 #define InternalSettingsGuardForPage() \
61 if (!page()) { \ 61 if (!page()) { \
62 ec = INVALID_ACCESS_ERR; \ 62 ec = INVALID_ACCESS_ERR; \
63 return; \ 63 return; \
64 } 64 }
65 65
66 namespace WebCore { 66 namespace WebCore {
67 67
68 InternalSettings::Backup::Backup(Settings* settings) 68 InternalSettings::Backup::Backup(Settings* settings)
69 : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d()) 69 : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d())
70 , m_originalCSSVariablesEnabled(settings->cssVariablesEnabled())
70 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled()) 71 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled())
71 , m_originalExperimentalShadowDOMEnabled(RuntimeEnabledFeatures::experimenta lShadowDOMEnabled()) 72 , m_originalExperimentalShadowDOMEnabled(RuntimeEnabledFeatures::experimenta lShadowDOMEnabled())
72 , m_originalExperimentalWebSocketEnabled(settings->experimentalWebSocketEnab led()) 73 , m_originalExperimentalWebSocketEnabled(settings->experimentalWebSocketEnab led())
73 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled()) 74 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
74 , m_originalEditingBehavior(settings->editingBehaviorType()) 75 , m_originalEditingBehavior(settings->editingBehaviorType())
75 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) 76 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
76 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride()) 77 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride())
77 , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleF actor()) 78 , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleF actor())
78 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) 79 , m_originalMediaTypeOverride(settings->mediaTypeOverride())
79 , m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnable d()) 80 , m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnable d())
80 , m_originalLazyLayoutEnabled(RuntimeEnabledFeatures::lazyLayoutEnabled()) 81 , m_originalLazyLayoutEnabled(RuntimeEnabledFeatures::lazyLayoutEnabled())
81 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) 82 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
82 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled()) 83 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled())
83 , m_imagesEnabled(settings->areImagesEnabled()) 84 , m_imagesEnabled(settings->areImagesEnabled())
84 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles()) 85 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles())
85 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions()) 86 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions())
86 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions()) 87 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions())
87 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) 88 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
88 { 89 {
89 } 90 }
90 91
91 void InternalSettings::Backup::restoreTo(Settings* settings) 92 void InternalSettings::Backup::restoreTo(Settings* settings)
92 { 93 {
93 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed); 94 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed);
95 settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
94 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled); 96 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled);
95 RuntimeEnabledFeatures::setExperimentalShadowDOMEnabled(m_originalExperiment alShadowDOMEnabled); 97 RuntimeEnabledFeatures::setExperimentalShadowDOMEnabled(m_originalExperiment alShadowDOMEnabled);
96 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna bled); 98 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna bled);
97 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped); 99 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
98 settings->setEditingBehaviorType(m_originalEditingBehavior); 100 settings->setEditingBehaviorType(m_originalEditingBehavior);
99 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); 101 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
100 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride); 102 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride);
101 settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScale Factor); 103 settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScale Factor);
102 settings->setMediaTypeOverride(m_originalMediaTypeOverride); 104 settings->setMediaTypeOverride(m_originalMediaTypeOverride);
103 RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabl ed); 105 RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabl ed);
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 { 274 {
273 InternalSettingsGuardForSettings(); 275 InternalSettingsGuardForSettings();
274 settings()->setTextAutosizingFontScaleFactor(fontScaleFactor); 276 settings()->setTextAutosizingFontScaleFactor(fontScaleFactor);
275 } 277 }
276 278
277 void InternalSettings::setCSSExclusionsEnabled(bool enabled) 279 void InternalSettings::setCSSExclusionsEnabled(bool enabled)
278 { 280 {
279 RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled); 281 RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled);
280 } 282 }
281 283
284 void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec)
285 {
286 InternalSettingsGuardForSettings();
287 settings()->setCSSVariablesEnabled(enabled);
288 }
289
290 bool InternalSettings::cssVariablesEnabled(ExceptionCode& ec)
291 {
292 InternalSettingsGuardForSettingsReturn(false);
293 return settings()->cssVariablesEnabled();
294 }
295
282 void InternalSettings::setEditingBehavior(const String& editingBehavior, Excepti onCode& ec) 296 void InternalSettings::setEditingBehavior(const String& editingBehavior, Excepti onCode& ec)
283 { 297 {
284 InternalSettingsGuardForSettings(); 298 InternalSettingsGuardForSettings();
285 if (equalIgnoringCase(editingBehavior, "win")) 299 if (equalIgnoringCase(editingBehavior, "win"))
286 settings()->setEditingBehaviorType(EditingWindowsBehavior); 300 settings()->setEditingBehaviorType(EditingWindowsBehavior);
287 else if (equalIgnoringCase(editingBehavior, "mac")) 301 else if (equalIgnoringCase(editingBehavior, "mac"))
288 settings()->setEditingBehaviorType(EditingMacBehavior); 302 settings()->setEditingBehaviorType(EditingMacBehavior);
289 else if (equalIgnoringCase(editingBehavior, "unix")) 303 else if (equalIgnoringCase(editingBehavior, "unix"))
290 settings()->setEditingBehaviorType(EditingUnixBehavior); 304 settings()->setEditingBehaviorType(EditingUnixBehavior);
291 else if (equalIgnoringCase(editingBehavior, "android")) 305 else if (equalIgnoringCase(editingBehavior, "android"))
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 settings()->setImagesEnabled(enabled); 366 settings()->setImagesEnabled(enabled);
353 } 367 }
354 368
355 void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionCode & ec) 369 void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionCode & ec)
356 { 370 {
357 InternalSettingsGuardForSettings(); 371 InternalSettingsGuardForSettings();
358 settings()->setDefaultVideoPosterURL(url); 372 settings()->setDefaultVideoPosterURL(url);
359 } 373 }
360 374
361 } 375 }
OLDNEW
« no previous file with comments | « trunk/Source/core/testing/InternalSettings.h ('k') | trunk/Source/core/testing/InternalSettings.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698