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

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

Issue 23819053: Rename usesOverlayScrollbars of settings to mockScrollbarsUseOverlay (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: mockScrollbarsUses... -> mockScrollbarsUse... Created 7 years, 3 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_originalEditingBehavior(settings->editingBehaviorType()) 64 , m_originalEditingBehavior(settings->editingBehaviorType())
65 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) 65 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
66 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride()) 66 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride())
67 , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleF actor()) 67 , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleF actor())
68 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) 68 , m_originalMediaTypeOverride(settings->mediaTypeOverride())
69 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) 69 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
70 , m_originalMockScrollbarsUseOverlay(settings->mockScrollbarsUseOverlay())
70 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled()) 71 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled())
71 , m_imagesEnabled(settings->areImagesEnabled()) 72 , m_imagesEnabled(settings->areImagesEnabled())
72 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles()) 73 , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles())
73 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions()) 74 , m_shouldDisplayCaptions(settings->shouldDisplayCaptions())
74 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions()) 75 , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions())
75 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) 76 , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
76 , m_originalCompositorDrivenAcceleratedScrollEnabled(settings->isCompositorD rivenAcceleratedScrollingEnabled()) 77 , m_originalCompositorDrivenAcceleratedScrollEnabled(settings->isCompositorD rivenAcceleratedScrollingEnabled())
77 { 78 {
78 } 79 }
79 80
80 void InternalSettings::Backup::restoreTo(Settings* settings) 81 void InternalSettings::Backup::restoreTo(Settings* settings)
81 { 82 {
82 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed); 83 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed);
83 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled); 84 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled);
84 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna bled); 85 settings->setExperimentalWebSocketEnabled(m_originalExperimentalWebSocketEna bled);
85 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped); 86 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
86 settings->setEditingBehaviorType(m_originalEditingBehavior); 87 settings->setEditingBehaviorType(m_originalEditingBehavior);
87 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); 88 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
88 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride); 89 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride);
89 settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScale Factor); 90 settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScale Factor);
90 settings->setMediaTypeOverride(m_originalMediaTypeOverride); 91 settings->setMediaTypeOverride(m_originalMediaTypeOverride);
91 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); 92 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
93 settings->setMockScrollbarsUseOverlay(m_originalMockScrollbarsUseOverlay);
92 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled); 94 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled);
93 settings->setImagesEnabled(m_imagesEnabled); 95 settings->setImagesEnabled(m_imagesEnabled);
94 settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles); 96 settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles);
95 settings->setShouldDisplayCaptions(m_shouldDisplayCaptions); 97 settings->setShouldDisplayCaptions(m_shouldDisplayCaptions);
96 settings->setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions); 98 settings->setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions);
97 settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL); 99 settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL);
98 settings->setCompositorDrivenAcceleratedScrollingEnabled(m_originalComposito rDrivenAcceleratedScrollEnabled); 100 settings->setCompositorDrivenAcceleratedScrollingEnabled(m_originalComposito rDrivenAcceleratedScrollEnabled);
99 } 101 }
100 102
101 // We can't use RefCountedSupplement because that would try to make InternalSett ings RefCounted 103 // We can't use RefCountedSupplement because that would try to make InternalSett ings RefCounted
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 return 0; 156 return 0;
155 return &page()->settings(); 157 return &page()->settings();
156 } 158 }
157 159
158 void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionState& es ) 160 void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionState& es )
159 { 161 {
160 InternalSettingsGuardForSettings(); 162 InternalSettingsGuardForSettings();
161 settings()->setMockScrollbarsEnabled(enabled); 163 settings()->setMockScrollbarsEnabled(enabled);
162 } 164 }
163 165
166 void InternalSettings::setMockScrollbarsUseOverlay(bool enabled, ExceptionState& es)
167 {
168 InternalSettingsGuardForSettings();
169 settings()->setMockScrollbarsUseOverlay(enabled);
170 }
171
164 void InternalSettings::setAuthorShadowDOMForAnyElementEnabled(bool isEnabled) 172 void InternalSettings::setAuthorShadowDOMForAnyElementEnabled(bool isEnabled)
165 { 173 {
166 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(isEnabled); 174 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(isEnabled);
167 } 175 }
168 176
169 void InternalSettings::setExperimentalWebSocketEnabled(bool isEnabled) 177 void InternalSettings::setExperimentalWebSocketEnabled(bool isEnabled)
170 { 178 {
171 settings()->setExperimentalWebSocketEnabled(isEnabled); 179 settings()->setExperimentalWebSocketEnabled(isEnabled);
172 } 180 }
173 181
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 settings()->setImagesEnabled(enabled); 309 settings()->setImagesEnabled(enabled);
302 } 310 }
303 311
304 void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionStat e& es) 312 void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionStat e& es)
305 { 313 {
306 InternalSettingsGuardForSettings(); 314 InternalSettingsGuardForSettings();
307 settings()->setDefaultVideoPosterURL(url); 315 settings()->setDefaultVideoPosterURL(url);
308 } 316 }
309 317
310 } 318 }
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