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

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

Issue 13723004: Remove the ENABLE_TEXT_AUTOSIZING compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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/WebCore/testing/InternalSettings.h ('k') | Source/WebKit/chromium/features.gypi » ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d()) 69 : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnable d())
70 , m_originalCSSVariablesEnabled(settings->cssVariablesEnabled()) 70 , m_originalCSSVariablesEnabled(settings->cssVariablesEnabled())
71 #if ENABLE(SHADOW_DOM) 71 #if ENABLE(SHADOW_DOM)
72 , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled()) 72 , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled())
73 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled()) 73 , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::auth orShadowDOMForAnyElementEnabled())
74 #endif 74 #endif
75 #if ENABLE(STYLE_SCOPED) 75 #if ENABLE(STYLE_SCOPED)
76 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled()) 76 , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
77 #endif 77 #endif
78 , m_originalEditingBehavior(settings->editingBehaviorType()) 78 , m_originalEditingBehavior(settings->editingBehaviorType())
79 #if ENABLE(TEXT_AUTOSIZING)
80 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) 79 , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
81 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride()) 80 , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS izeOverride())
82 , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleF actor()) 81 , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleF actor())
83 #endif
84 , m_originalResolutionOverride(settings->resolutionOverride()) 82 , m_originalResolutionOverride(settings->resolutionOverride())
85 , m_originalMediaTypeOverride(settings->mediaTypeOverride()) 83 , m_originalMediaTypeOverride(settings->mediaTypeOverride())
86 #if ENABLE(DIALOG_ELEMENT) 84 #if ENABLE(DIALOG_ELEMENT)
87 , m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnable d()) 85 , m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnable d())
88 #endif 86 #endif
89 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) 87 , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
90 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled()) 88 , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri buteAwareFormControlUIEnabled())
91 , m_imagesEnabled(settings->areImagesEnabled()) 89 , m_imagesEnabled(settings->areImagesEnabled())
92 , m_minimumTimerInterval(settings->minDOMTimerInterval()) 90 , m_minimumTimerInterval(settings->minDOMTimerInterval())
93 #if ENABLE(VIDEO_TRACK) 91 #if ENABLE(VIDEO_TRACK)
(...skipping 12 matching lines...) Expand all
106 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed); 104 RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabl ed);
107 settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled); 105 settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
108 #if ENABLE(SHADOW_DOM) 106 #if ENABLE(SHADOW_DOM)
109 RuntimeEnabledFeatures::setShadowDOMEnabled(m_originalShadowDOMEnabled); 107 RuntimeEnabledFeatures::setShadowDOMEnabled(m_originalShadowDOMEnabled);
110 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled); 108 RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAut horShadowDOMForAnyElementEnabled);
111 #endif 109 #endif
112 #if ENABLE(STYLE_SCOPED) 110 #if ENABLE(STYLE_SCOPED)
113 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped); 111 RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
114 #endif 112 #endif
115 settings->setEditingBehaviorType(m_originalEditingBehavior); 113 settings->setEditingBehaviorType(m_originalEditingBehavior);
116 #if ENABLE(TEXT_AUTOSIZING)
117 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); 114 settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
118 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride); 115 settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow SizeOverride);
119 settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScale Factor); 116 settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScale Factor);
120 #endif
121 settings->setResolutionOverride(m_originalResolutionOverride); 117 settings->setResolutionOverride(m_originalResolutionOverride);
122 settings->setMediaTypeOverride(m_originalMediaTypeOverride); 118 settings->setMediaTypeOverride(m_originalMediaTypeOverride);
123 #if ENABLE(DIALOG_ELEMENT) 119 #if ENABLE(DIALOG_ELEMENT)
124 RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabl ed); 120 RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabl ed);
125 #endif 121 #endif
126 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); 122 settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
127 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled); 123 RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr ibuteAwareFormControlUIEnabled);
128 settings->setImagesEnabled(m_imagesEnabled); 124 settings->setImagesEnabled(m_imagesEnabled);
129 settings->setMinDOMTimerInterval(m_minimumTimerInterval); 125 settings->setMinDOMTimerInterval(m_minimumTimerInterval);
130 #if ENABLE(VIDEO_TRACK) 126 #if ENABLE(VIDEO_TRACK)
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 } 296 }
301 297
302 void InternalSettings::setPictographFontFamily(const String& family, const Strin g& script, ExceptionCode& ec) 298 void InternalSettings::setPictographFontFamily(const String& family, const Strin g& script, ExceptionCode& ec)
303 { 299 {
304 InternalSettingsGuardForSettings(); 300 InternalSettingsGuardForSettings();
305 setFontFamily(settings(), family, script, &Settings::setPictographFontFamily ); 301 setFontFamily(settings(), family, script, &Settings::setPictographFontFamily );
306 } 302 }
307 303
308 void InternalSettings::setTextAutosizingEnabled(bool enabled, ExceptionCode& ec) 304 void InternalSettings::setTextAutosizingEnabled(bool enabled, ExceptionCode& ec)
309 { 305 {
310 #if ENABLE(TEXT_AUTOSIZING)
311 InternalSettingsGuardForSettings(); 306 InternalSettingsGuardForSettings();
312 settings()->setTextAutosizingEnabled(enabled); 307 settings()->setTextAutosizingEnabled(enabled);
313 #else
314 UNUSED_PARAM(enabled);
315 UNUSED_PARAM(ec);
316 #endif
317 } 308 }
318 309
319 void InternalSettings::setTextAutosizingWindowSizeOverride(int width, int height , ExceptionCode& ec) 310 void InternalSettings::setTextAutosizingWindowSizeOverride(int width, int height , ExceptionCode& ec)
320 { 311 {
321 #if ENABLE(TEXT_AUTOSIZING)
322 InternalSettingsGuardForSettings(); 312 InternalSettingsGuardForSettings();
323 settings()->setTextAutosizingWindowSizeOverride(IntSize(width, height)); 313 settings()->setTextAutosizingWindowSizeOverride(IntSize(width, height));
324 #else
325 UNUSED_PARAM(width);
326 UNUSED_PARAM(height);
327 UNUSED_PARAM(ec);
328 #endif
329 } 314 }
330 315
331 void InternalSettings::setResolutionOverride(int dotsPerCSSInchHorizontally, int dotsPerCSSInchVertically, ExceptionCode& ec) 316 void InternalSettings::setResolutionOverride(int dotsPerCSSInchHorizontally, int dotsPerCSSInchVertically, ExceptionCode& ec)
332 { 317 {
333 InternalSettingsGuardForSettings(); 318 InternalSettingsGuardForSettings();
334 // An empty size resets the override. 319 // An empty size resets the override.
335 settings()->setResolutionOverride(IntSize(dotsPerCSSInchHorizontally, dotsPe rCSSInchVertically)); 320 settings()->setResolutionOverride(IntSize(dotsPerCSSInchHorizontally, dotsPe rCSSInchVertically));
336 } 321 }
337 322
338 void InternalSettings::setMediaTypeOverride(const String& mediaType, ExceptionCo de& ec) 323 void InternalSettings::setMediaTypeOverride(const String& mediaType, ExceptionCo de& ec)
339 { 324 {
340 InternalSettingsGuardForSettings(); 325 InternalSettingsGuardForSettings();
341 settings()->setMediaTypeOverride(mediaType); 326 settings()->setMediaTypeOverride(mediaType);
342 } 327 }
343 328
344 void InternalSettings::setTextAutosizingFontScaleFactor(float fontScaleFactor, E xceptionCode& ec) 329 void InternalSettings::setTextAutosizingFontScaleFactor(float fontScaleFactor, E xceptionCode& ec)
345 { 330 {
346 #if ENABLE(TEXT_AUTOSIZING)
347 InternalSettingsGuardForSettings(); 331 InternalSettingsGuardForSettings();
348 settings()->setTextAutosizingFontScaleFactor(fontScaleFactor); 332 settings()->setTextAutosizingFontScaleFactor(fontScaleFactor);
349 #else
350 UNUSED_PARAM(fontScaleFactor);
351 UNUSED_PARAM(ec);
352 #endif
353 } 333 }
354 334
355 void InternalSettings::setCSSExclusionsEnabled(bool enabled, ExceptionCode& ec) 335 void InternalSettings::setCSSExclusionsEnabled(bool enabled, ExceptionCode& ec)
356 { 336 {
357 UNUSED_PARAM(ec); 337 UNUSED_PARAM(ec);
358 RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled); 338 RuntimeEnabledFeatures::setCSSExclusionsEnabled(enabled);
359 } 339 }
360 340
361 void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec) 341 void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec)
362 { 342 {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 settings()->setTimeWithoutMouseMovementBeforeHidingControls(time); 471 settings()->setTimeWithoutMouseMovementBeforeHidingControls(time);
492 } 472 }
493 473
494 void InternalSettings::setUseLegacyBackgroundSizeShorthandBehavior(bool enabled, ExceptionCode& ec) 474 void InternalSettings::setUseLegacyBackgroundSizeShorthandBehavior(bool enabled, ExceptionCode& ec)
495 { 475 {
496 InternalSettingsGuardForSettings(); 476 InternalSettingsGuardForSettings();
497 settings()->setUseLegacyBackgroundSizeShorthandBehavior(enabled); 477 settings()->setUseLegacyBackgroundSizeShorthandBehavior(enabled);
498 } 478 }
499 479
500 } 480 }
OLDNEW
« no previous file with comments | « Source/WebCore/testing/InternalSettings.h ('k') | Source/WebKit/chromium/features.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698