| Index: third_party/WebKit/Source/core/frame/Settings.in
|
| diff --git a/third_party/WebKit/Source/core/frame/Settings.in b/third_party/WebKit/Source/core/frame/Settings.in
|
| index b35509b29e36cc7cd27779bd28cbcfddc02737d5..07a159a8595274a2e07da600cf1c5a7a574c465d 100644
|
| --- a/third_party/WebKit/Source/core/frame/Settings.in
|
| +++ b/third_party/WebKit/Source/core/frame/Settings.in
|
| @@ -158,11 +158,11 @@ touchDragDropEnabled initial=false
|
| defaultVideoPosterURL type=String
|
|
|
| smartInsertDeleteEnabled initial=false
|
| -selectTrailingWhitespaceEnabled initial=defaultSelectTrailingWhitespaceEnabled
|
| +selectTrailingWhitespaceEnabled initial=kDefaultSelectTrailingWhitespaceEnabled
|
|
|
| selectionIncludesAltImageText initial=false
|
|
|
| -selectionStrategy type=SelectionStrategy, initial=SelectionStrategy::Character
|
| +selectionStrategy type=SelectionStrategy, initial=SelectionStrategy::kCharacter
|
|
|
| ######## Settings used by Android WebView below ########
|
|
|
| @@ -238,13 +238,13 @@ accessibilityFontScaleFactor type=double, initial=1.0, invalidate=TextAutosizing
|
|
|
| # Only used by Layout Tests and inspector emulation.
|
| mediaTypeOverride type=String, initial="", invalidate=MediaQuery
|
| -displayModeOverride type=WebDisplayMode, initial=WebDisplayModeUndefined, invalidate=MediaQuery
|
| +displayModeOverride type=WebDisplayMode, initial=kWebDisplayModeUndefined, invalidate=MediaQuery
|
|
|
| # loadsImagesAutomatically only suppresses the network load of
|
| # the image URL. A cached image will still be rendered if requested.
|
| loadsImagesAutomatically initial=false, invalidate=ImageLoading
|
| imagesEnabled initial=true, invalidate=ImageLoading
|
| -imageAnimationPolicy type=ImageAnimationPolicy, initial=ImageAnimationPolicyAllowed
|
| +imageAnimationPolicy type=ImageAnimationPolicy, initial=kImageAnimationPolicyAllowed
|
|
|
| # Number of outstanding and pending tokens allowed in the background HTML
|
| # parser. A value of 0 indicates the parser should use its default value.
|
| @@ -298,20 +298,20 @@ maxBeaconTransmission type=int, initial=65536
|
| fullscreenSupported initial=true
|
|
|
| # V8 supports different types of caching. Used by V8 bindings.
|
| -v8CacheOptions type=V8CacheOptions, initial=V8CacheOptionsDefault
|
| +v8CacheOptions type=V8CacheOptions, initial=kV8CacheOptionsDefault
|
|
|
| # V8 code cache for CacheStorage supports three types of strategies (none, normal and aggressive).
|
| -v8CacheStrategiesForCacheStorage type=V8CacheStrategiesForCacheStorage, initial=V8CacheStrategiesForCacheStorage::Default
|
| +v8CacheStrategiesForCacheStorage type=V8CacheStrategiesForCacheStorage, initial=V8CacheStrategiesForCacheStorage::kDefault
|
|
|
| # These values are bit fields for the properties of available pointing devices
|
| # and may take on multiple values (e.g. laptop with touchpad and touchscreen
|
| # has pointerType coarse *and* fine).
|
| -availablePointerTypes type=int, initial=PointerTypeNone, invalidate=MediaQuery
|
| -availableHoverTypes type=int, initial=HoverTypeNone, invalidate=MediaQuery
|
| +availablePointerTypes type=int, initial=kPointerTypeNone, invalidate=MediaQuery
|
| +availableHoverTypes type=int, initial=kHoverTypeNone, invalidate=MediaQuery
|
|
|
| # These values specify properties of the user's primary pointing device only.
|
| -primaryPointerType type=PointerType, initial=PointerTypeNone, invalidate=MediaQuery
|
| -primaryHoverType type=HoverType, initial=HoverTypeNone, invalidate=MediaQuery
|
| +primaryPointerType type=PointerType, initial=kPointerTypeNone, invalidate=MediaQuery
|
| +primaryHoverType type=HoverType, initial=kHoverTypeNone, invalidate=MediaQuery
|
|
|
| # Whether accessibility support is enabled at all.
|
| accessibilityEnabled initial=false, invalidate=AccessibilityState
|
| @@ -343,11 +343,11 @@ logPreload initial=false
|
| # These values specify the UA intial viewport style.
|
| # It is dynamically set by the inspector for mobile emulation and can be
|
| # used by content embedders to specify custom style on certain platforms.
|
| -viewportStyle type=WebViewportStyle, initial=WebViewportStyle::Default, invalidate=ViewportRule
|
| +viewportStyle type=WebViewportStyle, initial=WebViewportStyle::kDefault, invalidate=ViewportRule
|
|
|
| # Automatic track selection is performed based on user preference for track kind specified
|
| # by this setting.
|
| -textTrackKindUserPreference type=TextTrackKindUserPreference, initial=TextTrackKindUserPreference::Default, invalidate=TextTrackKindUserPreference
|
| +textTrackKindUserPreference type=TextTrackKindUserPreference, initial=TextTrackKindUserPreference::kDefault, invalidate=TextTrackKindUserPreference
|
|
|
| # User style overrides for captions and subtitles
|
| textTrackBackgroundColor type=String
|
| @@ -364,7 +364,7 @@ textTrackMarginPercentage type=double, initial=0
|
|
|
| lowPriorityIframes initial=false
|
|
|
| -progressBarCompletion type=ProgressBarCompletion, initial=ProgressBarCompletion::LoadEvent
|
| +progressBarCompletion type=ProgressBarCompletion, initial=ProgressBarCompletion::kLoadEvent
|
|
|
| historyEntryRequiresUserGesture initial=false
|
|
|
| @@ -393,7 +393,7 @@ mainFrameResizesAreOrientationChanges initial=false
|
| # is useful to demonstrate the power of passive event listeners. This can be removed
|
| # when there is greater adoption, interventions to force it on and associated devtools
|
| # to enable it have been shipped.
|
| -passiveListenerDefault type=PassiveListenerDefault, initial=PassiveListenerDefault::False
|
| +passiveListenerDefault type=PassiveListenerDefault, initial=PassiveListenerDefault::kFalse
|
|
|
| # Use default interpolation quality to scale bitmap images if quality is not determined
|
| # in other ways. This can help us writing reftests containing scaled images.
|
|
|