Source/WebCore/page/Settings.in - Issue 11880030: Merge 139024

Side by Side Diff: Source/WebCore/page/Settings.in

Issue 11880030: Merge 139024 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 11 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:

« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp » ('j') | no next file with comments »

OLD	NEW
1 # FIXME: Add support for global settings.	1 # FIXME: Add support for global settings.

2 # FIXME: Add support for custom getters/setters.	2 # FIXME: Add support for custom getters/setters.

3	3

4 defaultTextEncodingName type=String	4 defaultTextEncodingName type=String

5 ftpDirectoryTemplatePath type=String	5 ftpDirectoryTemplatePath type=String

6 localStorageDatabasePath type=String	6 localStorageDatabasePath type=String

7 editableLinkBehavior type=EditableLinkBehavior, initial=EditableLinkDefaultBehav ior	7 editableLinkBehavior type=EditableLinkBehavior, initial=EditableLinkDefaultBehav ior

8 textDirectionSubmenuInclusionBehavior type=TextDirectionSubmenuInclusionBehavior , initial=TextDirectionSubmenuAutomaticallyIncluded	8 textDirectionSubmenuInclusionBehavior type=TextDirectionSubmenuInclusionBehavior , initial=TextDirectionSubmenuAutomaticallyIncluded

9 passwordEchoDurationInSeconds type=double, initial=1	9 passwordEchoDurationInSeconds type=double, initial=1

10	10

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 acceleratedCompositingFor3DTransformsEnabled initial=true	85 acceleratedCompositingFor3DTransformsEnabled initial=true

86 acceleratedCompositingForVideoEnabled initial=true	86 acceleratedCompositingForVideoEnabled initial=true

87 acceleratedCompositingForPluginsEnabled initial=true	87 acceleratedCompositingForPluginsEnabled initial=true

88 acceleratedCompositingForCanvasEnabled initial=true	88 acceleratedCompositingForCanvasEnabled initial=true

89 acceleratedCompositingForAnimationEnabled initial=true	89 acceleratedCompositingForAnimationEnabled initial=true

90 acceleratedCompositingForFixedPositionEnabled initial=false	90 acceleratedCompositingForFixedPositionEnabled initial=false

91 acceleratedCompositingForOverflowScrollEnabled initial=false	91 acceleratedCompositingForOverflowScrollEnabled initial=false

92	92

93 # Works only in conjunction with forceCompositingMode.	93 # Works only in conjunction with forceCompositingMode.

94 acceleratedCompositingForScrollableFramesEnabled initial=false	94 acceleratedCompositingForScrollableFramesEnabled initial=false

	95 compositedScrollingForFramesEnabled initial=false

95	96

96 experimentalNotificationsEnabled initial=false	97 experimentalNotificationsEnabled initial=false

97 webGLEnabled initial=false	98 webGLEnabled initial=false

98 webGLErrorsToConsoleEnabled initial=false	99 webGLErrorsToConsoleEnabled initial=false

99 openGLMultisamplingEnabled initial=true	100 openGLMultisamplingEnabled initial=true

100 privilegedWebGLExtensionsEnabled initial=false	101 privilegedWebGLExtensionsEnabled initial=false

101 accelerated2dCanvasEnabled initial=false	102 accelerated2dCanvasEnabled initial=false

102 deferred2dCanvasEnabled initial=false	103 deferred2dCanvasEnabled initial=false

103 loadDeferringEnabled initial=true	104 loadDeferringEnabled initial=true

104 webAudioEnabled initial=false	105 webAudioEnabled initial=false

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 plugInSnapshottingEnabled initial=false	163 plugInSnapshottingEnabled initial=false

163 frameFlatteningEnabled initial=false	164 frameFlatteningEnabled initial=false

164	165

165 allowCustomScrollbarInMainFrame initial=true	166 allowCustomScrollbarInMainFrame initial=true

166 webSecurityEnabled initial=true	167 webSecurityEnabled initial=true

167 spatialNavigationEnabled initial=false	168 spatialNavigationEnabled initial=false

168	169

169 # This setting adds a means to enable/disable touch initiated drag & drop. If	170 # This setting adds a means to enable/disable touch initiated drag & drop. If

170 # enabled, the user can initiate drag using long press.	171 # enabled, the user can initiate drag using long press.

171 touchDragDropEnabled initial=false	172 touchDragDropEnabled initial=false

OLD	NEW