Source/WebKit/chromium/src/WebSettingsImpl.h - Issue 11882024: Merge 139028

Side by Side Diff: Source/WebKit/chromium/src/WebSettingsImpl.h

Issue 11882024: Merge 139028 (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/WebKit/chromium/public/WebSettings.h ('k') | Source/WebKit/chromium/src/WebSettingsImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 virtual void setAllowCustomScrollbarInMainFrame(bool);	65 virtual void setAllowCustomScrollbarInMainFrame(bool);

66 virtual void setAllowRunningOfInsecureContent(bool);	66 virtual void setAllowRunningOfInsecureContent(bool);

67 virtual void setAllowScriptsToCloseWindows(bool);	67 virtual void setAllowScriptsToCloseWindows(bool);

68 virtual void setAllowUniversalAccessFromFileURLs(bool);	68 virtual void setAllowUniversalAccessFromFileURLs(bool);

69 virtual void setApplyDeviceScaleFactorInCompositor(bool);	69 virtual void setApplyDeviceScaleFactorInCompositor(bool);

70 virtual void setApplyPageScaleFactorInCompositor(bool);	70 virtual void setApplyPageScaleFactorInCompositor(bool);

71 virtual void setAsynchronousSpellCheckingEnabled(bool);	71 virtual void setAsynchronousSpellCheckingEnabled(bool);

72 virtual void setAuthorAndUserStylesEnabled(bool);	72 virtual void setAuthorAndUserStylesEnabled(bool);

73 virtual void setAutoZoomFocusedNodeToLegibleScale(bool);	73 virtual void setAutoZoomFocusedNodeToLegibleScale(bool);

74 virtual void setCaretBrowsingEnabled(bool);	74 virtual void setCaretBrowsingEnabled(bool);

	75 virtual void setCompositedScrollingForFramesEnabled(bool);

75 virtual void setCookieEnabled(bool);	76 virtual void setCookieEnabled(bool);

76 virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_CO MMON);	77 virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_CO MMON);

77 virtual void setDNSPrefetchingEnabled(bool);	78 virtual void setDNSPrefetchingEnabled(bool);

78 virtual void setDOMPasteAllowed(bool);	79 virtual void setDOMPasteAllowed(bool);

79 virtual void setDefaultFixedFontSize(int);	80 virtual void setDefaultFixedFontSize(int);

80 virtual void setDefaultFontSize(int);	81 virtual void setDefaultFontSize(int);

81 virtual void setDefaultTextEncodingName(const WebString&);	82 virtual void setDefaultTextEncodingName(const WebString&);

82 virtual void setDefaultTileSize(WebSize);	83 virtual void setDefaultTileSize(WebSize);

83 virtual void setDeferred2dCanvasEnabled(bool);	84 virtual void setDeferred2dCanvasEnabled(bool);

84 virtual void setDeferredImageDecodingEnabled(bool);	85 virtual void setDeferredImageDecodingEnabled(bool);

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
196 bool m_doubleTapToZoomEnabled;	197 bool m_doubleTapToZoomEnabled;

197 bool m_perTilePaintingEnabled;	198 bool m_perTilePaintingEnabled;

198 bool m_acceleratedAnimationEnabled;	199 bool m_acceleratedAnimationEnabled;

199 WebSize m_defaultTileSize;	200 WebSize m_defaultTileSize;

200 WebSize m_maxUntiledLayerSize;	201 WebSize m_maxUntiledLayerSize;

201 };	202 };

202	203

203 } // namespace WebKit	204 } // namespace WebKit

204	205

205 #endif	206 #endif

OLD	NEW